Ticket #5169: case-apps.diff

File case-apps.diff, 292.0 KB (added by humdinger, 10 years ago)

for all applications

Line 
1Index: src/apps/icon-o-matic/gui/PathListView.cpp
2===================================================================
3--- src/apps/icon-o-matic/gui/PathListView.cpp (Revision 34761)
4+++ src/apps/icon-o-matic/gui/PathListView.cpp (Arbeitskopie)
5@@ -1,5 +1,5 @@
6 /*
7- * Copyright 2006, Haiku.
8+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
9 * Distributed under the terms of the MIT License.
10 *
11 * Authors:
12@@ -729,17 +729,17 @@
13 return;
14
15 fAddMI = new BMenuItem("Add", new BMessage(MSG_ADD));
16- fAddRectMI = new BMenuItem("Add Rect", new BMessage(MSG_ADD_RECT));
17- fAddCircleMI = new BMenuItem("Add Circle"/*B_UTF8_ELLIPSIS*/,
18+ fAddRectMI = new BMenuItem("Add rect", new BMessage(MSG_ADD_RECT));
19+ fAddCircleMI = new BMenuItem("Add circle"/*B_UTF8_ELLIPSIS*/,
20 new BMessage(MSG_ADD_CIRCLE));
21-// fAddArcMI = new BMenuItem("Add Arc"B_UTF8_ELLIPSIS,
22+// fAddArcMI = new BMenuItem("Add arc"B_UTF8_ELLIPSIS,
23 // new BMessage(MSG_ADD_ARC));
24 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
25 fReverseMI = new BMenuItem("Reverse", new BMessage(MSG_REVERSE));
26- fCleanUpMI = new BMenuItem("Clean Up", new BMessage(MSG_CLEAN_UP));
27- fRotateIndicesRightMI = new BMenuItem("Rotate Indices Right",
28+ fCleanUpMI = new BMenuItem("Clean up", new BMessage(MSG_CLEAN_UP));
29+ fRotateIndicesRightMI = new BMenuItem("Rotate indices right",
30 new BMessage(MSG_ROTATE_INDICES_CCW), 'R');
31- fRotateIndicesLeftMI = new BMenuItem("Rotate Indices Left",
32+ fRotateIndicesLeftMI = new BMenuItem("Rotate indices left",
33 new BMessage(MSG_ROTATE_INDICES_CW), 'R', B_SHIFT_KEY);
34 fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE));
35
36Index: src/apps/icon-o-matic/gui/ShapeListView.cpp
37===================================================================
38--- src/apps/icon-o-matic/gui/ShapeListView.cpp (Revision 34761)
39+++ src/apps/icon-o-matic/gui/ShapeListView.cpp (Arbeitskopie)
40@@ -1,5 +1,5 @@
41 /*
42- * Copyright 2006-2007, Haiku Inc. All rights reserved.
43+ * Copyright 2006-2009, Haiku Inc. All rights reserved.
44 * Distributed under the terms of the MIT License.
45 *
46 * Authors:
47@@ -423,25 +423,25 @@
48 return;
49
50 BMessage* message = new BMessage(MSG_ADD_SHAPE);
51- fAddEmptyMI = new BMenuItem("Add Empty", message);
52+ fAddEmptyMI = new BMenuItem("Add empty", message);
53
54 message = new BMessage(MSG_ADD_SHAPE);
55 message->AddBool("path", true);
56- fAddWidthPathMI = new BMenuItem("Add With Path", message);
57+ fAddWidthPathMI = new BMenuItem("Add with path", message);
58
59 message = new BMessage(MSG_ADD_SHAPE);
60 message->AddBool("style", true);
61- fAddWidthStyleMI = new BMenuItem("Add With Style", message);
62+ fAddWidthStyleMI = new BMenuItem("Add with style", message);
63
64 message = new BMessage(MSG_ADD_SHAPE);
65 message->AddBool("path", true);
66 message->AddBool("style", true);
67- fAddWidthPathAndStyleMI = new BMenuItem("Add With Path & Style", message);
68+ fAddWidthPathAndStyleMI = new BMenuItem("Add with path & style", message);
69
70 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
71- fResetTransformationMI = new BMenuItem("Reset Transformation",
72+ fResetTransformationMI = new BMenuItem("Reset transformation",
73 new BMessage(MSG_RESET_TRANSFORMATION));
74- fFreezeTransformationMI = new BMenuItem("Freeze Transformation",
75+ fFreezeTransformationMI = new BMenuItem("Freeze transformation",
76 new BMessage(MSG_FREEZE_TRANSFORMATION));
77
78 fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE));
79Index: src/apps/icon-o-matic/gui/StyleListView.cpp
80===================================================================
81--- src/apps/icon-o-matic/gui/StyleListView.cpp (Revision 34761)
82+++ src/apps/icon-o-matic/gui/StyleListView.cpp (Arbeitskopie)
83@@ -1,5 +1,5 @@
84 /*
85- * Copyright 2006, Haiku.
86+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
87 * Distributed under the terms of the MIT License.
88 *
89 * Authors:
90@@ -600,7 +600,7 @@
91 fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE));
92 fMenu->AddItem(fDuplicateMI);
93
94- fResetTransformationMI = new BMenuItem("Reset Transformation",
95+ fResetTransformationMI = new BMenuItem("Reset transformation",
96 new BMessage(MSG_RESET_TRANSFORMATION));
97 fMenu->AddItem(fResetTransformationMI);
98
99Index: src/apps/icon-o-matic/gui/TransformerListView.cpp
100===================================================================
101--- src/apps/icon-o-matic/gui/TransformerListView.cpp (Revision 34761)
102+++ src/apps/icon-o-matic/gui/TransformerListView.cpp (Arbeitskopie)
103@@ -1,5 +1,5 @@
104 /*
105- * Copyright 2006, Haiku.
106+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
107 * Distributed under the terms of the MIT License.
108 *
109 * Authors:
110@@ -129,7 +129,7 @@
111
112 // display helpful messages
113 const char* message1 = "Click on a shape above";
114- const char* message2 = "to attach Transformers.";
115+ const char* message2 = "to attach transformers.";
116
117 SetHighColor(tint_color(LowColor(), B_DARKEN_2_TINT));
118 font_height fh;
119Index: src/apps/icon-o-matic/gui/StyleView.cpp
120===================================================================
121--- src/apps/icon-o-matic/gui/StyleView.cpp (Revision 34761)
122+++ src/apps/icon-o-matic/gui/StyleView.cpp (Arbeitskopie)
123@@ -1,5 +1,5 @@
124 /*
125- * Copyright 2006, Haiku. All rights reserved.
126+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
127 * Distributed under the terms of the MIT License.
128 *
129 * Authors:
130@@ -74,14 +74,14 @@
131 BGridLayout* layout = new BGridLayout(5, 5);
132 SetLayout(layout);
133
134- fStyleType = new BMenuField( "Style Type", menu, NULL);
135+ fStyleType = new BMenuField( "Style type: ", menu, NULL);
136
137 #else
138 frame.OffsetTo(B_ORIGIN);
139 frame.InsetBy(5, 5);
140 frame.bottom = frame.top + 15;
141
142- fStyleType = new BMenuField(frame, "style type", "Style Type",
143+ fStyleType = new BMenuField(frame, "style type", "Style type",
144 menu, true);
145 AddChild(fStyleType);
146
147@@ -110,7 +110,7 @@
148 menu->AddItem(new BMenuItem("Conic", message));
149
150 #if __HAIKU__
151- fGradientType = new BMenuField("Gradient Type", menu, NULL);
152+ fGradientType = new BMenuField("Gradient type: ", menu, NULL);
153 fGradientControl = new GradientControl(new BMessage(MSG_SET_COLOR), this);
154
155 layout->AddItem(BSpaceLayoutItem::CreateVerticalStrut(3), 0, 0, 4);
156@@ -129,7 +129,7 @@
157
158 #else // !__HAIKU__
159 frame.OffsetBy(0, fStyleType->Frame().Height() + 6);
160- fGradientType = new BMenuField(frame, "gradient type", "Gradient Type",
161+ fGradientType = new BMenuField(frame, "gradient type", "Gradient type",
162 menu, true);
163 AddChild(fGradientType);
164
165Index: src/apps/icon-o-matic/MainWindow.cpp
166===================================================================
167--- src/apps/icon-o-matic/MainWindow.cpp (Revision 34761)
168+++ src/apps/icon-o-matic/MainWindow.cpp (Arbeitskopie)
169@@ -263,19 +263,19 @@
170 commands[1] = pathCommand;
171 commands[2] = shapeCommand;
172 command = new CompoundCommand(commands, 3,
173- "Add Shape With Path & Style", 0);
174+ "Add shape with path & style", 0);
175 } else if (styleCommand) {
176 Command** commands = new Command*[2];
177 commands[0] = styleCommand;
178 commands[1] = shapeCommand;
179 command = new CompoundCommand(commands, 2,
180- "Add Shape With Style", 0);
181+ "Add shape with style", 0);
182 } else {
183 Command** commands = new Command*[2];
184 commands[0] = pathCommand;
185 commands[1] = shapeCommand;
186 command = new CompoundCommand(commands, 2,
187- "Add Shape With Path", 0);
188+ "Add shape with path", 0);
189 }
190 } else {
191 command = shapeCommand;
192@@ -1027,12 +1027,12 @@
193 fileMenu->AddSeparatorItem();
194 fileMenu->AddItem(new BMenuItem("Save",
195 new BMessage(MSG_SAVE), 'S'));
196- fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS,
197+ fileMenu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS,
198 new BMessage(MSG_SAVE_AS), 'S', B_SHIFT_KEY));
199 fileMenu->AddSeparatorItem();
200 fileMenu->AddItem(new BMenuItem("Export",
201 new BMessage(MSG_EXPORT), 'P'));
202- fileMenu->AddItem(new BMenuItem("Export As"B_UTF8_ELLIPSIS,
203+ fileMenu->AddItem(new BMenuItem("Export as"B_UTF8_ELLIPSIS,
204 new BMessage(MSG_EXPORT_AS), 'P', B_SHIFT_KEY));
205 fileMenu->AddSeparatorItem();
206 fileMenu->AddItem(new BMenuItem("Quit",
207@@ -1052,7 +1052,7 @@
208 editMenu->AddItem(fRedoMI);
209
210 // Settings
211- BMenu* filterModeMenu = new BMenu("Snap to Grid");
212+ BMenu* filterModeMenu = new BMenu("Snap to grid");
213 BMessage* message = new BMessage(MSG_MOUSE_FILTER_MODE);
214 message->AddInt32("mode", SNAPPING_OFF);
215 filterModeMenu->AddItem(new BMenuItem("Off", message, '4'));
216Index: src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
217===================================================================
218--- src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp (Revision 34761)
219+++ src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp (Arbeitskopie)
220@@ -1,5 +1,5 @@
221 /*
222- * Copyright 2006, Haiku. All rights reserved.
223+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
224 * Distributed under the terms of the MIT License.
225 *
226 * Authors:
227@@ -68,10 +68,10 @@
228 } catch(agg::svg::exception& e) {
229 char error[1024];
230 sprintf(error, "Failed to open the file '%s' as "
231- "an SVG Document.\n\n"
232+ "an SVG document.\n\n"
233 "Error: %s", ref->name, e.msg());
234 BAlert* alert = new BAlert("load error",
235- error, "Ok", NULL, NULL,
236+ error, "OK", NULL, NULL,
237 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
238 alert->Go(NULL);
239 ret = B_ERROR;
240Index: src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp
241===================================================================
242--- src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp (Revision 34761)
243+++ src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp (Arbeitskopie)
244@@ -1,5 +1,5 @@
245 /*
246- * Copyright 2008, Haiku. All rights reserved.
247+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
248 * Distributed under the terms of the MIT License.
249 *
250 * Authors:
251@@ -248,7 +248,7 @@
252 BString str(text);
253 if (str.Length() > 50) {
254 BAlert* alert = new BAlert("too big",
255- "The text you are trying to import is quite long, are you sure ?",
256+ "The text you are trying to import is quite long, are you sure?",
257 "Yes", "No", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
258 if (alert->Go())
259 return B_CANCELED;
260Index: src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp
261===================================================================
262--- src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp (Revision 34761)
263+++ src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp (Arbeitskopie)
264@@ -1,5 +1,5 @@
265 /*
266- * Copyright 2002-2006, Stephan Aßmus <superstippi@gmx.de>
267+ * Copyright 2002-2009, Stephan Aßmus <superstippi@gmx.de>
268 * All rights reserved. Distributed under the terms of the MIT license.
269 *
270 */
271@@ -43,12 +43,12 @@
272 fMessage(message),
273 fTarget(target)
274 {
275- SetTitle("Pick Color");
276+ SetTitle("Pick a color");
277
278 fColorPickerView = new ColorPickerView("color picker", color, mode);
279
280 #if LIB_LAYOUT
281- MButton* defaultButton = new MButton("Ok", new BMessage(MSG_DONE), this);
282+ MButton* defaultButton = new MButton("OK", new BMessage(MSG_DONE), this);
283
284 // interface layout
285 BView* topView = new VGroup (
286@@ -68,7 +68,7 @@
287 );
288 #else // LIB_LAYOUT
289 frame = BRect(0, 0, 40, 15);
290- BButton* defaultButton = new BButton(frame, "ok button", "Ok",
291+ BButton* defaultButton = new BButton(frame, "ok button", "OK",
292 new BMessage(MSG_DONE),
293 B_FOLLOW_RIGHT | B_FOLLOW_TOP);
294 defaultButton->ResizeToPreferred();
295Index: src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp
296===================================================================
297--- src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp (Revision 34761)
298+++ src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp (Arbeitskopie)
299@@ -1,5 +1,5 @@
300 /*
301- * Copyright 2006-2007, Haiku Inc. All rights reserved.
302+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
303 * Distributed under the terms of the MIT License.
304 *
305 * Authors:
306@@ -321,7 +321,7 @@
307 fSelectM->AddItem(fSelectAllMI);
308 fSelectNoneMI = new BMenuItem("None", new BMessage(MSG_SELECT_NONE));
309 fSelectM->AddItem(fSelectNoneMI);
310- fInvertSelectionMI = new BMenuItem("Invert Selection", new BMessage(MSG_INVERT_SELECTION));
311+ fInvertSelectionMI = new BMenuItem("Invert selection", new BMessage(MSG_INVERT_SELECTION));
312 fSelectM->AddItem(fInvertSelectionMI);
313 fSelectM->SetTargetForItems(this);
314
315@@ -728,8 +728,8 @@
316 fPasteMI->SetEnabled(clipboardHasData);
317 // LanguageManager* m = LanguageManager::Default();
318 if (IsEditingMultipleObjects())
319-// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi Paste"));
320- fPasteMI->SetLabel("Multi Paste");
321+// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi paste"));
322+ fPasteMI->SetLabel("Multi paste");
323 else
324 // fPasteMI->SetLabel(m->GetString(PASTE, "Paste"));
325 fPasteMI->SetLabel("Paste");
326Index: src/apps/glteapot/TeapotWindow.cpp
327===================================================================
328--- src/apps/glteapot/TeapotWindow.cpp (Revision 34761)
329+++ src/apps/glteapot/TeapotWindow.cpp (Arbeitskopie)
330@@ -1,5 +1,6 @@
331 /*
332 Copyright 1999, Be Incorporated. All Rights Reserved.
333+ Copyright 2009, Haiku Inc.
334 This file may be used under the terms of the Be Sample Code License.
335 */
336
337@@ -50,7 +51,7 @@
338 menu->AddItem(item = new BMenuItem("Perspective", new BMessage(kMsgPerspective)));
339 item->SetTarget(fObjectView);
340 item->SetMarked(false);
341- menu->AddItem(item = new BMenuItem("FPS Display", new BMessage(kMsgFPS)));
342+ menu->AddItem(item = new BMenuItem("FPS display", new BMessage(kMsgFPS)));
343 item->SetTarget(fObjectView);
344 item->SetMarked(true);
345 menu->AddItem(item = new BMenuItem("Filled polygons", new BMessage(kMsgFilled)));
346Index: src/apps/aboutsystem/AboutSystem.cpp
347===================================================================
348--- src/apps/aboutsystem/AboutSystem.cpp (Revision 34761)
349+++ src/apps/aboutsystem/AboutSystem.cpp (Arbeitskopie)
350@@ -174,7 +174,7 @@
351
352
353 AboutWindow::AboutWindow()
354- : BWindow(BRect(0, 0, 500, 300), "About This System", B_TITLED_WINDOW,
355+ : BWindow(BRect(0, 0, 500, 300), "About this system", B_TITLED_WINDOW,
356 B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE)
357 {
358 SetLayout(new BGroupLayout(B_VERTICAL));
359@@ -447,7 +447,7 @@
360 .Add(_CreateLabel("kernellabel", "Kernel:"))
361 .Add(kernelView)
362 .AddStrut(offset)
363- .Add(_CreateLabel("uptimelabel", "Time Running:"))
364+ .Add(_CreateLabel("uptimelabel", "Time running:"))
365 .Add(fUptimeView)
366 .SetInsets(5, 5, 5, 5)
367 .End()
368@@ -481,7 +481,7 @@
369 {
370 BRect r(92, 26, 105, 31);
371 if (r.Contains(point)) {
372- printf("Easter Egg\n");
373+ printf("Easter egg\n");
374 PickRandomHaiku();
375 }
376
377@@ -728,7 +728,7 @@
378 font.SetFace(B_BOLD_FACE | B_ITALIC_FACE);
379
380 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
381- fCreditsView->Insert("Current Maintainers:\n");
382+ fCreditsView->Insert("Current maintainers:\n");
383
384 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
385 fCreditsView->Insert(
386@@ -772,7 +772,7 @@
387 "\n");
388
389 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
390- fCreditsView->Insert("Past Maintainers:\n");
391+ fCreditsView->Insert("Past maintainers:\n");
392
393 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
394 fCreditsView->Insert(
395@@ -799,7 +799,7 @@
396 "\n");
397
398 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
399- fCreditsView->Insert("Website, Marketing & Documentation:\n");
400+ fCreditsView->Insert("Website, marketing & documentation:\n");
401
402 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
403 fCreditsView->Insert(
404@@ -924,7 +924,7 @@
405 fCreditsView->Insert("\nGerman\n\n");
406 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
407 fCreditsView->Insert(
408- "Colin Gunther\n"
409+ "Colin Günther\n"
410 "svend\n"
411 "leszek\n"
412 );
413@@ -972,14 +972,14 @@
414 );
415
416 fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange);
417- fCreditsView->Insert("Special Thanks To:\n");
418+ fCreditsView->Insert("Special thanks to:\n");
419
420 fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey);
421 fCreditsView->Insert("Travis Geiselbrecht (and his NewOS kernel)\n");
422 fCreditsView->Insert("Michael Phipps (project founder)\n\n");
423- fCreditsView->Insert("The Haiku-Ports Team\n");
424- fCreditsView->Insert("The Haikuware Team and their Bounty Program\n");
425- fCreditsView->Insert("The BeGeistert Team\n\n");
426+ fCreditsView->Insert("The Haiku-Ports team\n");
427+ fCreditsView->Insert("The Haikuware team and their bounty program\n");
428+ fCreditsView->Insert("The BeGeistert team\n\n");
429 fCreditsView->Insert("... and the many community members making "
430 "donations!\n\n");
431
432@@ -1023,7 +1023,7 @@
433
434 // FreeBSD copyrights
435 AddCopyrightEntry("The FreeBSD Project",
436- "Contains software from the FreeBSD Project, "
437+ "Contains software from the FreeBSD Pproject, "
438 "released under the BSD licence:\n"
439 "cal, ftpd, ping, telnet, "
440 "telnetd, traceroute\n"
441@@ -1073,7 +1073,7 @@
442 // Mesa3D (http://www.mesa3d.org) copyrights
443 _AddPackageCredit(PackageCredit("Mesa")
444 .SetCopyright(COPYRIGHT_STRING "1999-2006 Brian Paul. "
445- "Mesa3D project. All rights reserved.")
446+ "Mesa3D Project. All rights reserved.")
447 .SetURL("http://www.mesa3d.org"));
448 // TODO: License!
449
450Index: src/apps/codycam/CodyCam.cpp
451===================================================================
452--- src/apps/codycam/CodyCam.cpp (Revision 34761)
453+++ src/apps/codycam/CodyCam.cpp (Arbeitskopie)
454@@ -216,7 +216,7 @@
455 }
456
457 case msg_about:
458- (new BAlert("About CodyCam", "CodyCam\n\nThe Original BeOS WebCam",
459+ (new BAlert("About CodyCam", "CodyCam\n\nThe original BeOS webcam",
460 "Close"))->Go();
461 break;
462
463@@ -241,14 +241,14 @@
464 /* find the media roster */
465 fMediaRoster = BMediaRoster::Roster(&status);
466 if (status != B_OK) {
467- ErrorAlert("Can't find the media roster", status, fWindow);
468+ ErrorAlert("Cannot find the media roster.", status, fWindow);
469 return status;
470 }
471
472 /* find the time source */
473 status = fMediaRoster->GetTimeSource(&fTimeSourceNode);
474 if (status != B_OK) {
475- ErrorAlert("Can't get a time source", status, fWindow);
476+ ErrorAlert("Cannot get a time source.", status, fWindow);
477 return status;
478 }
479
480@@ -256,7 +256,7 @@
481 INFO("CodyCam acquiring VideoInput node\n");
482 status = fMediaRoster->GetVideoInput(&fProducerNode);
483 if (status != B_OK) {
484- ErrorAlert("Can't find a video source. You need a webcam to use CodyCam.", status, fWindow);
485+ ErrorAlert("Cannot find a video source. You need a webcam to use CodyCam.", status, fWindow);
486 return status;
487 }
488
489@@ -264,14 +264,14 @@
490 fVideoConsumer = new VideoConsumer("CodyCam", ((VideoWindow*)fWindow)->VideoView(),
491 ((VideoWindow*)fWindow)->StatusLine(), NULL, 0);
492 if (!fVideoConsumer) {
493- ErrorAlert("Can't create a video window", B_ERROR, fWindow);
494+ ErrorAlert("Cannot create a video window.", B_ERROR, fWindow);
495 return B_ERROR;
496 }
497
498 /* register the node */
499 status = fMediaRoster->RegisterNode(fVideoConsumer);
500 if (status != B_OK) {
501- ErrorAlert("Can't register the video window", status, fWindow);
502+ ErrorAlert("Cannot register the video window.", status, fWindow);
503 return status;
504 }
505 fPort = fVideoConsumer->ControlPort();
506@@ -282,7 +282,7 @@
507 B_MEDIA_RAW_VIDEO);
508 if (status != B_OK || cnt < 1) {
509 status = B_RESOURCE_UNAVAILABLE;
510- ErrorAlert("Can't find an available video stream", status, fWindow);
511+ ErrorAlert("Cannot find an available video stream.", status, fWindow);
512 return status;
513 }
514
515@@ -292,7 +292,7 @@
516 &cnt, B_MEDIA_RAW_VIDEO);
517 if (status != B_OK || cnt < 1) {
518 status = B_RESOURCE_UNAVAILABLE;
519- ErrorAlert("Can't find an available connection to the video window", status, fWindow);
520+ ErrorAlert("Cannot find an available connection to the video window.", status, fWindow);
521 return status;
522 }
523
524@@ -307,7 +307,7 @@
525 status = fMediaRoster->Connect(fProducerOut.source, fConsumerIn.destination,
526 &format, &fProducerOut, &fConsumerIn);
527 if (status != B_OK) {
528- ErrorAlert("Can't connect the video source to the video window", status);
529+ ErrorAlert("Cannot connect the video source to the video window.", status);
530 return status;
531 }
532
533@@ -315,13 +315,13 @@
534 /* set time sources */
535 status = fMediaRoster->SetTimeSourceFor(fProducerNode.node, fTimeSourceNode.node);
536 if (status != B_OK) {
537- ErrorAlert("Can't set the timesource for the video source", status);
538+ ErrorAlert("Cannot set the time source for the video source.", status);
539 return status;
540 }
541
542 status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(), fTimeSourceNode.node);
543 if (status != B_OK) {
544- ErrorAlert("Can't set the timesource for the video window", status);
545+ ErrorAlert("Cannot set the time source for the video window.", status);
546 return status;
547 }
548
549@@ -334,7 +334,7 @@
550 bigtime_t initLatency = 0;
551 status = fMediaRoster->GetInitialLatencyFor(fProducerNode, &initLatency);
552 if (status < B_OK) {
553- ErrorAlert("error getting initial latency for fCaptureNode", status);
554+ ErrorAlert("Error getting initial latency for fCaptureNode.", status);
555 return status;
556 }
557
558@@ -350,13 +350,13 @@
559 status = fMediaRoster->StartTimeSource(fTimeSourceNode, real);
560 if (status != B_OK) {
561 timeSource->Release();
562- ErrorAlert("cannot start time source!", status);
563+ ErrorAlert("Cannot start time source!", status);
564 return status;
565 }
566 status = fMediaRoster->SeekTimeSource(fTimeSourceNode, 0, real);
567 if (status != B_OK) {
568 timeSource->Release();
569- ErrorAlert("cannot seek time source!", status);
570+ ErrorAlert("Cannot seek time source!", status);
571 return status;
572 }
573 }
574@@ -367,12 +367,12 @@
575 /* start the nodes */
576 status = fMediaRoster->StartNode(fProducerNode, perf);
577 if (status != B_OK) {
578- ErrorAlert("Can't start the video source", status);
579+ ErrorAlert("Cannot start the video source.", status);
580 return status;
581 }
582 status = fMediaRoster->StartNode(fVideoConsumer->Node(), perf);
583 if (status != B_OK) {
584- ErrorAlert("Can't start the video window", status);
585+ ErrorAlert("Cannot start the video window.", status);
586 return status;
587 }
588
589@@ -438,23 +438,23 @@
590 BMenuItem* menuItem;
591 BMenu* menu = new BMenu("File");
592
593- menuItem = new BMenuItem("Video Preferences", new BMessage(msg_video), 'P');
594+ menuItem = new BMenuItem("Video settings", new BMessage(msg_video), 'P');
595 menuItem->SetTarget(be_app);
596 menu->AddItem(menuItem);
597
598 menu->AddSeparatorItem();
599
600- menuItem = new BMenuItem("Start Video", new BMessage(msg_start), 'A');
601+ menuItem = new BMenuItem("Start video", new BMessage(msg_start), 'A');
602 menuItem->SetTarget(be_app);
603 menu->AddItem(menuItem);
604
605- menuItem = new BMenuItem("Stop Video", new BMessage(msg_stop), 'O');
606+ menuItem = new BMenuItem("Stop video", new BMessage(msg_stop), 'O');
607 menuItem->SetTarget(be_app);
608 menu->AddItem(menuItem);
609
610 menu->AddSeparatorItem();
611
612- menuItem = new BMenuItem("About Codycam", new BMessage(msg_about), 'B');
613+ menuItem = new BMenuItem("About Codycam" B_UTF8_ELLIPSIS, new BMessage(msg_about), 'B');
614 menuItem->SetTarget(be_app);
615 menu->AddItem(menuItem);
616
617@@ -676,8 +676,8 @@
618 && fImageFormatMenu->FindItem(fImageFormatSettings->Value()) != NULL) {
619 fImageFormatMenu->FindItem(
620 fImageFormatSettings->Value())->SetMarked(true);
621- } else if (fImageFormatMenu->FindItem("JPEG Image") != NULL)
622- fImageFormatMenu->FindItem("JPEG Image")->SetMarked(true);
623+ } else if (fImageFormatMenu->FindItem("JPEG image") != NULL)
624+ fImageFormatMenu->FindItem("JPEG image")->SetMarked(true);
625 else if (fImageFormatMenu->FindItem("JPEG image") != NULL)
626 fImageFormatMenu->FindItem("JPEG image")->SetMarked(true);
627 else
628@@ -846,7 +846,7 @@
629 fFilenameSetting = new StringValueSetting("StillImageFilename",
630 "codycam.jpg", "still image filename expected", "");
631 fImageFormatSettings = new StringValueSetting("ImageFileFormat",
632- "JPEG Image", "image file format expected", "");
633+ "JPEG image", "image file format expected", "");
634 fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate",
635 "Every 5 minutes", kCaptureRate, "capture rate expected",
636 "unrecognized capture rate specified");
637@@ -902,7 +902,7 @@
638
639
640 ControlWindow::ControlWindow(const BRect& frame, BView* controls, media_node node)
641- : BWindow(frame, "Video Preferences", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
642+ : BWindow(frame, "Video settings", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS)
643 {
644 fView = controls;
645 fNode = node;
646Index: src/apps/workspaces/Workspaces.cpp
647===================================================================
648--- src/apps/workspaces/Workspaces.cpp (Revision 34761)
649+++ src/apps/workspaces/Workspaces.cpp (Arbeitskopie)
650@@ -1,5 +1,5 @@
651 /*
652- * Copyright 2002-2008, Haiku, Inc.
653+ * Copyright 2002-2009, Haiku, Inc. All rights reserved.
654 * Copyright 2002, François Revol, revol@free.fr.
655 * This file is distributed under the terms of the MIT License.
656 *
657@@ -391,7 +391,7 @@
658 "written by François Revol, Axel Dörfler, and Matt Madia.\n\n"
659 "Copyright 2002-2008, Haiku.\n\n"
660 "Send windows behind using the Option key. "
661- "Move windows to front using the Control key.\n", "Ok");
662+ "Move windows to front using the Control key.\n", "OK");
663 BTextView *view = alert->TextView();
664 BFont font;
665
666@@ -537,7 +537,7 @@
667 menu->SetFont(be_plain_font);
668
669 // TODO: alternatively change the count here directly?
670- BMenuItem* changeItem = new BMenuItem("Change Workspace Count"
671+ BMenuItem* changeItem = new BMenuItem("Change workspace count"
672 B_UTF8_ELLIPSIS, new BMessage(kMsgChangeCount));
673 menu->AddItem(changeItem);
674
675@@ -546,28 +546,28 @@
676 BMenuItem* item;
677
678 menu->AddSeparatorItem();
679- menu->AddItem(item = new BMenuItem("Show Window Title",
680+ menu->AddItem(item = new BMenuItem("Show window title",
681 new BMessage(kMsgToggleTitle)));
682 if (window->Look() == B_TITLED_WINDOW_LOOK)
683 item->SetMarked(true);
684- menu->AddItem(item = new BMenuItem("Show Window Border",
685+ menu->AddItem(item = new BMenuItem("Show window border",
686 new BMessage(kMsgToggleBorder)));
687 if (window->Look() == B_TITLED_WINDOW_LOOK
688 || window->Look() == B_MODAL_WINDOW_LOOK)
689 item->SetMarked(true);
690
691 menu->AddSeparatorItem();
692- menu->AddItem(item = new BMenuItem("Always On Top",
693+ menu->AddItem(item = new BMenuItem("Always on top",
694 new BMessage(kMsgToggleAlwaysOnTop)));
695 if (window->Feel() == B_FLOATING_ALL_WINDOW_FEEL)
696 item->SetMarked(true);
697- menu->AddItem(item = new BMenuItem("Auto Raise",
698+ menu->AddItem(item = new BMenuItem("Auto-raise",
699 new BMessage(kMsgToggleAutoRaise)));
700 if (window->IsAutoRaising())
701 item->SetMarked(true);
702
703 menu->AddSeparatorItem();
704- menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS,
705+ menu->AddItem(new BMenuItem("About Workspaces" B_UTF8_ELLIPSIS,
706 new BMessage(B_ABOUT_REQUESTED)));
707 menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED)));
708 menu->SetTargetForItems(window);
709Index: src/apps/diskprobe/ProbeView.cpp
710===================================================================
711--- src/apps/diskprobe/ProbeView.cpp (Revision 34761)
712+++ src/apps/diskprobe/ProbeView.cpp (Arbeitskopie)
713@@ -519,7 +519,7 @@
714 if (editor.IsAttribute()) {
715 top += 3;
716 stringView = new BStringView(BRect(50, top, frame.right, top + 15),
717- B_EMPTY_STRING, "Attribute Type: ");
718+ B_EMPTY_STRING, "Attribute type: ");
719 stringView->SetFont(&boldFont);
720 stringView->ResizeToPreferred();
721 AddChild(stringView);
722@@ -590,8 +590,8 @@
723 rect.left = rect.right + 4;
724 rect.right = frame.right;
725 stringView = new BStringView(rect, B_EMPTY_STRING, editor.IsAttribute()
726- ? "Attribute Offset: " : editor.IsDevice()
727- ? "Device Offset: " : "File Offset: ");
728+ ? "Attribute offset: " : editor.IsDevice()
729+ ? "Device offset: " : "File offset: ");
730 stringView->SetFont(&boldFont);
731 stringView->ResizeToPreferred();
732 AddChild(stringView);
733@@ -1092,7 +1092,7 @@
734 // If the user had to wait more than 8 seconds for the result,
735 // we are trying to please him with a requester...
736 (new BAlert("DiskProbe request",
737- "Could not find search string.", "Ok", NULL, NULL,
738+ "Could not find search string.", "OK", NULL, NULL,
739 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
740 } else
741 beep();
742@@ -1119,7 +1119,7 @@
743
744 fTypeEditorView = GetTypeEditorAt(index, Frame(), editor);
745 if (fTypeEditorView == NULL) {
746- AddChild(new BStringView(Bounds(), "Type Editor",
747+ AddChild(new BStringView(Bounds(), "Type editor",
748 "Type editor not supported", B_FOLLOW_NONE));
749 } else
750 AddChild(fTypeEditorView);
751@@ -1323,7 +1323,7 @@
752 ProbeView::AddPrintMenuItems(BMenu* menu, int32 index)
753 {
754 BMenuItem *item;
755- menu->AddItem(item = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS,
756+ menu->AddItem(item = new BMenuItem("Page setup" B_UTF8_ELLIPSIS,
757 new BMessage(kMsgPageSetup)), index++);
758 item->SetTarget(this);
759 menu->AddItem(item = new BMenuItem("Print" B_UTF8_ELLIPSIS,
760@@ -1427,14 +1427,14 @@
761 'V'));
762 fPasteMenuItem->SetTarget(NULL, Window());
763 _CheckClipboard();
764- menu->AddItem(item = new BMenuItem("Select All", new BMessage(B_SELECT_ALL),
765+ menu->AddItem(item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL),
766 'A'));
767 item->SetTarget(NULL, Window());
768 menu->AddSeparatorItem();
769 menu->AddItem(item = new BMenuItem("Find" B_UTF8_ELLIPSIS,
770 new BMessage(kMsgOpenFindWindow), 'F'));
771 item->SetTarget(this);
772- menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find Again",
773+ menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find again",
774 new BMessage(kMsgFind), 'G'));
775 fFindAgainMenuItem->SetEnabled(false);
776 fFindAgainMenuItem->SetTarget(this);
777@@ -1546,7 +1546,7 @@
778
779 // Font Size
780
781- subMenu = new BMenu("Font Size");
782+ subMenu = new BMenu("Font size");
783 subMenu->SetRadioMode(true);
784 const int32 fontSizes[] = {9, 10, 11, 12, 13, 14, 18, 24, 36, 48};
785 int32 fontSize = int32(fDataView->FontSize() + 0.5);
786@@ -1841,7 +1841,7 @@
787 strerror(status));
788
789 (new BAlert("DiskProbe request",
790- buffer, "Ok", NULL, NULL,
791+ buffer, "OK", NULL, NULL,
792 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL);
793
794 return status;
795@@ -1857,7 +1857,7 @@
796 return true;
797
798 int32 chosen = (new BAlert("DiskProbe request",
799- "Save changes before closing?", "Don't Save", "Cancel", "Save",
800+ "Save changes before closing?", "Don't save", "Cancel", "Save",
801 B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go();
802
803 if (chosen == 0)
804Index: src/apps/diskprobe/FileWindow.cpp
805===================================================================
806--- src/apps/diskprobe/FileWindow.cpp (Revision 34761)
807+++ src/apps/diskprobe/FileWindow.cpp (Arbeitskopie)
808@@ -1,5 +1,5 @@
809 /*
810- * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
811+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
812 * Distributed under the terms of the MIT License.
813 */
814
815@@ -50,12 +50,12 @@
816 menu->AddItem(new BMenuItem("New" B_UTF8_ELLIPSIS,
817 new BMessage(kMsgOpenOpenWindow), 'N', B_COMMAND_KEY));
818
819- BMenu *devicesMenu = new BMenu("Open Device");
820+ BMenu *devicesMenu = new BMenu("Open device");
821 OpenWindow::CollectDevices(devicesMenu);
822 devicesMenu->SetTargetForItems(be_app);
823 menu->AddItem(new BMenuItem(devicesMenu));
824
825- BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open File" B_UTF8_ELLIPSIS,
826+ BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open file" B_UTF8_ELLIPSIS,
827 NULL, NULL, be_app, 10, false, NULL, kSignature);
828 BMenuItem *item;
829 menu->AddItem(item = new BMenuItem(recentsMenu, new BMessage(kMsgOpenFilePanel)));
830Index: src/apps/diskprobe/TypeEditors.cpp
831===================================================================
832--- src/apps/diskprobe/TypeEditors.cpp (Revision 34761)
833+++ src/apps/diskprobe/TypeEditors.cpp (Arbeitskopie)
834@@ -1,5 +1,5 @@
835 /*
836- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
837+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
838 * Distributed under the terms of the MIT License.
839 */
840
841@@ -191,7 +191,7 @@
842
843
844 StringEditor::StringEditor(BRect rect, DataEditor& editor)
845- : TypeEditorView(rect, "String Editor", B_FOLLOW_ALL, 0, editor)
846+ : TypeEditorView(rect, "String editor", B_FOLLOW_ALL, 0, editor)
847 {
848 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
849
850@@ -275,12 +275,12 @@
851
852
853 MimeTypeEditor::MimeTypeEditor(BRect rect, DataEditor& editor)
854- : TypeEditorView(rect, "MIME Type Editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
855+ : TypeEditorView(rect, "MIME type editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
856 {
857 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
858
859 fTextControl = new BTextControl(rect.InsetByCopy(5, 5), B_EMPTY_STRING,
860- "MIME Type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL);
861+ "MIME type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL);
862 fTextControl->SetDivider(StringWidth(fTextControl->Label()) + 8);
863
864 float width, height;
865@@ -366,7 +366,7 @@
866
867
868 NumberEditor::NumberEditor(BRect rect, DataEditor &editor)
869- : TypeEditorView(rect, "Number Editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
870+ : TypeEditorView(rect, "Number editor", B_FOLLOW_LEFT_RIGHT, 0, editor)
871 {
872 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
873
874@@ -593,33 +593,33 @@
875 {
876 switch (fEditor.Type()) {
877 case B_INT8_TYPE:
878- return "8 Bit Signed Value:";
879+ return "8 bit signed value:";
880 case B_UINT8_TYPE:
881- return "8 Bit Unsigned Value:";
882+ return "8 bit unsigned value:";
883 case B_INT16_TYPE:
884- return "16 Bit Signed Value:";
885+ return "16 bit signed value:";
886 case B_UINT16_TYPE:
887- return "16 Bit Unsigned Value:";
888+ return "16 bit unsigned value:";
889 case B_INT32_TYPE:
890- return "32 Bit Signed Value:";
891+ return "32 bit signed value:";
892 case B_UINT32_TYPE:
893- return "32 Bit Unsigned Value:";
894+ return "32 bit unsigned value:";
895 case B_INT64_TYPE:
896- return "64 Bit Signed Value:";
897+ return "64 bit signed value:";
898 case B_UINT64_TYPE:
899- return "64 Bit Unsigned Value:";
900+ return "64 bit unsigned value:";
901 case B_FLOAT_TYPE:
902- return "Floating-Point Value:";
903+ return "Floating-point value:";
904 case B_DOUBLE_TYPE:
905- return "Double Precision Floating-Point Value:";
906+ return "Double precision floating-point value:";
907 case B_SSIZE_T_TYPE:
908- return "32 Bit Size or Status:";
909+ return "32 bit size or status:";
910 case B_SIZE_T_TYPE:
911- return "32 Bit Unsigned Size:";
912+ return "32 bit unsigned size:";
913 case B_OFF_T_TYPE:
914- return "64 Bit Signed Offset:";
915+ return "64 bit signed offset:";
916 case B_POINTER_TYPE:
917- return "32 Bit Unsigned Pointer:";
918+ return "32 bit unsigned pointer:";
919 default:
920 return "Number:";
921 }
922@@ -742,7 +742,7 @@
923
924
925 BooleanEditor::BooleanEditor(BRect rect, DataEditor &editor)
926- : TypeEditorView(rect, "Boolean Editor", B_FOLLOW_NONE, 0, editor)
927+ : TypeEditorView(rect, "Boolean editor", B_FOLLOW_NONE, 0, editor)
928 {
929 SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
930
931@@ -755,7 +755,7 @@
932 message->AddInt8("value", 1);
933
934 BMenuField *menuField = new BMenuField(rect.InsetByCopy(5, 5),
935- B_EMPTY_STRING, "Boolean Value:", menu, B_FOLLOW_LEFT_RIGHT);
936+ B_EMPTY_STRING, "Boolean value:", menu, B_FOLLOW_LEFT_RIGHT);
937 menuField->SetDivider(StringWidth(menuField->Label()) + 8);
938 menuField->ResizeToPreferred();
939 ResizeTo(menuField->Bounds().Width() + 10,
940@@ -839,7 +839,7 @@
941
942
943 ImageView::ImageView(BRect rect, DataEditor &editor)
944- : TypeEditorView(rect, "Image View", B_FOLLOW_NONE, B_WILL_DRAW, editor),
945+ : TypeEditorView(rect, "Image view", B_FOLLOW_NONE, B_WILL_DRAW, editor),
946 fBitmap(NULL),
947 fScaleSlider(NULL)
948 {
949@@ -848,7 +848,7 @@
950 || editor.Type() == B_VECTOR_ICON_TYPE
951 #endif
952 )
953- SetName("Icon View");
954+ SetName("Icon view");
955
956 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
957 if (editor.Type() == B_VECTOR_ICON_TYPE) {
958@@ -1020,7 +1020,7 @@
959
960 if (fBitmap != NULL) {
961 char buffer[256];
962- const char *type = "Unknown Type";
963+ const char *type = "Unknown type";
964 switch (fEditor.Type()) {
965 case B_MINI_ICON_TYPE:
966 case B_LARGE_ICON_TYPE:
967@@ -1030,10 +1030,10 @@
968 type = "Icon";
969 break;
970 case B_PNG_FORMAT:
971- type = "PNG Format";
972+ type = "PNG format";
973 break;
974 case B_MESSAGE_TYPE:
975- type = "Flattened Bitmap";
976+ type = "Flattened bitmap";
977 break;
978 default:
979 break;
980@@ -1042,29 +1042,29 @@
981 switch (fBitmap->ColorSpace()) {
982 case B_GRAY1:
983 case B_GRAY8:
984- colorSpace = "Gray Scale";
985+ colorSpace = "Grayscale";
986 break;
987 case B_CMAP8:
988- colorSpace = "8 Bit Palette";
989+ colorSpace = "8 bit palette";
990 break;
991 case B_RGB32:
992 case B_RGBA32:
993 case B_RGB32_BIG:
994 case B_RGBA32_BIG:
995- colorSpace = "32 Bit";
996+ colorSpace = "32 bit";
997 break;
998 case B_RGB15:
999 case B_RGBA15:
1000 case B_RGB15_BIG:
1001 case B_RGBA15_BIG:
1002- colorSpace = "15 Bit";
1003+ colorSpace = "15 bit";
1004 break;
1005 case B_RGB16:
1006 case B_RGB16_BIG:
1007- colorSpace = "16 Bit";
1008+ colorSpace = "16 bit";
1009 break;
1010 default:
1011- colorSpace = "Unknown Format";
1012+ colorSpace = "Unknown format";
1013 break;
1014 }
1015 snprintf(buffer, sizeof(buffer), "%s, %g x %g, %s", type,
1016Index: src/apps/diskprobe/DiskProbe.cpp
1017===================================================================
1018--- src/apps/diskprobe/DiskProbe.cpp (Revision 34761)
1019+++ src/apps/diskprobe/DiskProbe.cpp (Arbeitskopie)
1020@@ -1,5 +1,5 @@
1021 /*
1022- * Copyright 2004-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1023+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1024 * Distributed under the terms of the MIT License.
1025 */
1026
1027@@ -346,7 +346,7 @@
1028 ref.name, strerror(status));
1029
1030 (new BAlert("DiskProbe request",
1031- buffer, "Ok", NULL, NULL,
1032+ buffer, "OK", NULL, NULL,
1033 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
1034 }
1035 }
1036@@ -465,7 +465,7 @@
1037 BAlert *alert = new BAlert("about", "DiskProbe\n"
1038 "\twritten by Axel Dörfler\n"
1039 "\tCopyright 2004-2007, Haiku.\n\n"
1040- "original Be version by Robert Polic\n", "Ok");
1041+ "Original Be version by Robert Polic\n", "OK");
1042 BTextView *view = alert->TextView();
1043 BFont font;
1044
1045Index: src/apps/diskprobe/OpenWindow.cpp
1046===================================================================
1047--- src/apps/diskprobe/OpenWindow.cpp (Revision 34761)
1048+++ src/apps/diskprobe/OpenWindow.cpp (Arbeitskopie)
1049@@ -35,13 +35,13 @@
1050 if (BMenuItem *item = fDevicesMenu->ItemAt(0))
1051 item->SetMarked(true);
1052
1053- BMenuField *field = new BMenuField("Examine Device:", fDevicesMenu, NULL);
1054+ BMenuField *field = new BMenuField("Examine device:", fDevicesMenu, NULL);
1055
1056- BButton *probeDeviceButton = new BButton("device", "Probe Device",
1057+ BButton *probeDeviceButton = new BButton("device", "Probe device",
1058 new BMessage(kMsgProbeDevice));
1059 probeDeviceButton->MakeDefault(true);
1060
1061- BButton *probeFileButton = new BButton("file", "Probe File" B_UTF8_ELLIPSIS,
1062+ BButton *probeFileButton = new BButton("file", "Probe file" B_UTF8_ELLIPSIS,
1063 new BMessage(kMsgProbeFile));
1064
1065 BButton *cancelButton = new BButton("cancel", "Cancel",
1066Index: src/apps/diskprobe/AttributeWindow.cpp
1067===================================================================
1068--- src/apps/diskprobe/AttributeWindow.cpp (Revision 34761)
1069+++ src/apps/diskprobe/AttributeWindow.cpp (Arbeitskopie)
1070@@ -1,5 +1,5 @@
1071 /*
1072- * Copyright 2004-2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1073+ * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
1074 * Distributed under the terms of the MIT License.
1075 */
1076
1077@@ -53,7 +53,7 @@
1078 {
1079 ContainerView()->MoveBy(-ContainerView()->Frame().left,
1080 TabHeight() + 1 - ContainerView()->Frame().top);
1081- fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type Editor",
1082+ fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type editor",
1083 "No type editor available", B_FOLLOW_NONE);
1084 fNoEditorView->ResizeToPreferred();
1085 fNoEditorView->SetAlignment(B_ALIGN_CENTER);
1086@@ -128,7 +128,7 @@
1087
1088 fRawTab = CountTabs();
1089
1090- view = new BView(BRect(0, 0, 5, 5), "Raw Editor", B_FOLLOW_NONE, 0);
1091+ view = new BView(BRect(0, 0, 5, 5), "Raw editor", B_FOLLOW_NONE, 0);
1092 view->SetViewColor(ViewColor());
1093 AddTab(view);
1094 }
1095@@ -208,7 +208,7 @@
1096 BMenu *menu = new BMenu("Attribute");
1097
1098 // the ProbeView save menu items will be inserted here
1099- menu->AddItem(new BMenuItem("Remove from File", new BMessage(kMsgRemoveAttribute)));
1100+ menu->AddItem(new BMenuItem("Remove from file", new BMessage(kMsgRemoveAttribute)));
1101 menu->AddSeparatorItem();
1102
1103 // the ProbeView print menu items will be inserted here
1104Index: src/apps/processcontroller/KernelMemoryBarMenuItem.cpp
1105===================================================================
1106--- src/apps/processcontroller/KernelMemoryBarMenuItem.cpp (Revision 34761)
1107+++ src/apps/processcontroller/KernelMemoryBarMenuItem.cpp (Arbeitskopie)
1108@@ -1,6 +1,7 @@
1109 /*
1110 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1111 Copyright (C) 2004 beunited.org
1112+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1113
1114 This library is free software; you can redistribute it and/or
1115 modify it under the terms of the GNU Lesser General Public
1116@@ -28,7 +29,7 @@
1117
1118
1119 KernelMemoryBarMenuItem::KernelMemoryBarMenuItem(system_info& systemInfo)
1120- : BMenuItem("System Resources & Caches" B_UTF8_ELLIPSIS, NULL)
1121+ : BMenuItem("System resources & caches" B_UTF8_ELLIPSIS, NULL)
1122 {
1123 fLastSum = -1;
1124 fGrenze1 = -1;
1125Index: src/apps/processcontroller/PriorityMenu.cpp
1126===================================================================
1127--- src/apps/processcontroller/PriorityMenu.cpp (Revision 34761)
1128+++ src/apps/processcontroller/PriorityMenu.cpp (Arbeitskopie)
1129@@ -1,7 +1,8 @@
1130 /*
1131 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1132 Copyright (C) 2004 beunited.org
1133-
1134+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1135+
1136 This library is free software; you can redistribute it and/or
1137 modify it under the terms of the GNU Lesser General Public
1138 License as published by the Free Software Foundation; either
1139@@ -54,14 +55,14 @@
1140
1141 static PriorityRec priorities[] = {
1142 {"Idle", 0},
1143- {"Lowest Active", 1},
1144+ {"Lowest active", 1},
1145 {"Low", 5},
1146 {"Normal", 10},
1147 {"Display", 15},
1148- {"Urgent Display", 20},
1149- {"Real Time Display", 100},
1150+ {"Urgent display", 20},
1151+ {"Real-time display", 100},
1152 {"Urgent", 110},
1153- {"Real Time", 120},
1154+ {"Real-time", 120},
1155 {"", -1}
1156 };
1157
1158@@ -88,7 +89,7 @@
1159 message = new BMessage('PrTh');
1160 message->AddInt32("thread", fThreadID);
1161 message->AddInt32("priority", priority->priority);
1162- sprintf(name, "%s Priority [%d]", priority->name, (int)priority->priority);
1163+ sprintf(name, "%s priority [%d]", priority->name, (int)priority->priority);
1164 item = new BMenuItem(name, message);
1165 item->SetTarget(gPCView);
1166 if (fPriority == priority->priority)
1167Index: src/apps/processcontroller/NoiseBarMenuItem.cpp
1168===================================================================
1169--- src/apps/processcontroller/NoiseBarMenuItem.cpp (Revision 34761)
1170+++ src/apps/processcontroller/NoiseBarMenuItem.cpp (Arbeitskopie)
1171@@ -1,7 +1,8 @@
1172 /*
1173 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1174 Copyright (C) 2004 beunited.org
1175-
1176+ Copyright (C) 2009 Haiku, Inc. All rights reserved.
1177+
1178 This library is free software; you can redistribute it and/or
1179 modify it under the terms of the GNU Lesser General Public
1180 License as published by the Free Software Foundation; either
1181@@ -25,7 +26,7 @@
1182
1183
1184 NoiseBarMenuItem::NoiseBarMenuItem()
1185- : BMenuItem("Gone Teams" B_UTF8_ELLIPSIS, NULL)
1186+ : BMenuItem("Gone teams" B_UTF8_ELLIPSIS, NULL)
1187 {
1188 fBusyWaiting = -1;
1189 fLost = -1;
1190Index: src/apps/processcontroller/ProcessController.cpp
1191===================================================================
1192--- src/apps/processcontroller/ProcessController.cpp (Revision 34761)
1193+++ src/apps/processcontroller/ProcessController.cpp (Arbeitskopie)
1194@@ -1,7 +1,7 @@
1195 /*
1196 ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
1197 Copyright (C) 2004 beunited.org
1198- Copyright (c) 2006 Haiku, Inc. All Rights Reserved.
1199+ Copyright (c) 2006-2009 Haiku, Inc. All rights reserved.
1200
1201 This library is free software; you can redistribute it and/or
1202 modify it under the terms of the GNU Lesser General Public
1203@@ -258,7 +258,7 @@
1204 if (get_team_info(team, &infos.team_info) == B_OK) {
1205 get_team_name_and_icon(infos);
1206 sprintf(question, "Do you really want to kill the team \"%s\"?", infos.team_name);
1207- alert = new BAlert("", question, "Cancel", "Yes, Kill this Team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
1208+ alert = new BAlert("", question, "Cancel", "Yes, kill this team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT);
1209 alert->SetShortcut(0, B_ESCAPE);
1210 if (alert->Go())
1211 kill_team(team);
1212@@ -275,7 +275,7 @@
1213 if (get_thread_info(thread, &thinfo) == B_OK) {
1214 #if DEBUG_THREADS
1215 sprintf(question, "What do you want to do with the thread \"%s\"?", thinfo.name);
1216- alert = new BAlert("", question, "Cancel", "Debug this Thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT);
1217+ alert = new BAlert("", question, "Cancel", "Debug this thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT);
1218 #define KILL 2
1219 #else
1220 sprintf(question, "Are you sure you want to kill the thread \"%s\"?", thinfo.name);
1221@@ -374,7 +374,7 @@
1222 BAlert *alert = new BAlert("about", "ProcessController\n\n"
1223 "Copyright 1997-2001,\n"
1224 "Georges-Edouard Berenger.\n\n"
1225- "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "Close");
1226+ "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "OK");
1227 BTextView *view = alert->TextView();
1228 BFont font;
1229
1230@@ -636,12 +636,12 @@
1231 popup->SetFont(be_plain_font);
1232
1233 // Quit section
1234- BMenu* QuitPopup = new QuitMenu("Quit an Application", infos, systemInfo.used_teams);
1235+ BMenu* QuitPopup = new QuitMenu("Quit an application", infos, systemInfo.used_teams);
1236 QuitPopup->SetFont(be_plain_font);
1237 popup->AddItem(QuitPopup);
1238
1239 // Memory Usage section
1240- MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory Usage", infos, systemInfo);
1241+ MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory usage", infos, systemInfo);
1242 int commitedMemory = int(systemInfo.used_pages * B_PAGE_SIZE / 1024);
1243 for (m = 0; m < systemInfo.used_teams; m++) {
1244 if (infos[m].team_info.team >= 0) {
1245@@ -654,7 +654,7 @@
1246 addtopbottom(MemoryPopup);
1247
1248 // CPU Load section
1249- TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU Usage", infos, systemInfo.used_teams);
1250+ TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU usage", infos, systemInfo.used_teams);
1251 for (m = 0; m < systemInfo.used_teams; m++) {
1252 if (infos[m].team_info.team >= 0) {
1253 ThreadBarMenu* TeamPopup = new ThreadBarMenu(infos[m].team_name, infos[m].team_info.team, infos[m].team_info.thread_count);
1254Index: src/apps/devices/DevicesApplication.cpp
1255===================================================================
1256--- src/apps/devices/DevicesApplication.cpp (Revision 34761)
1257+++ src/apps/devices/DevicesApplication.cpp (Arbeitskopie)
1258@@ -56,7 +56,7 @@
1259 "\tBased on listdev by Jérôme Duval\n"
1260 "\tand the previous Devices preference\n"
1261 "\tby Jérôme Duval and Sikosis\n"
1262- "\tCopyright 2009, Haiku Inc.\n", "Ok");
1263+ "\tCopyright 2009, Haiku Inc.\n", "OK");
1264 BTextView* view = alert->TextView();
1265 BFont font;
1266
1267Index: src/apps/devices/DevicesView.cpp
1268===================================================================
1269--- src/apps/devices/DevicesView.cpp (Revision 34761)
1270+++ src/apps/devices/DevicesView.cpp (Arbeitskopie)
1271@@ -32,11 +32,11 @@
1272 BMenuBar* menuBar = new BMenuBar("menu");
1273 BMenu* menu = new BMenu("Devices");
1274 BMenuItem* item;
1275- menu->AddItem(new BMenuItem("Refresh Devices", new BMessage(kMsgRefresh), 'R'));
1276- menu->AddItem(item = new BMenuItem("Report Compatibility",
1277+ menu->AddItem(new BMenuItem("Refresh devices", new BMessage(kMsgRefresh), 'R'));
1278+ menu->AddItem(item = new BMenuItem("Report compatibility",
1279 new BMessage(kMsgReportCompatibility)));
1280 item->SetEnabled(false);
1281- menu->AddItem(item = new BMenuItem("Generate System Information",
1282+ menu->AddItem(item = new BMenuItem("Generate system information",
1283 new BMessage(kMsgGenerateSysInfo)));
1284 item->SetEnabled(false);
1285 menu->AddSeparatorItem();
1286@@ -60,9 +60,9 @@
1287 // why? Bug? In scrollview or in outlinelistview?
1288
1289 BPopUpMenu* orderByPopupMenu = new BPopUpMenu("orderByMenu");
1290- BMenuItem* byCategory = new BMenuItem("category",
1291+ BMenuItem* byCategory = new BMenuItem("Category",
1292 new BMessage(kMsgOrderCategory));
1293- BMenuItem* byConnection = new BMenuItem("connection",
1294+ BMenuItem* byConnection = new BMenuItem("Connection",
1295 new BMessage(kMsgOrderConnection));
1296 byCategory->SetMarked(true);
1297 fOrderBy = byCategory->IsMarked() ? ORDER_BY_CATEGORY :
1298@@ -76,7 +76,7 @@
1299 fBasicTab = new BTab();
1300 fBasicView = new PropertyListPlain("basicView");
1301 fTabView->AddTab(fBasicView, fBasicTab);
1302- fBasicTab->SetLabel("Basic Information");
1303+ fBasicTab->SetLabel("Basic information");
1304
1305 fDeviceTypeTab = new BTab();
1306 fBusView = new PropertyListPlain("busView");
1307@@ -286,14 +286,14 @@
1308 // PCI bus
1309 if (attributes[i].fName == "device/pretty name"
1310 && attributes[i].fValue == "PCI") {
1311- newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI Bus");
1312+ newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI bus");
1313 break;
1314 }
1315
1316 // ISA bus
1317 if (attributes[i].fName == "device/bus"
1318 && attributes[i].fValue == "isa") {
1319- newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA Bus");
1320+ newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA bus");
1321 break;
1322 }
1323
1324@@ -306,7 +306,7 @@
1325 }
1326
1327 if (newDevice == NULL) {
1328- newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown Device");
1329+ newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown device");
1330 }
1331
1332 // Add its attributes to the device, initialize it and add to the list.
1333Index: src/apps/devices/DevicePCI.cpp
1334===================================================================
1335--- src/apps/devices/DevicePCI.cpp (Revision 34761)
1336+++ src/apps/devices/DevicePCI.cpp (Arbeitskopie)
1337@@ -74,7 +74,7 @@
1338 const char *venFull;
1339 get_vendor_info(fVendorId, &venShort, &venFull);
1340 if (!venShort && !venFull) {
1341- ManufacturerName << "Unkown";
1342+ ManufacturerName << "Unknown";
1343 } else if (venShort && venFull) {
1344 ManufacturerName << venFull << "(" << venShort << ")";
1345 } else {
1346@@ -98,7 +98,7 @@
1347 SetAttribute("Manufacturer", ManufacturerName);
1348 SetAttribute("Driver used", "Not implemented");
1349 SetAttribute("Device paths", "Not implemented");
1350- SetAttribute("Class Info", classInfo);
1351+ SetAttribute("Class info", classInfo);
1352 fCategory = (Category)fClassBaseId;
1353 BString outlineName;
1354 outlineName << ManufacturerName << " " << DeviceName;
1355Index: src/apps/launchbox/PadView.cpp
1356===================================================================
1357--- src/apps/launchbox/PadView.cpp (Revision 34761)
1358+++ src/apps/launchbox/PadView.cpp (Arbeitskopie)
1359@@ -320,7 +320,7 @@
1360 // add button
1361 BMessage* message = new BMessage(MSG_ADD_SLOT);
1362 message->AddPointer("be:source", (void*)nearestButton);
1363- BMenuItem* item = new BMenuItem("Add Button Here", message);
1364+ BMenuItem* item = new BMenuItem("Add button here", message);
1365 item->SetTarget(window);
1366 menu->AddItem(item);
1367 // button options
1368@@ -328,20 +328,20 @@
1369 // clear button
1370 message = new BMessage(MSG_CLEAR_SLOT);
1371 message->AddPointer("be:source", (void*)button);
1372- item = new BMenuItem("Clear Button", message);
1373+ item = new BMenuItem("Clear button", message);
1374 item->SetTarget(window);
1375 menu->AddItem(item);
1376 // remove button
1377 message = new BMessage(MSG_REMOVE_SLOT);
1378 message->AddPointer("be:source", (void*)button);
1379- item = new BMenuItem("Remove Button", message);
1380+ item = new BMenuItem("Remove button", message);
1381 item->SetTarget(window);
1382 menu->AddItem(item);
1383 // set button description
1384 if (button->Ref()) {
1385 message = new BMessage(MSG_SET_DESCRIPTION);
1386 message->AddPointer("be:source", (void*)button);
1387- item = new BMenuItem("Set Description"B_UTF8_ELLIPSIS, message);
1388+ item = new BMenuItem("Set description"B_UTF8_ELLIPSIS, message);
1389 item->SetTarget(window);
1390 menu->AddItem(item);
1391 }
1392@@ -353,9 +353,9 @@
1393
1394 const char* toggleLayoutLabel;
1395 if (fButtonLayout->Orientation() == B_HORIZONTAL)
1396- toggleLayoutLabel = "Vertical Layout";
1397+ toggleLayoutLabel = "Vertical layout";
1398 else
1399- toggleLayoutLabel = "Horizontal Layout";
1400+ toggleLayoutLabel = "Horizontal layout";
1401 item = new BMenuItem(toggleLayoutLabel, new BMessage(MSG_TOGGLE_LAYOUT));
1402 item->SetTarget(this);
1403 settingsM->AddItem(item);
1404@@ -374,24 +374,24 @@
1405 }
1406 settingsM->AddItem(iconSizeM);
1407
1408- item = new BMenuItem("Ignore Double-click",
1409+ item = new BMenuItem("Ignore double-click",
1410 new BMessage(MSG_SET_IGNORE_DOUBLECLICK));
1411 item->SetTarget(this);
1412 item->SetMarked(IgnoreDoubleClick());
1413 settingsM->AddItem(item);
1414
1415 uint32 what = window->Look() == B_BORDERED_WINDOW_LOOK ? MSG_SHOW_BORDER : MSG_HIDE_BORDER;
1416- item = new BMenuItem("Show Window Border", new BMessage(what));
1417+ item = new BMenuItem("Show window border", new BMessage(what));
1418 item->SetTarget(window);
1419 item->SetMarked(what == MSG_HIDE_BORDER);
1420 settingsM->AddItem(item);
1421
1422- item = new BMenuItem("Auto Raise", new BMessage(MSG_TOGGLE_AUTORAISE));
1423+ item = new BMenuItem("Auto-raise", new BMessage(MSG_TOGGLE_AUTORAISE));
1424 item->SetTarget(window);
1425 item->SetMarked(window->AutoRaise());
1426 settingsM->AddItem(item);
1427
1428- item = new BMenuItem("Show On All Workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES));
1429+ item = new BMenuItem("Show on all workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES));
1430 item->SetTarget(window);
1431 item->SetMarked(window->ShowOnAllWorkspaces());
1432 settingsM->AddItem(item);
1433Index: src/apps/launchbox/NamePanel.cpp
1434===================================================================
1435--- src/apps/launchbox/NamePanel.cpp (Revision 34761)
1436+++ src/apps/launchbox/NamePanel.cpp (Arbeitskopie)
1437@@ -30,7 +30,7 @@
1438 fTarget(target),
1439 fMessage(message)
1440 {
1441- BButton* defaultButton = new BButton("Ok", new BMessage(MSG_PANEL_OK));
1442+ BButton* defaultButton = new BButton("OK", new BMessage(MSG_PANEL_OK));
1443 BButton* cancelButton = new BButton("Cancel",
1444 new BMessage(MSG_PANEL_CANCEL));
1445 fNameTC = new BTextControl(label, text, NULL);
1446Index: src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp
1447===================================================================
1448--- src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp (Revision 34761)
1449+++ src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp (Arbeitskopie)
1450@@ -129,7 +129,7 @@
1451 ref.name, strerror(status));
1452
1453 (new BAlert("Debugger request",
1454- buffer, "Ok", NULL, NULL,
1455+ buffer, "OK", NULL, NULL,
1456 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
1457 }
1458 }
1459@@ -219,7 +219,7 @@
1460 {
1461 BAlert *alert = new BAlert("about", "Debugger\n"
1462 "\twritten by Philippe Houdoin\n"
1463- "\tCopyright 2009, Haiku Inc.\n", "Ok");
1464+ "\tCopyright 2009, Haiku Inc.\n", "OK");
1465 BTextView *view = alert->TextView();
1466 BFont font;
1467
1468Index: src/apps/mandelbrot/Mandelbrot.cpp
1469===================================================================
1470--- src/apps/mandelbrot/Mandelbrot.cpp (Revision 34761)
1471+++ src/apps/mandelbrot/Mandelbrot.cpp (Arbeitskopie)
1472@@ -1,5 +1,7 @@
1473 /*
1474 Copyright 1993-1999, Be Incorporated. All Rights Reserved.
1475+ Copyright 2009, Haiku, Inc. All rights reserved.
1476+
1477 This file may be used under the terms of the Be Sample Code License.
1478 */
1479
1480@@ -56,10 +58,10 @@
1481 menuBar->AddItem(menu);
1482
1483 menu = new BMenu("Palette");
1484- menu->AddItem(new BMenuItem("Palette1", new BMessage(P1)));
1485- menu->AddItem(new BMenuItem("Palette2", new BMessage(P2)));
1486- menu->AddItem(item = new BMenuItem("Palette3", new BMessage(P3)));
1487- menu->AddItem(new BMenuItem("Palette4", new BMessage(P4)));
1488+ menu->AddItem(new BMenuItem("Palette 1", new BMessage(P1)));
1489+ menu->AddItem(new BMenuItem("Palette 2", new BMessage(P2)));
1490+ menu->AddItem(item = new BMenuItem("Palette 3", new BMessage(P3)));
1491+ menu->AddItem(new BMenuItem("Palette 4", new BMessage(P4)));
1492 menuBar->AddItem(menu);
1493
1494 item->SetMarked(true);
1495Index: src/apps/haiku3d/App.cpp
1496===================================================================
1497--- src/apps/haiku3d/App.cpp (Revision 34761)
1498+++ src/apps/haiku3d/App.cpp (Arbeitskopie)
1499@@ -39,7 +39,7 @@
1500 App::AboutRequested()
1501 {
1502 BAlert* alert;
1503- alert = new BAlert("About", "A little 3d demo", "ok");
1504+ alert = new BAlert("About", "A little 3d demo", "OK");
1505 alert->Go(NULL);
1506 }
1507
1508Index: src/apps/3dmov/GLMovStrings.h
1509===================================================================
1510--- src/apps/3dmov/GLMovStrings.h (Revision 34761)
1511+++ src/apps/3dmov/GLMovStrings.h (Arbeitskopie)
1512@@ -1,5 +1,5 @@
1513 /*
1514- * Copyright 2004-2007, Haiku Inc. All rights reserved.
1515+ * Copyright 2004-2009, Haiku Inc. All rights reserved.
1516 * Distributed under the terms of the MIT License.
1517 *
1518 * Authors:
1519@@ -10,7 +10,7 @@
1520 #define _GLMOVSTRINGS_H
1521
1522 #define STR_ABOUT_TEXT "3DMov reloaded.\n\n Demonstrates OpenGL and the Media Kit."
1523-#define STR_OK "Ok"
1524+#define STR_OK "OK"
1525
1526 #define STR_MENU "File" //not really related.... "Object" ?
1527
1528Index: src/apps/magnify/Magnify.cpp
1529===================================================================
1530--- src/apps/magnify/Magnify.cpp (Revision 34761)
1531+++ src/apps/magnify/Magnify.cpp (Arbeitskopie)
1532@@ -1,5 +1,5 @@
1533 /*
1534- * Copyright 2002-2008, Haiku, Inc. All Rights Reserved.
1535+ * Copyright 2002-2009, Haiku, Inc. All Rights Reserved.
1536 * Distributed under the terms of the MIT License.
1537 *
1538 * Updated by Sikosis (beos@gravity24hr.com)
1539@@ -132,40 +132,40 @@
1540 menu->AddItem(menuItem);
1541 menu->AddSeparatorItem();
1542
1543- menuItem = new BMenuItem("Save Image", new BMessage(msg_save),'S');
1544+ menuItem = new BMenuItem("Save image", new BMessage(msg_save),'S');
1545 menu->AddItem(menuItem);
1546-// menuItem = new BMenuItem("Save Selection", new BMessage(msg_save),'S');
1547+// menuItem = new BMenuItem("Save selection", new BMessage(msg_save),'S');
1548 // menu->AddItem(menuItem);
1549- menuItem = new BMenuItem("Copy Image", new BMessage(msg_copy_image),'C');
1550+ menuItem = new BMenuItem("Copy image", new BMessage(msg_copy_image),'C');
1551 menu->AddItem(menuItem);
1552 menu->AddSeparatorItem();
1553
1554- menuItem = new BMenuItem("Hide/Show Info", new BMessage(msg_show_info),'T');
1555+ menuItem = new BMenuItem("Hide/Show info", new BMessage(msg_show_info),'T');
1556 menu->AddItem(menuItem);
1557- menuItem = new BMenuItem("Add a Crosshair", new BMessage(msg_add_cross_hair),'H');
1558+ menuItem = new BMenuItem("Add a crosshair", new BMessage(msg_add_cross_hair),'H');
1559 menu->AddItem(menuItem);
1560- menuItem = new BMenuItem("Remove a Crosshair", new BMessage(msg_remove_cross_hair), 'H',
1561+ menuItem = new BMenuItem("Remove a crosshair", new BMessage(msg_remove_cross_hair), 'H',
1562 B_SHIFT_KEY);
1563 menu->AddItem(menuItem);
1564- menuItem = new BMenuItem("Hide/Show Grid", new BMessage(msg_toggle_grid),'G');
1565+ menuItem = new BMenuItem("Hide/Show grid", new BMessage(msg_toggle_grid),'G');
1566 menu->AddItem(menuItem);
1567 menu->AddSeparatorItem();
1568
1569 menuItem = new BMenuItem("Freeze/Unfreeze image", new BMessage(msg_freeze),'F');
1570 menu->AddItem(menuItem);
1571- menuItem = new BMenuItem("Stick Coordinates", new BMessage(msg_stick), 'I');
1572+ menuItem = new BMenuItem("Stick coordinates", new BMessage(msg_stick), 'I');
1573 menu->AddItem(menuItem);
1574 menu->AddSeparatorItem();
1575
1576- menuItem = new BMenuItem("Make Square", new BMessage(msg_make_square),'/');
1577+ menuItem = new BMenuItem("Make square", new BMessage(msg_make_square),'/');
1578 menu->AddItem(menuItem);
1579- menuItem = new BMenuItem("Decrease Window Size", new BMessage(msg_shrink),'-');
1580+ menuItem = new BMenuItem("Decrease window size", new BMessage(msg_shrink),'-');
1581 menu->AddItem(menuItem);
1582- menuItem = new BMenuItem("Increase Window Size", new BMessage(msg_grow),'+');
1583+ menuItem = new BMenuItem("Increase window size", new BMessage(msg_grow),'+');
1584 menu->AddItem(menuItem);
1585- menuItem = new BMenuItem("Decrease Pixel Size", new BMessage(msg_shrink_pixel),',');
1586+ menuItem = new BMenuItem("Decrease pixel size", new BMessage(msg_shrink_pixel),',');
1587 menu->AddItem(menuItem);
1588- menuItem = new BMenuItem("Increase Pixel Size", new BMessage(msg_grow_pixel),'.');
1589+ menuItem = new BMenuItem("Increase pixel size", new BMessage(msg_grow_pixel),'.');
1590 menu->AddItem(menuItem);
1591 }
1592
1593@@ -771,7 +771,7 @@
1594 TWindow::ShowHelp()
1595 {
1596 BRect r(0, 0, 375, 240);
1597- BWindow* w = new BWindow(r, "Magnify Help", B_TITLED_WINDOW,
1598+ BWindow* w = new BWindow(r, "Magnify help", B_TITLED_WINDOW,
1599 B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE);
1600
1601 r.right -= B_V_SCROLL_BAR_WIDTH;
1602@@ -810,7 +810,7 @@
1603 text->Insert(" freeze - freezes/unfreezes magnification of whatever the\n");
1604 text->Insert(" cursor is currently over\n");
1605 text->Insert("\n\n");
1606- text->Insert("Sizing & Resizing:\n");
1607+ text->Insert("Sizing/Resizing:\n");
1608 text->Insert(" make square - sets the width and the height to the larger\n");
1609 text->Insert(" of the two making a square image\n");
1610 text->Insert(" increase/decrease window size - grows or shrinks the window\n");
1611@@ -1013,31 +1013,31 @@
1612 if (fMainWindow)
1613 state = fMainWindow->IsActive();
1614
1615- BMenuItem* menuItem = FindItem("Hide/Show Info");
1616+ BMenuItem* menuItem = FindItem("Hide/Show info");
1617 if (menuItem)
1618 menuItem->SetEnabled(state);
1619- menuItem = FindItem("Add a Crosshair");
1620+ menuItem = FindItem("Add a crosshair");
1621 if (menuItem)
1622 menuItem->SetEnabled(state);
1623- menuItem = FindItem("Remove a Crosshair");
1624+ menuItem = FindItem("Remove a crosshair");
1625 if (menuItem)
1626 menuItem->SetEnabled(state);
1627- menuItem = FindItem("Hide/Show Grid");
1628+ menuItem = FindItem("Hide/Show grid");
1629 if (menuItem)
1630 menuItem->SetEnabled(state);
1631- menuItem = FindItem("Make Square");
1632+ menuItem = FindItem("Make square");
1633 if (menuItem)
1634 menuItem->SetEnabled(state);
1635- menuItem = FindItem("Decrease Window Size");
1636+ menuItem = FindItem("Decrease window size");
1637 if (menuItem)
1638 menuItem->SetEnabled(state);
1639- menuItem = FindItem("Increase Window Size");
1640+ menuItem = FindItem("Increase window size");
1641 if (menuItem)
1642 menuItem->SetEnabled(state);
1643- menuItem = FindItem("Decrease Pixel Size");
1644+ menuItem = FindItem("Decrease pixel size");
1645 if (menuItem)
1646 menuItem->SetEnabled(state);
1647- menuItem = FindItem("Increase Pixel Size");
1648+ menuItem = FindItem("Increase pixel size");
1649 if (menuItem)
1650 menuItem->SetEnabled(state);
1651
1652Index: src/apps/drivesetup/PartitionList.cpp
1653===================================================================
1654--- src/apps/drivesetup/PartitionList.cpp (Revision 34761)
1655+++ src/apps/drivesetup/PartitionList.cpp (Arbeitskopie)
1656@@ -249,11 +249,11 @@
1657 {
1658 AddColumn(new PartitionColumn("Device", 150, 50, 500,
1659 B_TRUNCATE_MIDDLE), kDeviceColumn);
1660- AddColumn(new PartitionColumn("Filesystem", 100, 50, 500,
1661+ AddColumn(new PartitionColumn("File system", 100, 50, 500,
1662 B_TRUNCATE_MIDDLE), kFilesystemColumn);
1663- AddColumn(new PartitionColumn("Volume Name", 130, 50, 500,
1664+ AddColumn(new PartitionColumn("Volume name", 130, 50, 500,
1665 B_TRUNCATE_MIDDLE), kVolumeNameColumn);
1666- AddColumn(new PartitionColumn("Mounted At", 100, 50, 500,
1667+ AddColumn(new PartitionColumn("Mounted at", 100, 50, 500,
1668 B_TRUNCATE_MIDDLE), kMountedAtColumn);
1669 AddColumn(new PartitionColumn("Size", 100, 50, 500,
1670 B_TRUNCATE_END, B_ALIGN_RIGHT), kSizeColumn);
1671Index: src/apps/drivesetup/MainWindow.cpp
1672===================================================================
1673--- src/apps/drivesetup/MainWindow.cpp (Revision 34761)
1674+++ src/apps/drivesetup/MainWindow.cpp (Arbeitskopie)
1675@@ -164,7 +164,7 @@
1676 fFormatMI = new BMenuItem("Format (not implemented)",
1677 new BMessage(MSG_FORMAT));
1678 fEjectMI = new BMenuItem("Eject", new BMessage(MSG_EJECT), 'E');
1679- fSurfaceTestMI = new BMenuItem("Surface Test (not implemented)",
1680+ fSurfaceTestMI = new BMenuItem("Surface test (not implemented)",
1681 new BMessage(MSG_SURFACE_TEST));
1682 fRescanMI = new BMenuItem("Rescan", new BMessage(MSG_RESCAN));
1683
1684@@ -174,7 +174,7 @@
1685
1686 fMountMI = new BMenuItem("Mount", new BMessage(MSG_MOUNT), 'M');
1687 fUnmountMI = new BMenuItem("Unmount", new BMessage(MSG_UNMOUNT), 'U');
1688- fMountAllMI = new BMenuItem("Mount All",
1689+ fMountAllMI = new BMenuItem("Mount all",
1690 new BMessage(MSG_MOUNT_ALL), 'M', B_SHIFT_KEY);
1691
1692 // Disk menu
1693@@ -622,7 +622,7 @@
1694 sprintf(message, "%s\n\nError: %s", helper.String(), strerror(error));
1695 }
1696
1697- BAlert* alert = new BAlert("error", message, "Ok", NULL, NULL,
1698+ BAlert* alert = new BAlert("error", message, "OK", NULL, NULL,
1699 B_WIDTH_FROM_WIDEST, error < B_OK ? B_STOP_ALERT : B_INFO_ALERT);
1700 alert->Go(NULL);
1701 }
1702@@ -642,7 +642,7 @@
1703
1704 BPartition* partition = disk->FindDescendant(selectedPartition);
1705 if (!partition) {
1706- _DisplayPartitionError("Unable to find the selected partition by id.");
1707+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1708 return;
1709 }
1710
1711@@ -673,7 +673,7 @@
1712
1713 BPartition* partition = disk->FindDescendant(selectedPartition);
1714 if (!partition) {
1715- _DisplayPartitionError("Unable to find the selected partition by id.");
1716+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1717 return;
1718 }
1719
1720@@ -757,7 +757,7 @@
1721
1722 BPartition* partition = disk->FindDescendant(selectedPartition);
1723 if (!partition) {
1724- _DisplayPartitionError("Unable to find the selected partition by id.");
1725+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1726 return;
1727 }
1728
1729@@ -801,9 +801,9 @@
1730
1731 // allow BFS only, since our parameter string
1732 // construction only handles BFS at the moment
1733- if (diskSystemName != "Be File System"
1734- && diskSystemName != "Intel Partition Map"
1735- && diskSystemName != "Intel Extended Partition") {
1736+ if (diskSystemName != "Be file system"
1737+ && diskSystemName != "Intel partition map"
1738+ && diskSystemName != "Intel extended partition") {
1739 _DisplayPartitionError("Don't know how to construct parameters "
1740 "for this file system.");
1741 return;
1742@@ -819,14 +819,14 @@
1743
1744 BString name;
1745 BString parameters;
1746- if (diskSystemName == "Be File System") {
1747+ if (diskSystemName == "Be file system") {
1748 InitParamsPanel* panel = new InitParamsPanel(this, diskSystemName,
1749 partition);
1750 if (panel->Go(name, parameters) == GO_CANCELED)
1751 return;
1752- } else if (diskSystemName == "Intel Partition Map") {
1753+ } else if (diskSystemName == "Intel partition map") {
1754 // TODO: parameters?
1755- } else if (diskSystemName == "Intel Extended Partition") {
1756+ } else if (diskSystemName == "Intel extended partition") {
1757 // TODO: parameters?
1758 }
1759
1760@@ -862,9 +862,9 @@
1761 message << "All data on the partition";
1762 if (previousName.Length() > 0)
1763 message << " \"" << previousName << "\"";
1764- message << " will be irrevertably lost if you do so!";
1765+ message << " will be irretrievably lost if you do so!";
1766 alert = new BAlert("final notice", message.String(),
1767- "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1768+ "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1769 choice = alert->Go();
1770
1771 if (choice == 1)
1772@@ -873,7 +873,7 @@
1773 // commit
1774 ret = modificationPreparer.CommitModifications();
1775
1776- // The partition pointer is toast now! Use the partition id to
1777+ // The partition pointer is toast now! Use the partition ID to
1778 // retrieve it again.
1779 partition = disk->FindDescendant(selectedPartition);
1780
1781@@ -969,9 +969,9 @@
1782 BString message = "Are you sure you want to write the changes back to "
1783 "disk now?\n\n";
1784 message << "All data on the partition";
1785- message << " will be irrevertably lost if you do so!";
1786+ message << " will be irretrievably lost if you do so!";
1787 BAlert* alert = new BAlert("final notice", message.String(),
1788- "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1789+ "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT);
1790 int32 choice = alert->Go();
1791
1792 if (choice == 1)
1793@@ -1018,7 +1018,7 @@
1794
1795 BPartition* partition = disk->FindDescendant(selectedPartition);
1796 if (!partition) {
1797- _DisplayPartitionError("Unable to find the selected partition by id.");
1798+ _DisplayPartitionError("Unable to find the selected partition by ID.");
1799 return;
1800 }
1801
1802@@ -1045,9 +1045,9 @@
1803 // Warn the user one more time...
1804 BString message = "Are you sure you want to delete the selected ";
1805 message << "partition?\n\nAll data on the partition";
1806- message << " will be irrevertably lost if you do so!";
1807+ message << " will be irretrievably lost if you do so!";
1808 BAlert* alert = new BAlert("final notice", message.String(),
1809- "Delete Partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST,
1810+ "Delete partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST,
1811 B_WARNING_ALERT);
1812 int32 choice = alert->Go();
1813
1814Index: src/apps/drivesetup/CreateParamsPanel.cpp
1815===================================================================
1816--- src/apps/drivesetup/CreateParamsPanel.cpp (Revision 34761)
1817+++ src/apps/drivesetup/CreateParamsPanel.cpp (Arbeitskopie)
1818@@ -218,11 +218,11 @@
1819 off_t size)
1820 {
1821 // Setup the controls
1822- fSizeSlider = new SizeSlider("Slider", "Partition Size", NULL, offset,
1823+ fSizeSlider = new SizeSlider("Slider", "Partition size:", NULL, offset,
1824 offset + size);
1825 fSizeSlider->SetPosition(1.0);
1826
1827- fNameTextControl = new BTextControl("Name Control", "Partition Name",
1828+ fNameTextControl = new BTextControl("Name Control", "Partition name:",
1829 "", NULL);
1830 if (!parent->SupportsChildName())
1831 fNameTextControl->SetEnabled(false);
1832@@ -242,7 +242,7 @@
1833 item->SetMarked(true);
1834 }
1835
1836- fTypeMenuField = new BMenuField("Partition Type", fTypePopUpMenu, NULL);
1837+ fTypeMenuField = new BMenuField("Partition type:", fTypePopUpMenu, NULL);
1838
1839 fOKButton = new BButton("Create", new BMessage(MSG_OK));
1840 fCancelButton = new BButton("Cancel", new BMessage(MSG_CANCEL));
1841Index: src/apps/autoraise/AutoRaiseIcon.cpp
1842===================================================================
1843--- src/apps/autoraise/AutoRaiseIcon.cpp (Revision 34761)
1844+++ src/apps/autoraise/AutoRaiseIcon.cpp (Arbeitskopie)
1845@@ -171,7 +171,7 @@
1846 AddSeparatorItem();
1847 // AddItem(new BMenuItem("Settings...", new BMessage(OPEN_SETTINGS)));
1848
1849- AddItem(new BMenuItem("About "APP_NAME, new BMessage(B_ABOUT_REQUESTED)));
1850+ AddItem(new BMenuItem("About "APP_NAME B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED)));
1851 AddItem(new BMenuItem("Remove from tray", new BMessage(REMOVE_FROM_TRAY)));
1852
1853 SetTargetForItems(tv);
1854@@ -543,7 +543,7 @@
1855 break;
1856 }
1857 case B_ABOUT_REQUESTED:
1858- alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "Ok", NULL, NULL,
1859+ alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "OK", NULL, NULL,
1860 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
1861 alert->SetShortcut(0, B_ENTER);
1862 alert->Go(NULL); // use asynchronous version
1863Index: src/apps/autoraise/AutoRaiseApp.cpp
1864===================================================================
1865--- src/apps/autoraise/AutoRaiseApp.cpp (Revision 34761)
1866+++ src/apps/autoraise/AutoRaiseApp.cpp (Arbeitskopie)
1867@@ -67,7 +67,7 @@
1868 if (!_directToDeskbar)
1869 {
1870 printf("\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put " APP_NAME " into tray such that it remains between bootings\n");
1871- BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "Ok", NULL, NULL,
1872+ BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "OK", NULL, NULL,
1873 B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT);
1874 alert->SetShortcut(0, B_ENTER);
1875 alert->Go();
1876Index: src/apps/mediaplayer/MainWin.cpp
1877===================================================================
1878--- src/apps/mediaplayer/MainWin.cpp (Revision 34761)
1879+++ src/apps/mediaplayer/MainWin.cpp (Arbeitskopie)
1880@@ -1071,7 +1071,7 @@
1881 fPlaylistMenu = new BMenu("Playlist"B_UTF8_ELLIPSIS);
1882 fAudioMenu = new BMenu("Audio");
1883 fVideoMenu = new BMenu("Video");
1884- fVideoAspectMenu = new BMenu("Aspect Ratio");
1885+ fVideoAspectMenu = new BMenu("Aspect ratio");
1886 fSettingsMenu = new BMenu("Settings");
1887 fAudioTrackMenu = new BMenu("Track");
1888 fVideoTrackMenu = new BMenu("Track");
1889@@ -1081,7 +1081,7 @@
1890 fMenuBar->AddItem(fVideoMenu);
1891 fMenuBar->AddItem(fSettingsMenu);
1892
1893- fFileMenu->AddItem(new BMenuItem("New Player"B_UTF8_ELLIPSIS,
1894+ fFileMenu->AddItem(new BMenuItem("New player"B_UTF8_ELLIPSIS,
1895 new BMessage(M_FILE_NEWPLAYER), 'N'));
1896 fFileMenu->AddSeparatorItem();
1897
1898@@ -1090,12 +1090,12 @@
1899 // Add recent files
1900 BRecentFilesList recentFiles(10, false, NULL, kAppSig);
1901 BMenuItem *item = new BMenuItem(recentFiles.NewFileListMenu(
1902- "Open File"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED),
1903+ "Open file"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED),
1904 NULL, this, 10, false, NULL, 0, kAppSig), new BMessage(M_FILE_OPEN));
1905 item->SetShortcut('O', 0);
1906 fFileMenu->AddItem(item);
1907
1908- fFileMenu->AddItem(new BMenuItem("File Info"B_UTF8_ELLIPSIS,
1909+ fFileMenu->AddItem(new BMenuItem("File info"B_UTF8_ELLIPSIS,
1910 new BMessage(M_FILE_INFO), 'I'));
1911 fFileMenu->AddItem(fPlaylistMenu);
1912 fPlaylistMenu->Superitem()->SetShortcut('P', B_COMMAND_KEY);
1913@@ -1136,7 +1136,7 @@
1914
1915 fVideoMenu->AddSeparatorItem();
1916
1917- fVideoMenu->AddItem(new BMenuItem("Full Screen",
1918+ fVideoMenu->AddItem(new BMenuItem("Full screen",
1919 new BMessage(M_TOGGLE_FULLSCREEN), 'F'));
1920
1921 fVideoMenu->AddSeparatorItem();
1922@@ -1144,10 +1144,10 @@
1923 _SetupVideoAspectItems(fVideoAspectMenu);
1924 fVideoMenu->AddItem(fVideoAspectMenu);
1925
1926- fNoInterfaceMenuItem = new BMenuItem("No Interface",
1927+ fNoInterfaceMenuItem = new BMenuItem("No interface",
1928 new BMessage(M_TOGGLE_NO_INTERFACE), 'B');
1929 fSettingsMenu->AddItem(fNoInterfaceMenuItem);
1930- fSettingsMenu->AddItem(new BMenuItem("Always on Top",
1931+ fSettingsMenu->AddItem(new BMenuItem("Always on top",
1932 new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T'));
1933 fSettingsMenu->AddSeparatorItem();
1934 item = new BMenuItem("Settings"B_UTF8_ELLIPSIS,
1935@@ -1176,12 +1176,12 @@
1936 // "Stream Settings" and "16 : 9" if the stream settings happen to
1937 // be "16 : 9".
1938
1939- menu->AddItem(item = new BMenuItem("Stream Settings",
1940+ menu->AddItem(item = new BMenuItem("Stream settings",
1941 new BMessage(M_ASPECT_SAME_AS_SOURCE)));
1942 item->SetMarked(widthAspect == fWidthAspect
1943 && heightAspect == fHeightAspect);
1944
1945- menu->AddItem(item = new BMenuItem("No Aspect Correction",
1946+ menu->AddItem(item = new BMenuItem("No aspect correction",
1947 new BMessage(M_ASPECT_NO_DISTORTION)));
1948 item->SetMarked(width == fWidthAspect && height == fHeightAspect);
1949
1950@@ -1546,18 +1546,18 @@
1951 printf("Show context menu\n");
1952 BPopUpMenu *menu = new BPopUpMenu("context menu", false, false);
1953 BMenuItem *item;
1954- menu->AddItem(item = new BMenuItem("Full Screen",
1955+ menu->AddItem(item = new BMenuItem("Full screen",
1956 new BMessage(M_TOGGLE_FULLSCREEN), 'F'));
1957 item->SetMarked(fIsFullscreen);
1958 item->SetEnabled(fHasVideo);
1959
1960- BMenu* aspectSubMenu = new BMenu("Aspect Ratio");
1961+ BMenu* aspectSubMenu = new BMenu("Aspect ratio");
1962 _SetupVideoAspectItems(aspectSubMenu);
1963 aspectSubMenu->SetTargetForItems(this);
1964 menu->AddItem(item = new BMenuItem(aspectSubMenu));
1965 item->SetEnabled(fHasVideo);
1966
1967- menu->AddItem(item = new BMenuItem("No Interface",
1968+ menu->AddItem(item = new BMenuItem("No interface",
1969 new BMessage(M_TOGGLE_NO_INTERFACE), 'B'));
1970 item->SetMarked(fNoInterface);
1971 item->SetEnabled(fHasVideo);
1972@@ -1565,8 +1565,8 @@
1973 menu->AddSeparatorItem();
1974
1975 // Add track selector menus
1976- BMenu* audioTrackMenu = new BMenu("Audio Track");
1977- BMenu* videoTrackMenu = new BMenu("Video Track");
1978+ BMenu* audioTrackMenu = new BMenu("Audio track");
1979+ BMenu* videoTrackMenu = new BMenu("Video track");
1980 _SetupTrackMenus(audioTrackMenu, videoTrackMenu);
1981
1982 audioTrackMenu->SetTargetForItems(this);
1983Index: src/apps/mediaplayer/InfoWin.cpp
1984===================================================================
1985--- src/apps/mediaplayer/InfoWin.cpp (Revision 34761)
1986+++ src/apps/mediaplayer/InfoWin.cpp (Arbeitskopie)
1987@@ -1,7 +1,7 @@
1988 /*
1989 * InfoWin.cpp - Media Player for the Haiku Operating System
1990 *
1991- * Copyright (C) 2006 Marcus Overhagen <marcus@overhagen.de>
1992+ * Copyright (C) 2006-2009 Marcus Overhagen <marcus@overhagen.de>
1993 *
1994 * This program is free software; you can redistribute it and/or
1995 * modify it under the terms of the GNU General Public License
1996@@ -415,7 +415,7 @@
1997 fContentsView->Insert(s.String());
1998 // TODO: demux/video/audio/... perfs (Kb/s)
1999
2000- fLabelsView->Insert("Display Mode\n");
2001+ fLabelsView->Insert("Display mode\n");
2002 if (fController->IsOverlayActive())
2003 fContentsView->Insert("Overlay\n");
2004 else
2005Index: src/apps/mediaplayer/settings/SettingsWindow.cpp
2006===================================================================
2007--- src/apps/mediaplayer/settings/SettingsWindow.cpp (Revision 34761)
2008+++ src/apps/mediaplayer/settings/SettingsWindow.cpp (Arbeitskopie)
2009@@ -1,5 +1,5 @@
2010 /*
2011- * Copyright 2008, Haiku. All rights reserved.
2012+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
2013 * Distributed under the terms of the MIT License.
2014 *
2015 * Authors:
2016@@ -46,7 +46,7 @@
2017 #define BUTTONHEIGHT 20
2018
2019 SettingsWindow::SettingsWindow(BRect frame)
2020- : BWindow(frame, "MediaPlayer Settings", B_FLOATING_WINDOW_LOOK,
2021+ : BWindow(frame, "MediaPlayer settings", B_FLOATING_WINDOW_LOOK,
2022 B_FLOATING_APP_WINDOW_FEEL,
2023 B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
2024 #ifdef __HAIKU__
2025@@ -115,7 +115,7 @@
2026 BButton* cancelButton = new BButton("cancel", "Cancel",
2027 new BMessage(M_SETTINGS_CANCEL));
2028
2029- BButton* okButton = new BButton("ok", "Ok",
2030+ BButton* okButton = new BButton("ok", "OK",
2031 new BMessage(M_SETTINGS_SAVE));
2032 okButton->MakeDefault(true);
2033
2034Index: src/apps/mediaplayer/media_node_framework/NodeManager.cpp
2035===================================================================
2036--- src/apps/mediaplayer/media_node_framework/NodeManager.cpp (Revision 34761)
2037+++ src/apps/mediaplayer/media_node_framework/NodeManager.cpp (Arbeitskopie)
2038@@ -1,6 +1,6 @@
2039 /*
2040- * Copyright (c) 2000-2008, Ingo Weinhold <ingo_weinhold@gmx.de>,
2041- * Copyright (c) 2000-2008, Stephan Aßmus <superstippi@gmx.de>,
2042+ * Copyright (c) 2000-2009, Ingo Weinhold <ingo_weinhold@gmx.de>,
2043+ * Copyright (c) 2000-2009, Stephan Aßmus <superstippi@gmx.de>,
2044 * All Rights Reserved. Distributed under the terms of the MIT license.
2045 */
2046 #include "NodeManager.h"
2047@@ -315,7 +315,7 @@
2048 bool useOverlays)
2049 {
2050 // create the video producer node
2051- fVideoProducer = new VideoProducer(NULL, "MediaPlayer Video Out", 0,
2052+ fVideoProducer = new VideoProducer(NULL, "MediaPlayer video out", 0,
2053 this, fVideoSupplier);
2054
2055 // register the producer node
2056@@ -331,7 +331,7 @@
2057 fVideoConnection.producer = fVideoProducer->Node();
2058
2059 // create the video consumer node
2060- fVideoConsumer = new VideoConsumer("MediaPlayer Video In", NULL, 0, this,
2061+ fVideoConsumer = new VideoConsumer("MediaPlayer video in", NULL, 0, this,
2062 fVideoTarget);
2063
2064 // register the consumer node
2065@@ -448,7 +448,7 @@
2066 status_t
2067 NodeManager::_SetUpAudioNodes(float audioFrameRate, uint32 audioChannels)
2068 {
2069- fAudioProducer = new AudioProducer("MediaPlayer Audio Out", fAudioSupplier);
2070+ fAudioProducer = new AudioProducer("MediaPlayer audio out", fAudioSupplier);
2071 fAudioProducer->SetPeakListener(fPeakListener);
2072 fStatus = fMediaRoster->RegisterNode(fAudioProducer);
2073 if (fStatus != B_OK) {
2074Index: src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp
2075===================================================================
2076--- src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp (Revision 34761)
2077+++ src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp (Arbeitskopie)
2078@@ -44,7 +44,7 @@
2079 fNewCount = temp.CountItems();
2080 if (fNewCount <= 0) {
2081 BAlert* alert = new BAlert("Nothing to Play", "None of the files "
2082- "you wanted to play appear to be media files.", "Ok");
2083+ "you wanted to play appear to be media files.", "OK");
2084 alert->Go(NULL);
2085 return;
2086 }
2087Index: src/apps/mediaplayer/playlist/PlaylistWindow.cpp
2088===================================================================
2089--- src/apps/mediaplayer/playlist/PlaylistWindow.cpp (Revision 34761)
2090+++ src/apps/mediaplayer/playlist/PlaylistWindow.cpp (Arbeitskopie)
2091@@ -228,7 +228,7 @@
2092 menuBar->AddItem(fileMenu);
2093 fileMenu->AddItem(new BMenuItem("Open"B_UTF8_ELLIPSIS,
2094 new BMessage(M_PLAYLIST_OPEN), 'O'));
2095- fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS,
2096+ fileMenu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS,
2097 new BMessage(M_PLAYLIST_SAVE_AS), 'S', B_SHIFT_KEY));
2098 // fileMenu->AddItem(new BMenuItem("Save",
2099 // new BMessage(M_PLAYLIST_SAVE), 'S'));
2100@@ -249,9 +249,9 @@
2101 editMenu->AddSeparatorItem();
2102 editMenu->AddItem(new BMenuItem("Remove (Del)",
2103 new BMessage(M_PLAYLIST_REMOVE)/*, B_DELETE, 0*/));
2104- editMenu->AddItem(new BMenuItem("Remove and Put into Trash",
2105+ editMenu->AddItem(new BMenuItem("Remove and put into Trash",
2106 new BMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH), 'T'));
2107- editMenu->AddItem(new BMenuItem("Remove All",
2108+ editMenu->AddItem(new BMenuItem("Remove all",
2109 new BMessage(M_PLAYLIST_EMPTY), 'N'));
2110
2111 menuBar->AddItem(editMenu);
2112@@ -292,7 +292,7 @@
2113 static void
2114 display_save_alert(const char* message)
2115 {
2116- BAlert* alert = new BAlert("Save Error", message, "Ok", NULL, NULL,
2117+ BAlert* alert = new BAlert("Save error", message, "OK", NULL, NULL,
2118 B_WIDTH_AS_USUAL, B_STOP_ALERT);
2119 alert->Go(NULL);
2120 }
2121@@ -315,7 +315,7 @@
2122 if (message->FindRef("directory", &ref) != B_OK
2123 || message->FindString("name", &name) != B_OK) {
2124 display_save_alert("Internal error (malformed message). "
2125- "Saving the Playlist failed.");
2126+ "Saving the playlist failed.");
2127 return;
2128 }
2129
2130@@ -328,7 +328,7 @@
2131 || origPath.Append(name) != B_OK
2132 || tempPath.Append(tempName.String()) != B_OK) {
2133 display_save_alert("Internal error (out of memory). "
2134- "Saving the Playlist failed.");
2135+ "Saving the playlist failed.");
2136 return;
2137 }
2138
2139@@ -336,7 +336,7 @@
2140 BEntry tempEntry(tempPath.Path());
2141 if (origEntry.InitCheck() != B_OK || tempEntry.InitCheck() != B_OK) {
2142 display_save_alert("Internal error (out of memory). "
2143- "Saving the Playlist failed.");
2144+ "Saving the playlist failed.");
2145 return;
2146 }
2147
2148@@ -393,7 +393,7 @@
2149 AutoLocker<Playlist> lock(fPlaylist);
2150 if (!lock.IsLocked()) {
2151 display_save_alert("Internal error (locking failed). "
2152- "Saving the Playlist failed.");
2153+ "Saving the playlist failed.");
2154 return;
2155 }
2156
2157Index: src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp
2158===================================================================
2159--- src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp (Revision 34761)
2160+++ src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp (Arbeitskopie)
2161@@ -109,10 +109,10 @@
2162 message << "All ";
2163 else
2164 message << "Some ";
2165- message << "files could not be moved into the Trash.\n\n";
2166+ message << "files could not be moved into Trash.\n\n";
2167 message << "Error: " << strerror(moveError);
2168 (new BAlert("Move Into Trash Error", message.String(),
2169- "Ok", NULL, NULL, B_WIDTH_AS_USUAL,
2170+ "OK", NULL, NULL, B_WIDTH_AS_USUAL,
2171 B_WARNING_ALERT))->Go(NULL);
2172 }
2173 }
2174Index: src/apps/mediaplayer/MainApp.cpp
2175===================================================================
2176--- src/apps/mediaplayer/MainApp.cpp (Revision 34761)
2177+++ src/apps/mediaplayer/MainApp.cpp (Arbeitskopie)
2178@@ -2,7 +2,7 @@
2179 * MainApp.cpp - Media Player for the Haiku Operating System
2180 *
2181 * Copyright (C) 2006 Marcus Overhagen <marcus@overhagen.de>
2182- * Copyright (C) 2008 Stephan Aßmus <superstippi@gmx.de> (MIT Ok)
2183+ * Copyright (C) 2009 Stephan Aßmus <superstippi@gmx.de> (MIT Ok)
2184 *
2185 * This program is free software; you can redistribute it and/or
2186 * modify it under the terms of the GNU General Public License
2187@@ -80,8 +80,8 @@
2188
2189 if (!fMediaServerRunning || !fMediaAddOnServerRunning) {
2190 BAlert* alert = new BAlert("start_media_server",
2191- "It appears the Media Server is not running.\n"
2192- "Would you like to start it ?", "Quit", "Start Media Server", NULL,
2193+ "It appears the media server is not running.\n"
2194+ "Would you like to start it ?", "Quit", "Start media server", NULL,
2195 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
2196 if (alert->Go() == 0) {
2197 PostMessage(B_QUIT_REQUESTED);
2198@@ -344,7 +344,7 @@
2199 void
2200 MainApp::AboutRequested()
2201 {
2202- BAlert* alert = new BAlert("about", NAME"\n\n Written by Marcus Overhagen "
2203+ BAlert* alert = new BAlert("about", NAME"\n\nWritten by Marcus Overhagen "
2204 ", Stephan Aßmus and Frederik Modéen", "Thanks");
2205 alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL);
2206 // Make sure it is on top of any player windows that may have the
2207@@ -586,7 +586,7 @@
2208 }
2209
2210 // set descriptions
2211- ret = mime.SetShortDescription("MediaPlayer Playlist");
2212+ ret = mime.SetShortDescription("MediaPlayer playlist");
2213 if (ret != B_OK) {
2214 fprintf(stderr, "Could not set short description of mime type: %s\n",
2215 strerror(ret));
2216Index: src/apps/networkstatus/NetworkStatusView.cpp
2217===================================================================
2218--- src/apps/networkstatus/NetworkStatusView.cpp (Revision 34761)
2219+++ src/apps/networkstatus/NetworkStatusView.cpp (Arbeitskopie)
2220@@ -1,5 +1,5 @@
2221 /*
2222- * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
2223+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
2224 * Distributed under the terms of the MIT License.
2225 *
2226 * Authors:
2227@@ -43,7 +43,7 @@
2228
2229 static const char *kStatusDescriptions[] = {
2230 "Unknown",
2231- "No Link",
2232+ "No link",
2233 "No stateful configuration",
2234 "Configuring",
2235 "Ready"
2236@@ -346,7 +346,7 @@
2237 text += address;
2238 }
2239
2240- BAlert* alert = new BAlert(name, text.String(), "Ok");
2241+ BAlert* alert = new BAlert(name, text.String(), "OK");
2242 BTextView* view = alert->TextView();
2243 BFont font;
2244
2245@@ -382,7 +382,7 @@
2246 menu->AddSeparatorItem();
2247 //menu->AddItem(new BMenuItem("About NetworkStatus" B_UTF8_ELLIPSIS,
2248 // new BMessage(B_ABOUT_REQUESTED)));
2249- menu->AddItem(new BMenuItem("Open Networks Preferences" B_UTF8_ELLIPSIS,
2250+ menu->AddItem(new BMenuItem("Open network preferences" B_UTF8_ELLIPSIS,
2251 new BMessage(kMsgOpenNetworkPreferences)));
2252
2253 if (fInDeskbar)
2254@@ -399,7 +399,7 @@
2255 {
2256 BAlert* alert = new BAlert("about", "NetworkStatus\n"
2257 "\twritten by Axel Dörfler and Hugo Santos\n"
2258- "\tCopyright 2007, Haiku, Inc.\n", "Ok");
2259+ "\tCopyright 2007, Haiku, Inc.\n", "OK");
2260 BTextView *view = alert->TextView();
2261 BFont font;
2262
2263@@ -512,11 +512,11 @@
2264 {
2265 status_t status = be_roster->Launch("application/x-vnd.Haiku-Network");
2266 if (status != B_OK && status != B_ALREADY_RUNNING) {
2267- BString errorMessage("Launching the Network preflet failed.\n\n"
2268+ BString errorMessage("Launching the network preflet failed.\n\n"
2269 "Error: ");
2270 errorMessage << strerror(status);
2271 BAlert* alert = new BAlert("launch error", errorMessage.String(),
2272- "Ok");
2273+ "OK");
2274
2275 // asynchronous alert in order to not block replicant host application
2276 alert->Go(NULL);
2277Index: src/apps/midiplayer/MidiPlayerWindow.cpp
2278===================================================================
2279--- src/apps/midiplayer/MidiPlayerWindow.cpp (Revision 34761)
2280+++ src/apps/midiplayer/MidiPlayerWindow.cpp (Arbeitskopie)
2281@@ -1,5 +1,6 @@
2282 /*
2283- * Copyright (c) 2004 Matthijs Hollemans
2284+ * Copyright (c) 2004, Matthijs Hollemans
2285+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
2286 *
2287 * Permission is hereby granted, free of charge, to any person obtaining a
2288 * copy of this software and associated documentation files (the "Software"),
2289@@ -192,7 +193,7 @@
2290
2291 inputPopUp->AddItem(inputOff);
2292
2293- inputMenu = new BMenuField("Live Input:", inputPopUp, NULL);
2294+ inputMenu = new BMenuField("Live input:", inputPopUp, NULL);
2295 }
2296
2297 //------------------------------------------------------------------------------
2298@@ -211,7 +212,7 @@
2299 "Garage", new BMessage(MSG_REVERB_GARAGE));
2300
2301 reverbIgor = new BMenuItem(
2302- "Igor's Lab", new BMessage(MSG_REVERB_IGOR));
2303+ "Igor's lab", new BMessage(MSG_REVERB_IGOR));
2304
2305 reverbCavern = new BMenuItem(
2306 "Cavern", new BMessage(MSG_REVERB_CAVERN));
2307@@ -397,7 +398,7 @@
2308 scopeView->Invalidate();
2309
2310 (new BAlert(
2311- NULL, "Could not load song", "Okay", NULL, NULL,
2312+ NULL, "Could not load song", "OK", NULL, NULL,
2313 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
2314 }
2315 }
2316Index: src/apps/activitymonitor/ActivityMonitor.cpp
2317===================================================================
2318--- src/apps/activitymonitor/ActivityMonitor.cpp (Revision 34761)
2319+++ src/apps/activitymonitor/ActivityMonitor.cpp (Arbeitskopie)
2320@@ -1,5 +1,5 @@
2321 /*
2322- * Copyright 2008, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
2323+ * Copyright 2008-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
2324 * Distributed under the terms of the MIT License.
2325 */
2326
2327@@ -63,7 +63,7 @@
2328 {
2329 BAlert *alert = new BAlert("about", "ActivityMonitor\n"
2330 "\twritten by Axel Dörfler\n"
2331- "\tCopyright 2008, Haiku Inc.\n", "Ok");
2332+ "\tCopyright 2008, Haiku Inc.\n", "OK");
2333 BTextView *view = alert->TextView();
2334 BFont font;
2335
2336Index: src/apps/activitymonitor/ActivityWindow.cpp
2337===================================================================
2338--- src/apps/activitymonitor/ActivityWindow.cpp (Revision 34761)
2339+++ src/apps/activitymonitor/ActivityWindow.cpp (Arbeitskopie)
2340@@ -116,7 +116,7 @@
2341 BMenu* menu = new BMenu("File");
2342 BMenuItem* item;
2343
2344- menu->AddItem(new BMenuItem("Add View", new BMessage(kMsgAddView)));
2345+ menu->AddItem(new BMenuItem("Add graph", new BMessage(kMsgAddView)));
2346 menu->AddSeparatorItem();
2347
2348 menu->AddItem(item = new BMenuItem("About ActivityMonitor" B_UTF8_ELLIPSIS,
2349Index: src/apps/activitymonitor/ActivityView.cpp
2350===================================================================
2351--- src/apps/activitymonitor/ActivityView.cpp (Revision 34761)
2352+++ src/apps/activitymonitor/ActivityView.cpp (Arbeitskopie)
2353@@ -978,7 +978,7 @@
2354 BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false);
2355 menu->SetFont(be_plain_font);
2356
2357- BMenu* additionalMenu = new BMenu("Additional Items");
2358+ BMenu* additionalMenu = new BMenu("Additional items");
2359 additionalMenu->SetFont(be_plain_font);
2360
2361 SystemInfo info;
2362@@ -1005,7 +1005,7 @@
2363
2364 menu->AddItem(new BMenuItem(additionalMenu));
2365 menu->AddSeparatorItem();
2366- menu->AddItem(new BMenuItem(fShowLegend ? "Hide Legend" : "Show Legend",
2367+ menu->AddItem(new BMenuItem(fShowLegend ? "Hide legend" : "Show legend",
2368 new BMessage(kMsgToggleLegend)));
2369
2370 menu->SetTargetForItems(this);
2371@@ -1016,7 +1016,7 @@
2372 menu->AddSeparatorItem();
2373 BMessage* message = new BMessage(kMsgRemoveView);
2374 message->AddPointer("view", this);
2375- menu->AddItem(item = new BMenuItem("Remove View", message));
2376+ menu->AddItem(item = new BMenuItem("Remove graph", message));
2377 item->SetTarget(window);
2378 }
2379
2380Index: src/apps/activitymonitor/SettingsWindow.cpp
2381===================================================================
2382--- src/apps/activitymonitor/SettingsWindow.cpp (Revision 34761)
2383+++ src/apps/activitymonitor/SettingsWindow.cpp (Arbeitskopie)
2384@@ -70,9 +70,9 @@
2385
2386 bigtime_t interval = kUpdateIntervals[level];
2387 if ((interval % 1000) == 0)
2388- snprintf(fText, sizeof(fText), "%lld secs", interval / 1000);
2389+ snprintf(fText, sizeof(fText), "%lld sec.", interval / 1000);
2390 else
2391- snprintf(fText, sizeof(fText), "%lld msecs", interval);
2392+ snprintf(fText, sizeof(fText), "%lld ms", interval);
2393
2394 return fText;
2395 }
2396Index: src/apps/activitymonitor/DataSource.cpp
2397===================================================================
2398--- src/apps/activitymonitor/DataSource.cpp (revision 34729)
2399+++ src/apps/activitymonitor/DataSource.cpp (working copy)
2400@@ -329,7 +329,7 @@
2401 const char*
2402 UsedMemoryDataSource::Label() const
2403 {
2404- return "Used Memory";
2405+ return "Used memory";
2406 }
2407
2408
2409@@ -378,7 +378,7 @@
2410 const char*
2411 CachedMemoryDataSource::Label() const
2412 {
2413- return "Cached Memory";
2414+ return "Cached memory";
2415 }
2416
2417
2418@@ -430,7 +430,7 @@
2419 const char*
2420 SwapSpaceDataSource::Label() const
2421 {
2422- return "Swap Space";
2423+ return "Swap space";
2424 }
2425
2426
2427@@ -485,14 +485,14 @@
2428 const char*
2429 BlockCacheDataSource::Label() const
2430 {
2431- return "Block Cache Memory";
2432+ return "Block cache memory";
2433 }
2434
2435
2436 const char*
2437 BlockCacheDataSource::ShortLabel() const
2438 {
2439- return "Block Cache";
2440+ return "Block cache";
2441 }
2442
2443
2444@@ -727,7 +727,7 @@
2445 const char*
2446 RunningAppsDataSource::Label() const
2447 {
2448- return "Running Applications";
2449+ return "Running applications";
2450 }
2451
2452
2453@@ -839,7 +839,7 @@
2454 const char*
2455 CPUUsageDataSource::Name() const
2456 {
2457- return "CPU Usage";
2458+ return "CPU usage";
2459 }
2460
2461
2462@@ -873,7 +873,7 @@
2463 fLabel << " " << cpu;
2464
2465 fShortLabel = fLabel;
2466- fLabel << " Usage";
2467+ fLabel << " usage";
2468
2469 const rgb_color kColors[] = {
2470 // TODO: find some better defaults...
2471@@ -963,7 +963,7 @@
2472 const char*
2473 CPUCombinedUsageDataSource::Label() const
2474 {
2475- return "CPU Usage";
2476+ return "CPU usage";
2477 }
2478
2479
2480@@ -977,7 +977,7 @@
2481 const char*
2482 CPUCombinedUsageDataSource::Name() const
2483 {
2484- return "CPU Usage (combined)";
2485+ return "CPU usage (combined)";
2486 }
2487
2488
2489@@ -1061,21 +1061,21 @@
2490 const char*
2491 PageFaultsDataSource::Label() const
2492 {
2493- return "Page Faults";
2494+ return "Page faults";
2495 }
2496
2497
2498 const char*
2499 PageFaultsDataSource::ShortLabel() const
2500 {
2501- return "P-Faults";
2502+ return "P-faults";
2503 }
2504
2505
2506 const char*
2507 PageFaultsDataSource::Name() const
2508 {
2509- return "Page Faults";
2510+ return "Page faults";
2511 }
2512
2513
2514@@ -1176,7 +1176,7 @@
2515 const char*
2516 NetworkUsageDataSource::Name() const
2517 {
2518- return fIn ? "Network Receive" : "Network Send";
2519+ return fIn ? "Network receive" : "Network send";
2520 }
2521
2522
2523@@ -1246,7 +1246,7 @@
2524 const char*
2525 ClipboardSizeDataSource::Label() const
2526 {
2527- return fText ? "Text Clipboard Size" : "Raw Clipboard Size";
2528+ return fText ? "Text clipboard size" : "Raw clipboard size";
2529 }
2530
2531
2532@@ -1300,7 +1300,7 @@
2533 const char*
2534 MediaNodesDataSource::Label() const
2535 {
2536- return "Media Nodes";
2537+ return "Media nodes";
2538 }
2539Index: src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
2540===================================================================
2541--- src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp (Revision 34761)
2542+++ src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp (Arbeitskopie)
2543@@ -911,14 +911,14 @@
2544 BMenuItem *item;
2545 BMessage *message = new BMessage(M_LAYOUT_CHANGED);
2546 message->AddInt32("layout", M_ICON_VIEW);
2547- menu->AddItem(item = new BMenuItem("Icon View", message));
2548+ menu->AddItem(item = new BMenuItem("Icon view", message));
2549 if (m_layout == M_ICON_VIEW)
2550 {
2551 item->SetMarked(true);
2552 }
2553 message = new BMessage(M_LAYOUT_CHANGED);
2554 message->AddInt32("layout", M_MINI_ICON_VIEW);
2555- menu->AddItem(item = new BMenuItem("Mini Icon View", message));
2556+ menu->AddItem(item = new BMenuItem("Mini icon view", message));
2557 if (m_layout == M_MINI_ICON_VIEW)
2558 {
2559 item->SetMarked(true);
2560@@ -926,10 +926,10 @@
2561 menu->AddSeparatorItem();
2562
2563 // add 'CleanUp' command
2564- menu->AddItem(new BMenuItem("Clean Up", new BMessage(M_CLEANUP_REQUESTED), 'K'));
2565+ menu->AddItem(new BMenuItem("Clean up", new BMessage(M_CLEANUP_REQUESTED), 'K'));
2566
2567 // add 'Select All' command
2568- menu->AddItem(new BMenuItem("Select All", new BMessage(M_SELECT_ALL), 'A'));
2569+ menu->AddItem(new BMenuItem("Select all", new BMessage(M_SELECT_ALL), 'A'));
2570
2571 menu->SetTargetForItems(this);
2572 ConvertToScreen(&point);
2573@@ -955,7 +955,7 @@
2574 BMessenger messenger(0, Window());
2575 if (!messenger.IsValid()
2576 || (messenger.SendMessage(&message) != B_OK)) {
2577- BAlert *alert = new BAlert("Error", text.String(), "Ok", 0, 0,
2578+ BAlert *alert = new BAlert("Error", text.String(), "OK", 0, 0,
2579 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
2580 alert->Go();
2581 }
2582@@ -1500,21 +1500,21 @@
2583 NodeRef* videoIn = manager->videoInputNode();
2584 if (videoIn)
2585 {
2586- group = manager->createGroup("Video Input");
2587+ group = manager->createGroup("Video input");
2588 group->setRunMode(BMediaNode::B_RECORDING);
2589 group->addNode(videoIn);
2590 }
2591 NodeRef* audioIn = manager->audioInputNode();
2592 if (audioIn)
2593 {
2594- group = manager->createGroup("Audio Input");
2595+ group = manager->createGroup("Audio input");
2596 group->setRunMode(BMediaNode::B_RECORDING);
2597 group->addNode(audioIn);
2598 }
2599 NodeRef* videoOut = manager->videoOutputNode();
2600 if (videoOut)
2601 {
2602- group = manager->createGroup("Video Output");
2603+ group = manager->createGroup("Video output");
2604 group->addNode(videoOut);
2605 }
2606 }
2607Index: src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
2608===================================================================
2609--- src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp (Revision 34761)
2610+++ src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp (Arbeitskopie)
2611@@ -533,7 +533,7 @@
2612
2613 // add the "Tweak Parameters" item
2614 message = new BMessage(MediaRoutingView::M_NODE_TWEAK_PARAMETERS);
2615- menu->AddItem(item = new BMenuItem("Tweak Parameters", message, 'P'));
2616+ menu->AddItem(item = new BMenuItem("Tweak parameters", message, 'P'));
2617 if (!(ref->kind() & B_CONTROLLABLE))
2618 {
2619 item->SetEnabled(false);
2620@@ -541,7 +541,7 @@
2621
2622 message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2623 message->AddInt32("nodeID", ref->id());
2624- menu->AddItem(new BMenuItem("Get Info", message, 'I'));
2625+ menu->AddItem(new BMenuItem("Get info", message, 'I'));
2626 menu->AddSeparatorItem();
2627
2628 menu->AddItem(item = new BMenuItem("Release", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T'));
2629@@ -562,7 +562,7 @@
2630 }
2631
2632 // add the "Run Mode" sub menu
2633- BMenu *subMenu = new BMenu("Run Mode");
2634+ BMenu *subMenu = new BMenu("Run mode");
2635 subMenu->SetFont(be_plain_font);
2636 for (uint32 runMode = 1; runMode <= BMediaNode::B_RECORDING; runMode++)
2637 {
2638@@ -604,12 +604,12 @@
2639 message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE);
2640 message->AddInt32("nodeID", ref->id());
2641 subMenu->AddItem(new BMenuItem(
2642- "Start Time Source",
2643+ "Start time source",
2644 message));
2645 message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE);
2646 message->AddInt32("nodeID", ref->id());
2647 subMenu->AddItem(new BMenuItem(
2648- "Stop Time Source",
2649+ "Stop time source",
2650 message));
2651 }
2652 // [c.lenz 24dec99] support for BControllable::StartControlPanel()
2653@@ -631,7 +631,7 @@
2654 subMenu->AddSeparatorItem();
2655 subMenu->AddItem(
2656 new BMenuItem(
2657- isLocked ? "Unlock Group" : "Lock Group", message));
2658+ isLocked ? "Unlock group" : "Lock group", message));
2659 }
2660
2661 if (subMenu->CountItems() > 0)
2662Index: src/apps/cortex/MediaRoutingView/MediaWire.cpp
2663===================================================================
2664--- src/apps/cortex/MediaRoutingView/MediaWire.cpp (Revision 34761)
2665+++ src/apps/cortex/MediaRoutingView/MediaWire.cpp (Arbeitskopie)
2666@@ -291,7 +291,7 @@
2667 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2668 message->AddData("connection", B_RAW_TYPE,
2669 reinterpret_cast<const void *>(&output), sizeof(output));
2670- menu->AddItem(item = new BMenuItem("Get Info", message, 'I'));
2671+ menu->AddItem(item = new BMenuItem("Get info", message, 'I'));
2672
2673 // add the "Disconnect" item
2674 menu->AddItem(item = new BMenuItem("Disconnect", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T'));
2675Index: src/apps/cortex/MediaRoutingView/MediaJack.cpp
2676===================================================================
2677--- src/apps/cortex/MediaRoutingView/MediaJack.cpp (Revision 34761)
2678+++ src/apps/cortex/MediaRoutingView/MediaJack.cpp (Arbeitskopie)
2679@@ -718,7 +718,7 @@
2680 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2681 message->AddData("input", B_RAW_TYPE,
2682 reinterpret_cast<const void *>(&input), sizeof(input));
2683- menu->AddItem(item = new BMenuItem("Get Info", message));
2684+ menu->AddItem(item = new BMenuItem("Get info", message));
2685 }
2686 else if (isOutput())
2687 {
2688@@ -727,7 +727,7 @@
2689 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
2690 message->AddData("output", B_RAW_TYPE,
2691 reinterpret_cast<const void *>(&output), sizeof(output));
2692- menu->AddItem(item = new BMenuItem("Get Info", message));
2693+ menu->AddItem(item = new BMenuItem("Get info", message));
2694 }
2695
2696 menu->SetTargetForItems(view());
2697Index: src/apps/cortex/InfoView/DormantNodeInfoView.cpp
2698===================================================================
2699--- src/apps/cortex/InfoView/DormantNodeInfoView.cpp (Revision 34761)
2700+++ src/apps/cortex/InfoView/DormantNodeInfoView.cpp (Arbeitskopie)
2701@@ -22,7 +22,7 @@
2702
2703 DormantNodeInfoView::DormantNodeInfoView(
2704 const dormant_node_info &info)
2705- : InfoView(info.name, "Dormant Media Node",
2706+ : InfoView(info.name, "Dormant media node",
2707 new MediaIcon(info, B_LARGE_ICON)),
2708 m_addOnID(info.addon),
2709 m_flavorID(info.flavor_id)
2710@@ -59,9 +59,9 @@
2711 addField("Kinds", MediaString::getStringFor(static_cast<node_kind>(flavorInfo.kinds)));
2712
2713 // add "Flavor Flags" field
2714- addField("Flavor Flags", "?");
2715+ addField("Flavor flags", "?");
2716
2717- // add "Max Instances" field
2718+ // add "Max. instances" field
2719 if (flavorInfo.possible_count > 0)
2720 {
2721 s = "";
2722@@ -71,18 +71,18 @@
2723 {
2724 s = "Any number";
2725 }
2726- addField("Max Instances", s);
2727+ addField("Max. instances", s);
2728
2729 // add "Input Formats" field
2730 if (flavorInfo.in_format_count > 0)
2731 {
2732 if (flavorInfo.in_format_count == 1)
2733 {
2734- addField("Input Format", MediaString::getStringFor(flavorInfo.in_formats[0], false));
2735+ addField("Input format", MediaString::getStringFor(flavorInfo.in_formats[0], false));
2736 }
2737 else
2738 {
2739- addField("Input Formats", "");
2740+ addField("Input formats", "");
2741 for (int32 i = 0; i < flavorInfo.in_format_count; i++)
2742 {
2743 s = "";
2744@@ -97,11 +97,11 @@
2745 {
2746 if (flavorInfo.out_format_count == 1)
2747 {
2748- addField("Output Format", MediaString::getStringFor(flavorInfo.out_formats[0], false));
2749+ addField("Output format", MediaString::getStringFor(flavorInfo.out_formats[0], false));
2750 }
2751 else
2752 {
2753- addField("Output Formats", "");
2754+ addField("Output formats", "");
2755 for (int32 i = 0; i < flavorInfo.out_format_count; i++)
2756 {
2757 s = "";
2758Index: src/apps/cortex/InfoView/EndPointInfoView.cpp
2759===================================================================
2760--- src/apps/cortex/InfoView/EndPointInfoView.cpp (Revision 34761)
2761+++ src/apps/cortex/InfoView/EndPointInfoView.cpp (Arbeitskopie)
2762@@ -18,7 +18,7 @@
2763
2764 EndPointInfoView::EndPointInfoView(
2765 const media_input &input)
2766- : InfoView(input.name, "Media Input", 0),
2767+ : InfoView(input.name, "Media input", 0),
2768 m_output(false),
2769 m_port(input.destination.port),
2770 m_id(input.destination.id) {
2771@@ -37,14 +37,14 @@
2772 addField("", "");
2773
2774 // add "Media Type" field
2775- addField("Media Type", MediaString::getStringFor(input.format.type));
2776+ addField("Media type", MediaString::getStringFor(input.format.type));
2777
2778 _addFormatFields(input.format);
2779 }
2780
2781 EndPointInfoView::EndPointInfoView(
2782 const media_output &output)
2783- : InfoView(output.name, "Media Output", 0),
2784+ : InfoView(output.name, "Media output", 0),
2785 m_output(true),
2786 m_port(output.source.port),
2787 m_id(output.source.id) {
2788@@ -63,7 +63,7 @@
2789 addField("", "");
2790
2791 // add "Media Type" field
2792- addField("Media Type", MediaString::getStringFor(output.format.type));
2793+ addField("Media type", MediaString::getStringFor(output.format.type));
2794
2795 _addFormatFields(output.format);
2796 }
2797@@ -117,22 +117,22 @@
2798 addField("Format", s);
2799 // add "Sample Rate" field
2800 s = MediaString::forAudioFrameRate(format.u.raw_audio.frame_rate);
2801- addField("Sample Rate", s);
2802+ addField("Sample rate", s);
2803 // add "Channels" field
2804 s = MediaString::forAudioChannelCount(format.u.raw_audio.channel_count);
2805 addField("Channels", s);
2806 // add "Channel Mask" field
2807 s = MediaString::forAudioChannelMask(format.u.raw_audio.channel_mask);
2808- addField("Channel Mask", s);
2809+ addField("Channel mask", s);
2810 // add "Matrix Mask" field
2811 s = MediaString::forAudioMatrixMask(format.u.raw_audio.matrix_mask);
2812- addField("Matrix Mask", s);
2813+ addField("Matrix mask", s);
2814 // add the "Byte Order" field
2815 s = MediaString::forAudioByteOrder(format.u.raw_audio.byte_order);
2816- addField("Byte Order", s);
2817+ addField("Byte order", s);
2818 // add the "Buffer Size" field
2819 s = MediaString::forAudioBufferSize(format.u.raw_audio.buffer_size);
2820- addField("Buffer Size", s);
2821+ addField("Buffer size", s);
2822 break;
2823 }
2824 case B_MEDIA_RAW_VIDEO: {
2825@@ -149,18 +149,18 @@
2826 // add the "Field Rate" field
2827 s = MediaString::forVideoFieldRate(format.u.raw_video.field_rate,
2828 format.u.raw_video.interlace);
2829- addField("Field Rate", s);
2830+ addField("Field rate", s);
2831 // add the "Orientation" field
2832 s = MediaString::forVideoOrientation(format.u.raw_video.orientation);
2833 addField("Orientation", s);
2834 // add the "Aspect Ratio" field
2835 s = MediaString::forVideoAspectRatio(format.u.raw_video.pixel_width_aspect,
2836 format.u.raw_video.pixel_height_aspect);
2837- addField("Aspect Ratio", s);
2838+ addField("Aspect ratio", s);
2839 // add the "Active Lines" field
2840 s = MediaString::forVideoActiveLines(format.u.raw_video.first_active,
2841 format.u.raw_video.last_active);
2842- addField("Active Lines", s);
2843+ addField("Active lines", s);
2844 // add the "Offset" field
2845 s = MediaString::forVideoOffset(format.u.raw_video.display.pixel_offset,
2846 format.u.raw_video.display.line_offset);
2847@@ -173,10 +173,10 @@
2848 BString s;
2849 // add the "Bit Rate" field
2850 s = MediaString::forAudioBitRate(format.u.encoded_audio.bit_rate);
2851- addField("Bit Rate", s);
2852+ addField("Bit rate", s);
2853 // add the "Frame Size" field
2854 s = MediaString::forAudioFrameSize(format.u.encoded_audio.frame_size);
2855- addField("Frame Size", s);
2856+ addField("Frame size", s);
2857 break;
2858 }
2859 case B_MEDIA_ENCODED_VIDEO: {
2860@@ -186,10 +186,10 @@
2861 // add the "Bit Rate" field
2862 s = MediaString::forVideoBitRate(format.u.encoded_video.avg_bit_rate,
2863 format.u.encoded_video.max_bit_rate);
2864- addField("Bit Rate", s);
2865+ addField("Bit rate", s);
2866 // add the "Frame Size" field
2867 s = MediaString::forVideoFrameSize(format.u.encoded_video.frame_size);
2868- addField("Frame Size", s);
2869+ addField("Frame size", s);
2870 // add the "History" field
2871 s = MediaString::forVideoHistory(format.u.encoded_video.forward_history,
2872 format.u.encoded_video.backward_history);
2873@@ -206,11 +206,11 @@
2874 // add the "Bit Rate" field
2875 s = MediaString::forMultistreamBitRate(format.u.multistream.avg_bit_rate,
2876 format.u.multistream.max_bit_rate);
2877- addField("Bit Rate", s);
2878+ addField("Bit rate", s);
2879 // add the "Chunk Size" field
2880 s = MediaString::forMultistreamChunkSize(format.u.multistream.avg_chunk_size,
2881 format.u.multistream.max_chunk_size);
2882- addField("Chunk Size", s);
2883+ addField("Chunk size", s);
2884 // add the "Flags" field
2885 s = MediaString::forMultistreamFlags(format.u.multistream.flags);
2886 addField("Flags", s);
2887Index: src/apps/cortex/TransportView/TransportView.cpp
2888===================================================================
2889--- src/apps/cortex/TransportView/TransportView.cpp (Revision 34761)
2890+++ src/apps/cortex/TransportView/TransportView.cpp (Arbeitskopie)
2891@@ -525,16 +525,16 @@
2892
2893 const char _run_mode_strings[][20] = {
2894 "Offline",
2895- "Decrease Precision",
2896- "Increase Latency",
2897- "Drop Data",
2898+ "Decrease precision",
2899+ "Increase latency",
2900+ "Drop data",
2901 "Recording"
2902 };
2903 const int _run_modes = 5;
2904
2905 //const char _time_source_strings[][20] = {
2906-// "DAC Time Source",
2907-// "System Clock"
2908+// "DAC time source",
2909+// "System clock"
2910 //};
2911 //const int _time_sources = 2;
2912
2913@@ -564,7 +564,7 @@
2914 m_runModeView = new BMenuField(
2915 BRect(),
2916 "runModeView",
2917- "Run Mode:",
2918+ "Run mode:",
2919 new BPopUpMenu("runModeMenu"));
2920 _populateRunModeMenu(
2921 m_runModeView->Menu());
2922@@ -573,7 +573,7 @@
2923 m_timeSourceView = new BMenuField(
2924 BRect(),
2925 "timeSourceView",
2926- "Time Source:",
2927+ "Time source:",
2928 new BPopUpMenu("timeSourceMenu"));
2929 _populateTimeSourceMenu(
2930 m_timeSourceView->Menu());
2931@@ -706,7 +706,7 @@
2932 &dacTimeSource,
2933 sizeof(media_node));
2934 i = new BMenuItem(
2935- "DAC Time Source",
2936+ "DAC time source",
2937 m);
2938 menu->AddItem(i);
2939 _addGroupTarget(i);
2940@@ -721,7 +721,7 @@
2941 &systemTimeSource,
2942 sizeof(media_node));
2943 i = new BMenuItem(
2944- "System Clock",
2945+ "System clock",
2946 m);
2947 menu->AddItem(i);
2948 _addGroupTarget(i);
2949Index: src/apps/cortex/RouteApp/RouteAppNodeManager.cpp
2950===================================================================
2951--- src/apps/cortex/RouteApp/RouteAppNodeManager.cpp (Revision 34761)
2952+++ src/apps/cortex/RouteApp/RouteAppNodeManager.cpp (Arbeitskopie)
2953@@ -164,7 +164,7 @@
2954 if(ts->Node() != systemClock)
2955 {
2956 g->setTimeSource(ts->Node());
2957- logMsg.AddString("line", "Synced to System Clock");
2958+ logMsg.AddString("line", "Synced to system clock");
2959 }
2960 ts->Release();
2961 }
2962@@ -249,7 +249,7 @@
2963 logMsg.AddString("line", line);
2964
2965 NodeGroup *group = 0;
2966- BString groupName = "Untitled Group ";
2967+ BString groupName = "Untitled group ";
2968 if(_canGroup(producer) && _canGroup(consumer))
2969 {
2970 if (producer->group() && consumer->group() &&
2971Index: src/apps/cortex/RouteApp/RouteWindow.cpp
2972===================================================================
2973--- src/apps/cortex/RouteApp/RouteWindow.cpp (Revision 34761)
2974+++ src/apps/cortex/RouteApp/RouteWindow.cpp (Arbeitskopie)
2975@@ -78,7 +78,7 @@
2976 item->SetTarget(be_app);
2977 pFileMenu->AddItem(item);
2978 pFileMenu->AddItem(new BSeparatorItem());
2979- item = new BMenuItem("Save Nodes" B_UTF8_ELLIPSIS,
2980+ item = new BMenuItem("Save nodes" B_UTF8_ELLIPSIS,
2981 new BMessage(RouteApp::M_SHOW_SAVE_PANEL), 'S');
2982 item->SetTarget(be_app);
2983 pFileMenu->AddItem(item);
2984@@ -137,19 +137,19 @@
2985 // construct the Window menu
2986 BMenu* windowMenu = new BMenu("Window");
2987 m_transportWindowItem = new BMenuItem(
2988- "Show Transport",
2989+ "Show transport",
2990 new BMessage(M_TOGGLE_TRANSPORT_WINDOW));
2991 windowMenu->AddItem(m_transportWindowItem);
2992
2993 m_dormantNodeWindowItem = new BMenuItem(
2994- "Show Add-Ons",
2995+ "Show add-ons",
2996 new BMessage(M_TOGGLE_DORMANT_NODE_WINDOW));
2997 windowMenu->AddItem(m_dormantNodeWindowItem);
2998
2999 windowMenu->AddItem(new BSeparatorItem());
3000
3001 m_pullPalettesItem = new BMenuItem(
3002- "Pull Palettes",
3003+ "Pull palettes",
3004 new BMessage(M_TOGGLE_PULLING_PALETTES));
3005 windowMenu->AddItem(m_pullPalettesItem);
3006
3007@@ -341,7 +341,7 @@
3008 //
3009 switch (pMsg->what) {
3010 case B_ABOUT_REQUESTED:
3011- (new BAlert("About", g_aboutText, "Ok"))->Go();
3012+ (new BAlert("About", g_aboutText, "OK"))->Go();
3013 break;
3014
3015 case MediaRoutingView::M_GROUP_SELECTED:
3016Index: src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp
3017===================================================================
3018--- src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp (Revision 34761)
3019+++ src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp (Arbeitskopie)
3020@@ -34,7 +34,7 @@
3021
3022 DormantNodeWindow::DormantNodeWindow(
3023 BWindow* parent)
3024- : BWindow(s_initFrame, "Media Add-Ons",
3025+ : BWindow(s_initFrame, "Media add-ons",
3026 B_FLOATING_WINDOW_LOOK,
3027 B_FLOATING_SUBSET_WINDOW_FEEL,
3028 B_WILL_ACCEPT_FIRST_CLICK|B_AVOID_FOCUS|B_ASYNCHRONOUS_CONTROLS),
3029Index: src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
3030===================================================================
3031--- src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp (Revision 34761)
3032+++ src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp (Arbeitskopie)
3033@@ -236,7 +236,7 @@
3034
3035 // Add the "Get Info" item
3036 BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED);
3037- menu->AddItem(new BMenuItem("Get Info", message));
3038+ menu->AddItem(new BMenuItem("Get info", message));
3039
3040 menu->SetTargetForItems(owner);
3041 owner->ConvertToScreen(&point);
3042Index: src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp
3043===================================================================
3044--- src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp (Revision 34761)
3045+++ src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp (Arbeitskopie)
3046@@ -90,7 +90,7 @@
3047 param = inputGroup->MakeDiscreteParameter(
3048 P_INPUT_FORMAT,
3049 B_MEDIA_NO_TYPE,
3050- "Sample Format",
3051+ "Sample format:",
3052 B_GENERIC);
3053 param->AddItem(
3054 0,
3055@@ -111,7 +111,7 @@
3056 param = inputGroup->MakeDiscreteParameter(
3057 P_INPUT_CHANNEL_COUNT,
3058 B_MEDIA_NO_TYPE,
3059- "Channels",
3060+ "Channels:",
3061 B_GENERIC);
3062 param->AddItem(
3063 0,
3064@@ -137,7 +137,7 @@
3065 param = outputGroup->MakeDiscreteParameter(
3066 P_OUTPUT_FORMAT,
3067 B_MEDIA_NO_TYPE,
3068- "Sample Format",
3069+ "Sample format:",
3070 B_GENERIC);
3071 param->AddItem(
3072 0,
3073@@ -158,7 +158,7 @@
3074 param = outputGroup->MakeDiscreteParameter(
3075 P_OUTPUT_CHANNEL_COUNT,
3076 B_MEDIA_NO_TYPE,
3077- "Channels",
3078+ "Channels:",
3079 B_GENERIC);
3080 param->AddItem(
3081 0,
3082Index: src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp
3083===================================================================
3084--- src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp (Revision 34761)
3085+++ src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp (Arbeitskopie)
3086@@ -28,22 +28,22 @@
3087 BParameterWeb* web = new BParameterWeb;
3088
3089 BParameterGroup* mainGroup = web->MakeGroup("LoggingConsumer Parameters");
3090- BParameterGroup* group = mainGroup->MakeGroup("Latency Control");
3091+ BParameterGroup* group = mainGroup->MakeGroup("Latency control");
3092 BParameter* nullParam = group->MakeNullParameter(INPUT_NULL_PARAM, B_MEDIA_NO_TYPE, "Latency", B_GENERIC);
3093 BParameter* latencyParam = group->MakeContinuousParameter(LATENCY_PARAM, B_MEDIA_NO_TYPE, "",
3094- B_GAIN, "msec", 5, 100, 5);
3095+ B_GAIN, "ms", 5, 100, 5);
3096 nullParam->AddOutput(latencyParam);
3097 latencyParam->AddInput(nullParam);
3098
3099- group = mainGroup->MakeGroup("CPU Percentage");
3100- nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU Spin Percentage", B_GENERIC);
3101+ group = mainGroup->MakeGroup("CPU percentage");
3102+ nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU spin percentage", B_GENERIC);
3103 BContinuousParameter* cpuParam = group->MakeContinuousParameter(CPU_SPIN_PARAM, B_MEDIA_NO_TYPE, "",
3104 B_GAIN, "percent", 5, 80, 5);
3105 nullParam->AddOutput(cpuParam);
3106 cpuParam->AddInput(nullParam);
3107
3108 group = mainGroup->MakeGroup("Priority");
3109- nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread Priority", B_GENERIC);
3110+ nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread priority", B_GENERIC);
3111 BDiscreteParameter* prioParam = group->MakeDiscreteParameter(PRIORITY_PARAM, B_MEDIA_NO_TYPE, "", B_GENERIC);
3112 prioParam->AddItem(5, "B_LOW_PRIORITY");
3113 prioParam->AddItem(10, "B_NORMAL_PRIORITY");
3114Index: src/apps/cortex/addons/common/MediaNodeControlApp.cpp
3115===================================================================
3116--- src/apps/cortex/addons/common/MediaNodeControlApp.cpp (Revision 34761)
3117+++ src/apps/cortex/addons/common/MediaNodeControlApp.cpp (Arbeitskopie)
3118@@ -53,7 +53,7 @@
3119 sprintf(buffer,
3120 "MediaNodeControlApp: couldn't find node (%ld):\n%s\n",
3121 nodeID, strerror(err));
3122- (new BAlert("error", buffer, "Ok"))->Go();
3123+ (new BAlert("error", buffer, "OK"))->Go();
3124 return;
3125 }
3126
3127@@ -65,7 +65,7 @@
3128 sprintf(buffer,
3129 "MediaNodeControlApp: couldn't get node info (%ld):\n%s\n",
3130 nodeID, strerror(err));
3131- (new BAlert("error", buffer, "Ok"))->Go();
3132+ (new BAlert("error", buffer, "OK"))->Go();
3133 return;
3134 }
3135
3136@@ -80,7 +80,7 @@
3137 sprintf(buffer,
3138 "MediaNodeControlApp: no parameters for node (%ld):\n%s\n",
3139 nodeID, strerror(err));
3140- (new BAlert("error", buffer, "Ok"))->Go();
3141+ (new BAlert("error", buffer, "OK"))->Go();
3142 return;
3143 }
3144
3145Index: src/apps/cortex/addons/Flanger/FlangerNode.cpp
3146===================================================================
3147--- src/apps/cortex/addons/Flanger/FlangerNode.cpp (Revision 34761)
3148+++ src/apps/cortex/addons/Flanger/FlangerNode.cpp (Arbeitskopie)
3149@@ -1228,11 +1228,11 @@
3150 BParameterGroup* g;
3151
3152 // mix ratio
3153- g = pTopGroup->MakeGroup("Mix Ratio");
3154+ g = pTopGroup->MakeGroup("Mix ratio");
3155 label = g->MakeNullParameter(
3156 P_MIX_RATIO_LABEL,
3157 B_MEDIA_NO_TYPE,
3158- "Mix Ratio",
3159+ "Mix ratio",
3160 B_GENERIC);
3161
3162 value = g->MakeContinuousParameter(
3163@@ -1244,11 +1244,11 @@
3164 value->AddInput(label);
3165
3166 // sweep rate
3167- g = pTopGroup->MakeGroup("Sweep Rate");
3168+ g = pTopGroup->MakeGroup("Sweep rate");
3169 label = g->MakeNullParameter(
3170 P_SWEEP_RATE_LABEL,
3171 B_MEDIA_NO_TYPE,
3172- "Sweep Rate",
3173+ "Sweep rate",
3174 B_GENERIC);
3175
3176 value = g->MakeContinuousParameter(
3177@@ -1271,7 +1271,7 @@
3178 P_DELAY,
3179 B_MEDIA_NO_TYPE,
3180 "",
3181- B_GAIN, "msec", 0.1, s_fMaxDelay/2.0, 0.1);
3182+ B_GAIN, "ms", 0.1, s_fMaxDelay/2.0, 0.1);
3183 label->AddOutput(value);
3184 value->AddInput(label);
3185
3186@@ -1287,7 +1287,7 @@
3187 P_DEPTH,
3188 B_MEDIA_NO_TYPE,
3189 "",
3190- B_GAIN, "msec", 1.0, s_fMaxDelay/4.0, 0.1);
3191+ B_GAIN, "ms", 1.0, s_fMaxDelay/4.0, 0.1);
3192 label->AddOutput(value);
3193 value->AddInput(label);
3194
3195Index: src/apps/cortex/ParameterView/ParameterWindow.cpp
3196===================================================================
3197--- src/apps/cortex/ParameterView/ParameterWindow.cpp (Revision 34761)
3198+++ src/apps/cortex/ParameterView/ParameterWindow.cpp (Arbeitskopie)
3199@@ -61,7 +61,7 @@
3200 BMenuBar *menuBar = new BMenuBar(Bounds(), "ParameterWindow MenuBar");
3201
3202 BMenu *menu = new BMenu("Window");
3203- menu->AddItem(new BMenuItem("Start Control Panel",
3204+ menu->AddItem(new BMenuItem("Start control panel",
3205 new BMessage(M_START_CONTROL_PANEL),
3206 'P', B_COMMAND_KEY | B_SHIFT_KEY));
3207 menu->AddSeparatorItem();
3208Index: src/apps/cortex/support/MediaString.cpp
3209===================================================================
3210--- src/apps/cortex/support/MediaString.cpp (Revision 34761)
3211+++ src/apps/cortex/support/MediaString.cpp (Arbeitskopie)
3212@@ -26,30 +26,30 @@
3213
3214 if (kinds & B_BUFFER_PRODUCER) {
3215 if (first) {
3216- list = "Buffer Producer";
3217+ list = "Buffer producer";
3218 first = false;
3219 }
3220 }
3221 if (kinds & B_BUFFER_CONSUMER) {
3222 if (first) {
3223- list = "Buffer Consumer";
3224+ list = "Buffer consumer";
3225 first = false;
3226 }
3227 else {
3228 if (last != "")
3229 list << ", " << last;
3230- last = "Buffer Consumer";
3231+ last = "Buffer consumer";
3232 }
3233 }
3234 if (kinds & B_TIME_SOURCE) {
3235 if (first) {
3236- list = "Time Source";
3237+ list = "Time source";
3238 first = false;
3239 }
3240 else {
3241 if (last != "")
3242 list << ", " << last;
3243- last = "Time Source";
3244+ last = "Time source";
3245 }
3246 }
3247 if (kinds & B_CONTROLLABLE) {
3248@@ -65,57 +65,57 @@
3249 }
3250 if (kinds & B_FILE_INTERFACE) {
3251 if (first) {
3252- list = "File Interface";
3253+ list = "File interface";
3254 first = false;
3255 }
3256 else {
3257 if (last != "")
3258 list << ", " << last;
3259- last = "File Interface";
3260+ last = "File interface";
3261 }
3262 }
3263 if (kinds & B_ENTITY_INTERFACE) {
3264 if (first) {
3265- list = "Entity Interface";
3266+ list = "Entity interface";
3267 first = false;
3268 }
3269 else {
3270 if (last != "")
3271 list << ", " << last;
3272- last = "Entity Interface";
3273+ last = "Entity interface";
3274 }
3275 }
3276 if (kinds & B_PHYSICAL_INPUT) {
3277 if (first) {
3278- list = "Physical Input";
3279+ list = "Physical input";
3280 first = false;
3281 }
3282 else {
3283 if (last != "")
3284 list << ", " << last;
3285- last = "Physical Input";
3286+ last = "Physical input";
3287 }
3288 }
3289 if (kinds & B_PHYSICAL_OUTPUT) {
3290 if (first) {
3291- list = "Physical Output";
3292+ list = "Physical output";
3293 first = false;
3294 }
3295 else {
3296 if (last != "")
3297 list << ", " << last;
3298- last = "Physical Output";
3299+ last = "Physical output";
3300 }
3301 }
3302 if (kinds & B_SYSTEM_MIXER) {
3303 if (first) {
3304- list = "System Mixer";
3305+ list = "System mixer";
3306 first = false;
3307 }
3308 else {
3309 if (last != "")
3310 list << ", " << last;
3311- last = "System Mixer";
3312+ last = "System mixer";
3313 }
3314 }
3315
3316@@ -133,9 +133,9 @@
3317 switch (runMode) {
3318 case BMediaNode::B_OFFLINE: return "Offline";
3319 case BMediaNode::B_RECORDING: return "Recording";
3320- case BMediaNode::B_DECREASE_PRECISION: return "Decrease Precision";
3321- case BMediaNode::B_INCREASE_LATENCY: return "Increase Latency";
3322- case BMediaNode::B_DROP_DATA: return "Drop Data";
3323+ case BMediaNode::B_DECREASE_PRECISION: return "Decrease precision";
3324+ case BMediaNode::B_INCREASE_LATENCY: return "Increase latency";
3325+ case BMediaNode::B_DROP_DATA: return "Drop data";
3326 default: return "(unknown run mode)";
3327 }
3328 }
3329@@ -150,24 +150,24 @@
3330 D_METHOD(("MediaString::getStringFor(media_type)\n"));
3331
3332 switch (type) {
3333- case B_MEDIA_NO_TYPE: return "Typeless Media";
3334- case B_MEDIA_UNKNOWN_TYPE: return "Unknown Media Type";
3335- case B_MEDIA_RAW_AUDIO: return "Raw Audio";
3336- case B_MEDIA_RAW_VIDEO: return "Raw Video";
3337+ case B_MEDIA_NO_TYPE: return "Typeless media";
3338+ case B_MEDIA_UNKNOWN_TYPE: return "Unknown media type";
3339+ case B_MEDIA_RAW_AUDIO: return "Raw audio";
3340+ case B_MEDIA_RAW_VIDEO: return "Raw video";
3341 case B_MEDIA_VBL: return "Raw data from VBL area";
3342 case B_MEDIA_TIMECODE: return "Timecode";
3343 case B_MEDIA_MIDI: return "MIDI";
3344 case B_MEDIA_TEXT: return "Text";
3345 case B_MEDIA_HTML: return "HTML";
3346- case B_MEDIA_MULTISTREAM: return "Multistream Media";
3347+ case B_MEDIA_MULTISTREAM: return "Multistream media";
3348 case B_MEDIA_PARAMETERS: return "Parameters";
3349- case B_MEDIA_ENCODED_AUDIO: return "Encoded Audio";
3350- case B_MEDIA_ENCODED_VIDEO: return "Encoded Video";
3351+ case B_MEDIA_ENCODED_AUDIO: return "Encoded audio";
3352+ case B_MEDIA_ENCODED_VIDEO: return "Encoded video";
3353 default: {
3354 if (type >= B_MEDIA_PRIVATE)
3355- return "Private Be Media Type";
3356+ return "Private Be media type";
3357 if (type >= B_MEDIA_FIRST_USER_TYPE)
3358- return "User-defined Media Type";
3359+ return "User-defined media type";
3360 }
3361 }
3362 return "Unknown Media Type";
3363@@ -179,15 +179,15 @@
3364 D_METHOD(("MediaString::getStringFor(media_format_family)\n"));
3365
3366 switch (family) {
3367- case B_ANY_FORMAT_FAMILY: return "Any Format Family";
3368- case B_BEOS_FORMAT_FAMILY: return "BeOS Format Family";
3369- case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime Format Family";
3370- case B_AVI_FORMAT_FAMILY: return "AVI Format Family";
3371- case B_ASF_FORMAT_FAMILY: return "ASF Format Family";
3372- case B_MPEG_FORMAT_FAMILY: return "MPEG Format Family";
3373- case B_WAV_FORMAT_FAMILY: return "WAV Format Family";
3374- case B_AIFF_FORMAT_FAMILY: return "AIFF Format Family";
3375- default: return "Miscellaneous Format Family";
3376+ case B_ANY_FORMAT_FAMILY: return "Any format family";
3377+ case B_BEOS_FORMAT_FAMILY: return "BeOS format family";
3378+ case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime format family";
3379+ case B_AVI_FORMAT_FAMILY: return "AVI format family";
3380+ case B_ASF_FORMAT_FAMILY: return "ASF format family";
3381+ case B_MPEG_FORMAT_FAMILY: return "MPEG format family";
3382+ case B_WAV_FORMAT_FAMILY: return "WAV format family";
3383+ case B_AIFF_FORMAT_FAMILY: return "AIFF format family";
3384+ default: return "Miscellaneous format family";
3385 }
3386 }
3387
3388@@ -460,7 +460,7 @@
3389 s << "Port " << source.port << ", ID " << source.id;
3390 }
3391 else {
3392- s = "(None)";
3393+ s = "(none)";
3394 }
3395 return s;
3396 }
3397@@ -476,7 +476,7 @@
3398 s << "Port " << destination.port << ", ID " << destination.id;
3399 }
3400 else {
3401- s = "(None)";
3402+ s = "(none)";
3403 }
3404 return s;
3405 }
3406@@ -497,13 +497,13 @@
3407
3408 switch (format) {
3409 case media_raw_audio_format::B_AUDIO_UCHAR: {
3410- return "8 bit Integer";
3411+ return "8 bit integer";
3412 }
3413 case media_raw_audio_format::B_AUDIO_SHORT: {
3414- return "16 bit Integer";
3415+ return "16 bit integer";
3416 }
3417 case media_raw_audio_format::B_AUDIO_FLOAT: {
3418- return "32 bit Float";
3419+ return "32 bit float";
3420 }
3421 case media_raw_audio_format::B_AUDIO_INT: {
3422 BString s = "";
3423@@ -511,7 +511,7 @@
3424 s << validBits << " bit ";
3425 else
3426 s << "32 bit ";
3427- s << "Integer";
3428+ s << "integer";
3429 return s;
3430 }
3431 default: {
3432@@ -569,10 +569,10 @@
3433
3434 switch (byteOrder) {
3435 case B_MEDIA_BIG_ENDIAN: {
3436- return "Big Endian";
3437+ return "Big endian";
3438 }
3439 case B_MEDIA_LITTLE_ENDIAN: {
3440- return "Little Endian";
3441+ return "Little endian";
3442 }
3443 default: {
3444 return "(unknown byte order)";
3445@@ -642,156 +642,156 @@
3446 }
3447 if (channelMask & B_CHANNEL_REARLEFT) {
3448 if (first) {
3449- list = "Rear-Left";
3450+ list = "Rear-left";
3451 first = false;
3452 }
3453 else {
3454 if (last != "")
3455 list << ", " << last;
3456- last = "Rear-Left";
3457+ last = "Rear-left";
3458 }
3459 }
3460 if (channelMask & B_CHANNEL_REARRIGHT) {
3461 if (first) {
3462- list = "Rear-Right";
3463+ list = "Rear-right";
3464 first = false;
3465 }
3466 else {
3467 if (last != "")
3468 list << ", " << last;
3469- last = "Rear-Right";
3470+ last = "Rear-right";
3471 }
3472 }
3473 if (channelMask & B_CHANNEL_FRONT_LEFT_CENTER) {
3474 if (first) {
3475- list = "Front-Left-Center";
3476+ list = "Front-left-center";
3477 first = false;
3478 }
3479 else {
3480 if (last != "")
3481 list << ", " << last;
3482- last = "Front-Left-Center";
3483+ last = "Front-left-center";
3484 }
3485 }
3486 if (channelMask & B_CHANNEL_FRONT_RIGHT_CENTER) {
3487 if (first) {
3488- list = "Front-Right-Center";
3489+ list = "Front-right-center";
3490 first = false;
3491 }
3492 else {
3493 if (last != "")
3494 list << ", " << last;
3495- last = "Front-Right-Center";
3496+ last = "Front-right-center";
3497 }
3498 }
3499 if (channelMask & B_CHANNEL_BACK_CENTER) {
3500 if (first) {
3501- list = "Back-Center";
3502+ list = "Back-center";
3503 first = false;
3504 }
3505 else {
3506 if (last != "")
3507 list << ", " << last;
3508- last = "Back-Center";
3509+ last = "Back-center";
3510 }
3511 }
3512 if (channelMask & B_CHANNEL_SIDE_LEFT) {
3513 if (first) {
3514- list = "Side-Left";
3515+ list = "Side-left";
3516 first = false;
3517 }
3518 else {
3519 if (last != "")
3520 list << ", " << last;
3521- last = "Side-Left";
3522+ last = "Side-left";
3523 }
3524 }
3525 if (channelMask & B_CHANNEL_SIDE_RIGHT) {
3526 if (first) {
3527- list = "Side-Right";
3528+ list = "Side-right";
3529 first = false;
3530 }
3531 else {
3532 if (last != "")
3533 list << ", " << last;
3534- last = "Side-Right";
3535+ last = "Side-right";
3536 }
3537 }
3538 if (channelMask & B_CHANNEL_TOP_CENTER) {
3539 if (first) {
3540- list = "Top-Center";
3541+ list = "Top-center";
3542 first = false;
3543 }
3544 else {
3545 if (last != "")
3546 list << ", " << last;
3547- last = "Top-Center";
3548+ last = "Top-center";
3549 }
3550 }
3551 if (channelMask & B_CHANNEL_TOP_FRONT_LEFT) {
3552 if (first) {
3553- list = "Top-Front-Left";
3554+ list = "Top-Front-left";
3555 first = false;
3556 }
3557 else {
3558 if (last != "")
3559 list << ", " << last;
3560- last = "Top-Front-Left";
3561+ last = "Top-Front-left";
3562 }
3563 }
3564 if (channelMask & B_CHANNEL_TOP_FRONT_CENTER) {
3565 if (first) {
3566- list = "Top-Front-Center";
3567+ list = "Top-Front-center";
3568 first = false;
3569 }
3570 else {
3571 if (last != "")
3572 list << ", " << last;
3573- last = "Top-Front-Center";
3574+ last = "Top-Front-center";
3575 }
3576 }
3577 if (channelMask & B_CHANNEL_TOP_FRONT_RIGHT) {
3578 if (first) {
3579- list = "Top-Front-Right";
3580+ list = "Top-Front-right";
3581 first = false;
3582 }
3583 else {
3584 if (last != "")
3585 list << ", " << last;
3586- last = "Top-Front-Right";
3587+ last = "Top-Front-right";
3588 }
3589 }
3590 if (channelMask & B_CHANNEL_TOP_BACK_LEFT) {
3591 if (first) {
3592- list = "Top-Back-Left";
3593+ list = "Top-Back-left";
3594 first = false;
3595 }
3596 else {
3597 if (last != "")
3598 list << ", " << last;
3599- last = "Top-Back-Left";
3600+ last = "Top-Back-left";
3601 }
3602 }
3603 if (channelMask & B_CHANNEL_TOP_BACK_CENTER) {
3604 if (first) {
3605- list = "Top-Back-Center";
3606+ list = "Top-Back-center";
3607 first = false;
3608 }
3609 else {
3610 if (last != "")
3611 list << ", " << last;
3612- last = "Top-Back-Center";
3613+ last = "Top-Back-center";
3614 }
3615 }
3616 if (channelMask & B_CHANNEL_TOP_BACK_RIGHT) {
3617 if (first) {
3618- list = "Top-Back-Right";
3619+ list = "Top-Back-right";
3620 first = false;
3621 }
3622 else {
3623 if (last != "")
3624 list << ", " << last;
3625- last = "Top-Back-Right";
3626+ last = "Top-Back-right";
3627 }
3628 }
3629 if (last != "") {
3630@@ -876,8 +876,8 @@
3631 case B_RGB15_BIG: return "15 bit RGB";
3632 case B_RGBA15:
3633 case B_RGBA15_BIG: return "15 bit RGBA";
3634- case B_CMAP8: return "8 bit Color-Index";
3635- case B_GRAY8: return "8 bit Grayscale-Index";
3636+ case B_CMAP8: return "8 bit color-index";
3637+ case B_GRAY8: return "8 bit grayscale-index";
3638 case B_GRAY1: return "Monochrome";
3639 case B_YUV422: return "YUV422";
3640 case B_YUV411: return "YUV411";
3641@@ -942,7 +942,7 @@
3642
3643 BString s = "";
3644 if (interlace == 1) {
3645- s << "Non-Interlaced ";
3646+ s << "Non-interlaced ";
3647 }
3648 else {
3649 s << "Interlaced ";
3650@@ -970,10 +970,10 @@
3651
3652 switch (orientation) {
3653 case B_VIDEO_TOP_LEFT_RIGHT: {
3654- return "Top to Bottom, Left to Right";
3655+ return "Top to bottom, left to right";
3656 }
3657 case B_VIDEO_BOTTOM_LEFT_RIGHT: {
3658- return "Bottom to Top, Left to Right";
3659+ return "Bottom to top, left to right";
3660 }
3661 default: {
3662 return "(unkown video orientation)";
3663@@ -1129,7 +1129,7 @@
3664 }
3665
3666 switch (format) {
3667- case media_multistream_format::B_VID: return "BeOS Video";
3668+ case media_multistream_format::B_VID: return "BeOS video";
3669 case media_multistream_format::B_AVI: return "AVI";
3670 case media_multistream_format::B_MPEG1: return "MPEG1";
3671 case media_multistream_format::B_MPEG2: return "MPEG2";
3672Index: src/apps/expander/ExpanderWindow.cpp
3673===================================================================
3674--- src/apps/expander/ExpanderWindow.cpp (Revision 34761)
3675+++ src/apps/expander/ExpanderWindow.cpp (Arbeitskopie)
3676@@ -1,5 +1,5 @@
3677 /*
3678- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3679+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3680 * Distributed under the terms of the MIT License.
3681 */
3682
3683@@ -55,12 +55,12 @@
3684 menu->AddItem(item = new BMenuItem("About Expander" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED)));
3685 item->SetTarget(be_app_messenger);
3686 menu->AddSeparatorItem();
3687- menu->AddItem(fSourceItem = new BMenuItem("Set Source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O'));
3688- menu->AddItem(fDestItem = new BMenuItem("Set Destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D'));
3689+ menu->AddItem(fSourceItem = new BMenuItem("Set source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O'));
3690+ menu->AddItem(fDestItem = new BMenuItem("Set destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D'));
3691 menu->AddSeparatorItem();
3692 menu->AddItem(fExpandItem = new BMenuItem("Expand", new BMessage(MSG_EXPAND), 'E'));
3693 fExpandItem->SetEnabled(false);
3694- menu->AddItem(fShowItem = new BMenuItem("Show Contents", new BMessage(MSG_SHOW), 'L'));
3695+ menu->AddItem(fShowItem = new BMenuItem("Show contents", new BMessage(MSG_SHOW), 'L'));
3696 fShowItem->SetEnabled(false);
3697 menu->AddSeparatorItem();
3698 menu->AddItem(fStopItem = new BMenuItem("Stop", new BMessage(MSG_STOP), 'K'));
3699@@ -69,9 +69,9 @@
3700 menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W'));
3701 fBar->AddItem(menu);
3702
3703- menu = new BMenu("Edit");
3704- menu->AddItem(fPreferencesItem = new BMenuItem("Preferences" B_UTF8_ELLIPSIS,
3705- new BMessage(MSG_PREFERENCES), 'P'));
3706+ menu = new BMenu("Settings");
3707+ menu->AddItem(fPreferencesItem = new BMenuItem("Settings" B_UTF8_ELLIPSIS,
3708+ new BMessage(MSG_PREFERENCES), 'S'));
3709 fBar->AddItem(menu);
3710 AddChild(fBar);
3711
3712@@ -125,7 +125,7 @@
3713 topView->AddChild(fDestText);
3714
3715 rect.OffsetBy(0, fSourceButton->Bounds().Height() + 4 + offset);
3716- fShowContents = new BCheckBox(rect, "showContents", "Show Contents",
3717+ fShowContents = new BCheckBox(rect, "showContents", "Show contents",
3718 new BMessage(MSG_SHOWCONTENTS), B_FOLLOW_RIGHT | B_FOLLOW_TOP);
3719 fShowContents->ResizeToPreferred();
3720 fShowContents->MoveTo(Bounds().right - 8 - fShowContents->Bounds().Width(),
3721@@ -186,13 +186,13 @@
3722 BVolume volume;
3723 if (!entry.Exists()) {
3724 BAlert *alert = new BAlert("destAlert", "The destination"
3725- " directory does not exist.", "Cancel", NULL, NULL,
3726+ " folder does not exist.", "Cancel", NULL, NULL,
3727 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
3728 alert->Go();
3729 return false;
3730 } else if (!entry.IsDirectory()) {
3731 (new BAlert("destAlert", "The destination"
3732- " is not a directory.", "Cancel", NULL, NULL,
3733+ " is not a folder.", "Cancel", NULL, NULL,
3734 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT))->Go();
3735 return false;
3736 } else if (entry.GetVolume(&volume) != B_OK || volume.IsReadOnly()) {
3737@@ -299,7 +299,7 @@
3738 case MSG_SHOWCONTENTS:
3739 // change menu item label
3740 fShowItem->SetLabel(fShowContents->Value() == B_CONTROL_OFF
3741- ? "Show Contents" : "Hide Contents");
3742+ ? "Show contents" : "Hide contents");
3743
3744 if (fShowContents->Value() == B_CONTROL_OFF) {
3745 if (fListingStarted)
3746@@ -508,7 +508,7 @@
3747
3748 BEntry destEntry(fDestText->Text(), true);
3749 if (!destEntry.Exists()) {
3750- BAlert *alert = new BAlert("destAlert", "The directory was either moved, renamed or not\n"
3751+ BAlert *alert = new BAlert("destAlert", "The folder was either moved, renamed or not\n"
3752 "supported.",
3753 "Cancel", NULL, NULL,
3754 B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT);
3755@@ -620,7 +620,7 @@
3756 fDestItem->SetEnabled(false);
3757 fExpandItem->SetEnabled(false);
3758 fShowItem->SetEnabled(true);
3759- fShowItem->SetLabel("Hide Contents");
3760+ fShowItem->SetLabel("Hide contents");
3761 fStopItem->SetEnabled(false);
3762 fPreferencesItem->SetEnabled(false);
3763
3764Index: src/apps/expander/ExpanderApp.cpp
3765===================================================================
3766--- src/apps/expander/ExpanderApp.cpp (Revision 34761)
3767+++ src/apps/expander/ExpanderApp.cpp (Arbeitskopie)
3768@@ -1,5 +1,5 @@
3769 /*
3770- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3771+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3772 * Distributed under the terms of the MIT License.
3773 */
3774
3775@@ -29,7 +29,7 @@
3776 "\twritten by Jérôme Duval\n"
3777 "\tCopyright 2004-2006, Haiku Inc.\n\n"
3778 "original Be version by \n"
3779- "Dominic, Hiroshi, Peter, Pavel and Robert\n", "Ok");
3780+ "Dominic, Hiroshi, Peter, Pavel and Robert\n", "OK");
3781 BTextView *view = alert->TextView();
3782 BFont font;
3783
3784Index: src/apps/expander/ExpanderPreferences.cpp
3785===================================================================
3786--- src/apps/expander/ExpanderPreferences.cpp (Revision 34761)
3787+++ src/apps/expander/ExpanderPreferences.cpp (Arbeitskopie)
3788@@ -1,5 +1,5 @@
3789 /*
3790- * Copyright 2004-2006, Jérôme DUVAL. All rights reserved.
3791+ * Copyright 2004-2009, Jérôme DUVAL. All rights reserved.
3792 * Distributed under the terms of the MIT License.
3793 */
3794
3795@@ -34,7 +34,7 @@
3796 rect.right -= 22;
3797 BBox *box = new BBox(rect, "background", B_FOLLOW_NONE,
3798 B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
3799- box->SetLabel("Expander Preferences");
3800+ box->SetLabel("Expander settings");
3801 background->AddChild(box);
3802
3803 float maxWidth = box->Bounds().right;
3804@@ -72,7 +72,7 @@
3805
3806 frameRect = stringView->Frame();
3807 frameRect.top = fCloseWindow->Frame().bottom + 10;
3808- stringView = new BStringView(frameRect, "destinationFolder", "Destination Folder:",
3809+ stringView = new BStringView(frameRect, "destinationFolder", "Destination folder:",
3810 B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
3811 stringView->ResizeToPreferred();
3812 if (stringView->Frame().right > maxWidth)
3813Index: src/apps/mediaconverter/Strings.h
3814===================================================================
3815--- src/apps/mediaconverter/Strings.h (Revision 34761)
3816+++ src/apps/mediaconverter/Strings.h (Arbeitskopie)
3817@@ -1,6 +1,6 @@
3818 // Copyright 1999, Be Incorporated. All Rights Reserved.
3819 // Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
3820-// Copyright 2007, Stephan Aßmus. All Rights Reserved.
3821+// Copyright 2007-2009, Stephan Aßmus. All Rights Reserved.
3822 // This file may be used under the terms of the Be Sample Code License.
3823 #ifndef STRINGS_H
3824 #define STRINGS_H
3825@@ -26,14 +26,14 @@
3826 #define SOURCE_BOX_LABEL _T("Source files")
3827 #define INFO_BOX_LABEL _T("File details")
3828 #define OUTPUT_BOX_LABEL _T("Output format")
3829-#define FORMAT_LABEL _T("File format")
3830-#define VIDEO_LABEL _T("Video encoding")
3831-#define AUDIO_LABEL _T("Audio encoding")
3832+#define FORMAT_LABEL _T("File format:")
3833+#define VIDEO_LABEL _T("Video encoding:")
3834+#define AUDIO_LABEL _T("Audio encoding:")
3835 //
3836-#define OUTPUT_FOLDER_LABEL _T("Output Folder")
3837+#define OUTPUT_FOLDER_LABEL _T("Output folder")
3838 #define PREVIEW_BUTTON_LABEL _T("Preview")
3839-#define START_LABEL _T("Start mSec ")
3840-#define END_LABEL _T("End mSec ")
3841+#define START_LABEL _T("Start [ms]: ")
3842+#define END_LABEL _T("End [ms]: ")
3843 //
3844 #define FORMAT_MENU_LABEL _T("Format")
3845 #define VIDEO_MENU_LABEL _T("Video")
3846@@ -43,8 +43,8 @@
3847 #define AUDIO_INFO_LABEL _T("Audio:")
3848 #define CONVERT_LABEL _T("Convert")
3849 #define CANCEL_LABEL _T("Cancel")
3850-#define VIDEO_QUALITY_LABEL _T("Video quality %3d%%")
3851-#define AUDIO_QUALITY_LABEL _T("Audio quality %3d%%")
3852+#define VIDEO_QUALITY_LABEL _T("Video quality: %3d%%")
3853+#define AUDIO_QUALITY_LABEL _T("Audio quality: %3d%%")
3854 #define SLIDER_LOW_LABEL _T("Low")
3855 #define SLIDER_HIGH_LABEL _T("High")
3856 #define NONE_LABEL _T("None available")
3857@@ -54,14 +54,14 @@
3858 #define OK_LABEL _T("OK")
3859 #define CONV_COMPLETE_LABEL _T("Conversion completed")
3860 #define CONV_CANCEL_LABEL _T("Conversion cancelled")
3861-#define SELECT_DIR_LABEL _T("Select This Directory")
3862+#define SELECT_DIR_LABEL _T("Select this folder")
3863 #define SELECT_LABEL _T("Select")
3864 #define SAVE_DIR_LABEL _T("MediaConverter+:SaveDirectory")
3865 #define NO_FILE_LABEL _T("No file selected")
3866 //
3867 #define FILE_MENU_LABEL _T("File")
3868 #define OPEN_MENU_LABEL _T("Open")
3869-#define ABOUT_MENU_LABEL _T("About")
3870+#define ABOUT_MENU_LABEL _T("About MediaConverter")
3871 #define QUIT_MENU_LABEL _T("Quit")
3872
3873 #define WRITE_AUDIO_STRING _T("Writing audio track:")
3874@@ -86,7 +86,7 @@
3875 #define ERROR_READ_AUDIO_STRING _T("Error read audio frame ")
3876 #define ERROR_LOAD_STRING _T("Error loading file")
3877
3878-#define ENCODER_PARAMETERS _T("Encoder Parameters")
3879+#define ENCODER_PARAMETERS _T("Encoder parameters")
3880
3881
3882 #endif // STRINGS_H
3883Index: src/apps/mediaconverter/MediaConverterWindow.cpp
3884===================================================================
3885--- src/apps/mediaconverter/MediaConverterWindow.cpp (Revision 34761)
3886+++ src/apps/mediaconverter/MediaConverterWindow.cpp (Arbeitskopie)
3887@@ -1,6 +1,6 @@
3888 // Copyright 1999, Be Incorporated. All Rights Reserved.
3889 // Copyright 2000-2004, Jun Suzuki. All Rights Reserved.
3890-// Copyright 2007, Stephan Aßmus. All Rights Reserved.
3891+// Copyright 2007-2009, Stephan Aßmus. All Rights Reserved.
3892 // This file may be used under the terms of the Be Sample Code License.
3893 #include "MediaConverterWindow.h"
3894
3895@@ -602,7 +602,7 @@
3896 format.u.raw_audio = media_raw_audio_format::wildcard;
3897 while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) {
3898 if (separator) {
3899- menu->AddItem(new BMenuItem("No Audio",
3900+ menu->AddItem(new BMenuItem("No audio",
3901 new BMessage(AUDIO_CODEC_SELECT_MESSAGE)));
3902 menu->AddSeparatorItem();
3903 separator = false;
3904@@ -656,7 +656,7 @@
3905 cookie = 0;
3906 while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) {
3907 if (separator) {
3908- menu->AddItem(new BMenuItem("No Video",
3909+ menu->AddItem(new BMenuItem("No video",
3910 new BMessage(VIDEO_CODEC_SELECT_MESSAGE)));
3911 menu->AddSeparatorItem();
3912 separator = false;
3913Index: src/apps/mediaconverter/languages/MediaConverter.itIT
3914===================================================================
3915--- src/apps/mediaconverter/languages/MediaConverter.itIT (Revision 34761)
3916+++ src/apps/mediaconverter/languages/MediaConverter.itIT (Arbeitskopie)
3917@@ -8,10 +8,10 @@
3918 "File format" "Formato del file"
3919 "Video encoding" "Codifica video"
3920 "Audio encoding" "Codifica audio"
3921-"Output Folder" "Cartella di destinazione"
3922+"Output folder" "Cartella di destinazione"
3923 "Preview" "Anteprima"
3924-"Start mSec " "Inizio mSec"
3925-"End mSec " "Fine mSec"
3926+"Start [ms] " "Inizio mSec"
3927+"End [ms] " "Fine mSec"
3928 "Format" "Formato"
3929 "Video" "Video"
3930 "Audio" "Audio"
3931@@ -33,13 +33,13 @@
3932 "Cancelling" "Interruzione"
3933 "OK" "OK"
3934 "No file selected" "Nessun file selezionato"
3935-"Select This Directory" "Seleziona questa directory"
3936+"Select this folder" "Seleziona questa directory"
3937 "Select" "Seleziona"
3938 "MediaConverter+:SaveDirectory" "MediaConverter+:Directory di salvataggio"
3939 "Output file" "File di output"
3940 "created" "creato"
3941-"Audio-Quality doesn't support" "Audio-Quality non supportata"
3942-"Video-Quality doesn't support" "Video-Quality non supportata"
3943+"Audio quality doesn't support" "Audio quality non supportata"
3944+"Video quality doesn't support" "Video quality non supportata"
3945 "Writing audio track:" "Scrittura traccia audio in corso:"
3946 "Writing video track:" "Scrittura traccia video in corso:"
3947 "Error launching: " "Errore lanciando: "
3948Index: src/apps/mediaconverter/languages/MediaConverter.frFR
3949===================================================================
3950--- src/apps/mediaconverter/languages/MediaConverter.frFR (Revision 34761)
3951+++ src/apps/mediaconverter/languages/MediaConverter.frFR (Arbeitskopie)
3952@@ -8,10 +8,10 @@
3953 "File format" "Format du fichier"
3954 "Video encoding" "Codage Vidéo"
3955 "Audio encoding" "Codage Audio"
3956-"Output Folder" "Dossier de sortie"
3957+"Output folder" "Dossier de sortie"
3958 "Preview" "Prévue"
3959-"Start mSec " "Début (mSec)"
3960-"End mSec " "FIn (mSec)"
3961+"Start [ms] " "Début (mSec)"
3962+"End [ms] " "FIn (mSec)"
3963 "Format" "Format"
3964 "Video" "Vidéo"
3965 "Audio" "Audio"
3966@@ -22,8 +22,8 @@
3967 "Cancel" "Annuler"
3968 "Low" "Faible"
3969 "High" "Haute"
3970-"Video quality %3d%%" "QualitéVidéo %3d%%"
3971-"Audio quality %3d%%" "QualitéAudio %3d%%"
3972+"Video quality %3d%%" "Qualité vidéo %3d%%"
3973+"Audio quality %3d%%" "Qualité audio %3d%%"
3974 "Drop media files onto this window" "Jeter les fichiers media dans cette fenêtre"
3975 "None available" "Non disponible"
3976 "Converting" "Conversion en cours"
3977@@ -33,13 +33,13 @@
3978 "Cancelling" "Annulation en cours"
3979 "OK" "Ok"
3980 "No file selected" "Aucun fichier sélectionné"
3981-"Select This Directory" "Choisir ce dossier"
3982+"Select this folder" "Choisir ce dossier"
3983 "Select" "Sélectionner"
3984 "MediaConverter+:SaveDirectory" "MediaConverter+:DossierSauvegarde"
3985 "Output file" "Fichier cible"
3986 "created" "créé"
3987-"AudioQuality doesn't support" "Qualité Audio non supportée"
3988-"VideoQuality doesn't support" "Qualité Vidéo non supportée"
3989+"Audio quality doesn't support" "Qualité audio non supportée"
3990+"Video quality doesn't support" "Qualité vidéo non supportée"
3991 "Writing audio track:" "Ecriture de la piste audio:"
3992 "Writing video track:" "Ecriture de la piste vidéo:"
3993 "Error launching: " "Erreur de lancement : "
3994Index: src/apps/mediaconverter/languages/MediaConverter.jaJP
3995===================================================================
3996--- src/apps/mediaconverter/languages/MediaConverter.jaJP (Revision 34761)
3997+++ src/apps/mediaconverter/languages/MediaConverter.jaJP (Arbeitskopie)
3998@@ -8,10 +8,10 @@
3999 "File format" "ファイル形式"
4000 "Video encoding" "映像エンコード形式"
4001 "Audio encoding" "音声エンコード形式"
4002-"Output Folder" "出力フォルダ"
4003+"Output folder" "出力フォルダ"
4004 "Preview" "プレビュー"
4005-"Start mSec " "開始 mSec"
4006-"End mSec " "終了 mSec"
4007+"Start [ms] " "開始 mSec"
4008+"End [ms] " "終了 mSec"
4009 "Format" "形式"
4010 "Video" "映像"
4011 "Audio" "音声"
4012@@ -33,13 +33,13 @@
4013 "Cancelling" "中止しています"
4014 "OK" "了解"
4015 "No file selected" "ファイル未選択"
4016-"Select This Directory" "現在のディレクトリを選択"
4017+"Select this folder" "現在のディレクトリを選択"
4018 "Select" "選択"
4019 "MediaConverter+:SaveDirectory" "MediaConverter+:保存先のディレクトリ"
4020 "Output file" "出力ファイル"
4021 "created" "生成"
4022-"AudioQuality doesn't support" "音質調整機能なし"
4023-"VideoQuality doesn't support" "画質調整機能なし"
4024+"Audio quality doesn't support" "音質調整機能なし"
4025+"Video quality doesn't support" "画質調整機能なし"
4026 "Writing audio track:" "音声トラック書き込み中:"
4027 "Writing video track:" "映像トラック書き込み中:"
4028 "Error launching: " "起動エラー : "
4029Index: src/apps/login/LoginView.cpp
4030===================================================================
4031--- src/apps/login/LoginView.cpp (Revision 34761)
4032+++ src/apps/login/LoginView.cpp (Arbeitskopie)
4033@@ -1,5 +1,5 @@
4034 /*
4035- * Copyright 2008, François Revol, <revol@free.fr>. All rights reserved.
4036+ * Copyright 2008-2009, François Revol, <revol@free.fr>. All rights reserved.
4037 * Distributed under the terms of the MIT License.
4038 */
4039 #include <ScrollView.h>
4040@@ -57,18 +57,18 @@
4041
4042 r.Set(LW + 30, Bounds().top + CSEP,
4043 Bounds().right - CSEP, Bounds().top + CSEP + CSEP);
4044- fLoginControl = new BTextControl(r, "login", "login:", "",
4045+ fLoginControl = new BTextControl(r, "login", "Login:", "",
4046 new BMessage(kLoginEdited));
4047 AddChild(fLoginControl);
4048
4049 r.OffsetBySelf(0, CSEP + CSEP);
4050- fPasswordControl = new BTextControl(r, "password", "password:", "",
4051+ fPasswordControl = new BTextControl(r, "password", "Password:", "",
4052 new BMessage(kPasswordEdited));
4053 fPasswordControl->TextView()->HideTyping(true);
4054 AddChild(fPasswordControl);
4055
4056 r.OffsetBySelf(0, CSEP + CSEP);
4057- fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide Password",
4058+ fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide password",
4059 new BMessage(kHidePassword));
4060 fHidePasswordCheckBox->SetValue(1);
4061 AddChild(fHidePasswordCheckBox);
4062@@ -93,7 +93,7 @@
4063
4064 buttonRect.OffsetToSelf(Bounds().Width() - CSEP - buttonWidth,
4065 Bounds().Height() - CSEP - BH);
4066- fLoginButton = new BButton(buttonRect, "ok", "Ok",
4067+ fLoginButton = new BButton(buttonRect, "ok", "OK",
4068 new BMessage(kAttemptLogin));
4069 AddChild(fLoginButton);
4070
4071Index: src/apps/login/LoginApp.cpp
4072===================================================================
4073--- src/apps/login/LoginApp.cpp (Revision 34761)
4074+++ src/apps/login/LoginApp.cpp (Arbeitskopie)
4075@@ -1,5 +1,5 @@
4076 /*
4077- * Copyright 2008, François Revol, <revol@free.fr>. All rights reserved.
4078+ * Copyright 2008-2009, François Revol, <revol@free.fr>. All rights reserved.
4079 * Distributed under the terms of the MIT License.
4080 */
4081
4082@@ -48,10 +48,10 @@
4083
4084 if (fEditShelfMode) {
4085 (new BAlert("Info", "You can customize the desktop shown "
4086- "behind the Login app by dropping replicants onto it.\n"
4087+ "behind the Login application by dropping replicants onto it.\n"
4088 "\n"
4089 "When you are finished just quit the application (Alt-Q).",
4090- "Ok"))->Go(NULL);
4091+ "OK"))->Go(NULL);
4092 } else {
4093 BRect frame(0, 0, 400, 150);
4094 frame.OffsetBySelf(screen.Frame().Width()/2 - frame.Width()/2,
4095@@ -89,12 +89,12 @@
4096 if (error < B_OK) {
4097 BString msg("Error: ");
4098 msg << strerror(error);
4099- (new BAlert("Error", msg.String(), "Ok"))->Go();
4100+ (new BAlert("Error", msg.String(), "OK"))->Go();
4101 }
4102 break;
4103 }
4104 case kSuspendAction:
4105- (new BAlert("Error", "Unimplemented", "Ok"))->Go();
4106+ (new BAlert("Error", "Unimplemented", "OK"))->Go();
4107 break;
4108 #endif
4109 default:
4110@@ -118,7 +118,7 @@
4111 printf("Login application for Haiku\nUsage:\n");
4112 printf("%s [--nonmodal] [--edit]\n", argv[0]);
4113 printf("--nonmodal Do not make the window modal\n");
4114- printf("--edit Launch in Shelf editting mode to "
4115+ printf("--edit Launch in shelf editting mode to "
4116 "allow customizing the desktop.\n");
4117 // just return to the shell
4118 exit((arg == "--help") ? 0 : 1);
4119Index: src/apps/packageinstaller/PackageInfo.cpp
4120===================================================================
4121--- src/apps/packageinstaller/PackageInfo.cpp (Revision 34761)
4122+++ src/apps/packageinstaller/PackageInfo.cpp (Arbeitskopie)
4123@@ -1057,7 +1057,7 @@
4124 BAlert *warning = new BAlert(T("filesize_wrong"),
4125 T("There seems to be a filesize mismatch in the package file. "
4126 "The package might be corrupted or have been modified after its "
4127- "creation. Do you still wish to continue?"), T("Yes"), T("No"), NULL,
4128+ "creation. Do you still wish to continue?"), T("Continue"), T("Abort"), NULL,
4129 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4130 selection = warning->Go();
4131
4132Index: src/apps/packageinstaller/PackageWindow.cpp
4133===================================================================
4134--- src/apps/packageinstaller/PackageWindow.cpp (Revision 34761)
4135+++ src/apps/packageinstaller/PackageWindow.cpp (Arbeitskopie)
4136@@ -1,5 +1,5 @@
4137 /*
4138- * Copyright (c) 2007, Haiku, Inc.
4139+ * Copyright (c) 2007-2009, Haiku, Inc.
4140 * Distributed under the terms of the MIT license.
4141 *
4142 * Author:
4143@@ -18,7 +18,7 @@
4144
4145
4146 PackageWindow::PackageWindow(const entry_ref *ref)
4147- : BWindow(BRect(100, 100, 600, 300), T("Package Installer"), B_TITLED_WINDOW,
4148+ : BWindow(BRect(100, 100, 600, 300), T("PackageInstaller"), B_TITLED_WINDOW,
4149 B_NOT_ZOOMABLE | B_NOT_RESIZABLE)
4150 {
4151 //SetLayout(new BGroupLayout(B_HORIZONTAL));
4152Index: src/apps/packageinstaller/main.cpp
4153===================================================================
4154--- src/apps/packageinstaller/main.cpp (Revision 34761)
4155+++ src/apps/packageinstaller/main.cpp (Arbeitskopie)
4156@@ -1,5 +1,5 @@
4157 /*
4158- * Copyright (c) 2007, Haiku, Inc.
4159+ * Copyright (c) 2007-2009, Haiku, Inc. All rights reserved.
4160 * Distributed under the terms of the MIT license.
4161 *
4162 * Author:
4163@@ -139,7 +139,7 @@
4164 "BeOS legacy .pkg file installer for Haiku.\n\n"
4165 "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n"
4166 "Copyright (c) 2007 Haiku, Inc. \n",
4167- "Close");
4168+ "OK");
4169
4170 BTextView *view = about->TextView();
4171 BFont font;
4172Index: src/apps/packageinstaller/PackageView.cpp
4173===================================================================
4174--- src/apps/packageinstaller/PackageView.cpp (Revision 34761)
4175+++ src/apps/packageinstaller/PackageView.cpp (Arbeitskopie)
4176@@ -266,7 +266,7 @@
4177 BAlert *reinstall = new BAlert("reinstall",
4178 T("The given package seems to be already installed on your system. "
4179 "Would you like to uninstall the existing one and continue the "
4180- "installation?"), T("Yes"), T("No"));
4181+ "installation?"), T("Continue"), T("Abort"));
4182
4183 if (reinstall->Go() == 0) {
4184 // Uninstall the package
4185@@ -301,7 +301,7 @@
4186 return err;
4187 }
4188
4189- fStatusWindow->StageStep(1, "Installing files and directories");
4190+ fStatusWindow->StageStep(1, "Installing files and folders");
4191
4192 // Install files and directories
4193 PackageItem *iter;
4194@@ -570,11 +570,11 @@
4195 BString alertString = T("The ");
4196
4197 alertString << item.ItemKind() << T(" named \'") << path.Leaf() << "\' ";
4198- alertString << T("already exists in the given path. Should the "
4199- "existing file be replaced with the one from this package?");
4200-
4201+ alertString << T("already exists in the given path.\nReplace the file with "
4202+ "the one from this package or skip it?");
4203+
4204 BAlert *alert = new BAlert(T("file_exists"), alertString.String(),
4205- T("Yes"), T("No"), T("Abort"));
4206+ T("Replace"), T("Skip"), T("Abort"));
4207
4208 choice = alert->Go();
4209 switch (choice) {
4210@@ -590,8 +590,8 @@
4211
4212 if (fItemExistsPolicy == P_EXISTS_NONE) {
4213 // TODO: Maybe add 'No, but ask again' type of choice as well?
4214- alertString = T("Should this decision be remembered and all "
4215- "existing files encountered in the future be ");
4216+ alertString = T("Do you want to remember this decision for the rest of "
4217+ "this installation?\nAll existing files will be ");
4218 alertString << ((choice == P_EXISTS_OVERWRITE)
4219 ? T("replaced?") : T("skipped?"));
4220
4221Index: src/apps/text_search/GrepWindow.cpp
4222===================================================================
4223--- src/apps/text_search/GrepWindow.cpp (Revision 34761)
4224+++ src/apps/text_search/GrepWindow.cpp (Arbeitskopie)
4225@@ -1,5 +1,6 @@
4226 /*
4227- * Copyright (c) 1998-2007 Matthijs Hollemans
4228+ * Copyright (c) 1998-2007, Matthijs Hollemans
4229+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
4230 *
4231 * Permission is hereby granted, free of charge, to any person obtaining a
4232 * copy of this software and associated documentation files (the "Software"),
4233@@ -416,21 +417,21 @@
4234
4235 fFileMenu = new BMenu(_T("File"));
4236 fActionMenu = new BMenu(_T("Actions"));
4237- fPreferencesMenu = new BMenu(_T("Preferences"));
4238+ fPreferencesMenu = new BMenu(_T("Settings"));
4239 fHistoryMenu = new BMenu(_T("History"));
4240 fEncodingMenu = new BMenu(_T("Encoding"));
4241
4242 fNew = new BMenuItem(
4243- _T("New Window"), new BMessage(MSG_NEW_WINDOW), 'N');
4244+ _T("New window"), new BMessage(MSG_NEW_WINDOW), 'N');
4245
4246 fOpen = new BMenuItem(
4247- _T("Set Which Files to Search"), new BMessage(MSG_OPEN_PANEL), 'F');
4248+ _T("Set which files to search"), new BMessage(MSG_OPEN_PANEL), 'F');
4249
4250 fClose = new BMenuItem(
4251 _T("Close"), new BMessage(B_QUIT_REQUESTED), 'W');
4252
4253 fAbout = new BMenuItem(
4254- _T("About"), new BMessage(B_ABOUT_REQUESTED));
4255+ _T("About TextSearch" B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED));
4256
4257 fQuit = new BMenuItem(
4258 _T("Quit"), new BMessage(MSG_QUIT_NOW), 'Q');
4259@@ -439,31 +440,31 @@
4260 _T("Search"), new BMessage(MSG_START_CANCEL), 'S');
4261
4262 fSelectAll = new BMenuItem(
4263- _T("Select All"), new BMessage(MSG_SELECT_ALL), 'A');
4264+ _T("Select all"), new BMessage(MSG_SELECT_ALL), 'A');
4265
4266 fTrimSelection = new BMenuItem(
4267- _T("Trim to Selection"), new BMessage(MSG_TRIM_SELECTION), 'T');
4268+ _T("Trim to selection"), new BMessage(MSG_TRIM_SELECTION), 'T');
4269
4270 fOpenSelection = new BMenuItem(
4271- _T("Open Selection"), new BMessage(MSG_OPEN_SELECTION), 'O');
4272+ _T("Open selection"), new BMessage(MSG_OPEN_SELECTION), 'O');
4273
4274 fSelectInTracker = new BMenuItem(
4275- _T("Show Files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K');
4276+ _T("Show files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K');
4277
4278 fCopyText = new BMenuItem(
4279- _T("Copy Text to Clipboard"), new BMessage(MSG_COPY_TEXT), 'B');
4280+ _T("Copy text to clipboard"), new BMessage(MSG_COPY_TEXT), 'B');
4281
4282 fRecurseLinks = new BMenuItem(
4283 _T("Follow symbolic links"), new BMessage(MSG_RECURSE_LINKS));
4284
4285 fRecurseDirs = new BMenuItem(
4286- _T("Look in sub-directories"), new BMessage(MSG_RECURSE_DIRS));
4287+ _T("Look in sub-folders"), new BMessage(MSG_RECURSE_DIRS));
4288
4289 fSkipDotDirs = new BMenuItem(
4290- _T("Skip sub-directories starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS));
4291+ _T("Skip sub-folders starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS));
4292
4293 fCaseSensitive = new BMenuItem(
4294- _T("Case sensitive"), new BMessage(MSG_CASE_SENSITIVE));
4295+ _T("Case-sensitive"), new BMessage(MSG_CASE_SENSITIVE));
4296
4297 fEscapeText = new BMenuItem(
4298 _T("Escape search text"), new BMessage(MSG_ESCAPE_TEXT));
4299@@ -475,7 +476,7 @@
4300 _T("Open files in Pe"), new BMessage(MSG_INVOKE_PE));
4301
4302 fShowLinesMenuitem = new BMenuItem(
4303- _T("Show Lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L');
4304+ _T("Show lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L');
4305 fShowLinesMenuitem->SetMarked(true);
4306
4307 fUTF8 = new BMenuItem("UTF8", new BMessage('utf8'));
4308@@ -561,7 +562,7 @@
4309 fButton->SetEnabled(false);
4310
4311 fShowLinesCheckbox = new BCheckBox(
4312- BRect(0, 0, 1, 1), "ShowLines", _T("Show Lines"),
4313+ BRect(0, 0, 1, 1), "ShowLines", _T("Show lines"),
4314 new BMessage(MSG_CHECKBOX_SHOW_LINES), B_FOLLOW_LEFT);
4315
4316 fShowLinesCheckbox->SetValue(B_CONTROL_ON);
4317@@ -1284,7 +1285,7 @@
4318 text << "\n";
4319 text << _T("The unselected files will be removed from the list.");
4320 text << "\n";
4321- BAlert* alert = new BAlert(NULL, text.String(), _T("Okay"), NULL, NULL,
4322+ BAlert* alert = new BAlert(NULL, text.String(), _T("OK"), NULL, NULL,
4323 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4324 alert->Go(NULL);
4325 return;
4326@@ -1377,7 +1378,7 @@
4327 BAlert* alert = new BAlert("Info",
4328 _T("Please select the files you wish to have selected for you in "
4329 "Tracker."),
4330- _T("Okay"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4331+ _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4332 alert->Go(NULL);
4333 return;
4334 }
4335@@ -1438,9 +1439,8 @@
4336
4337 if (!_AreAllFoldersOpenInTracker(&folderList)) {
4338 BAlert* alert = new BAlert(NULL,
4339- _T(APP_NAME " couldn't open one or more folders, and it's very "
4340- "sorry about it."),
4341- _T("Forgive and forget!"), NULL, NULL, B_WIDTH_AS_USUAL,
4342+ _T(APP_NAME " couldn't open one or more folders,"),
4343+ _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
4344 B_STOP_ALERT);
4345 alert->Go(NULL);
4346 goto out;
4347@@ -1478,7 +1478,7 @@
4348 "Oliver Tappe, Jonas Sundström, Luc Schrijvers and momoziro.");
4349 text << "\n";
4350
4351- BAlert* alert = new BAlert("TextSearch", text.String(), _T("Ok"), NULL,
4352+ BAlert* alert = new BAlert("TextSearch", text.String(), _T("OK"), NULL,
4353 NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT);
4354
4355 BTextView* view = alert->TextView();
4356Index: src/apps/stylededit/StyledEditWindow.cpp
4357===================================================================
4358--- src/apps/stylededit/StyledEditWindow.cpp (Revision 34761)
4359+++ src/apps/stylededit/StyledEditWindow.cpp (Arbeitskopie)
4360@@ -139,17 +139,17 @@
4361
4362 menu->AddItem(fSaveItem = new BMenuItem("Save", new BMessage(MENU_SAVE), 'S'));
4363 fSaveItem->SetEnabled(false);
4364- menu->AddItem(menuItem = new BMenuItem("Save As" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS)));
4365+ menu->AddItem(menuItem = new BMenuItem("Save as" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS)));
4366 menuItem->SetShortcut('S',B_SHIFT_KEY);
4367 menuItem->SetEnabled(true);
4368
4369- menu->AddItem(fRevertItem = new BMenuItem("Revert to Saved" B_UTF8_ELLIPSIS,
4370+ menu->AddItem(fRevertItem = new BMenuItem("Revert to saved" B_UTF8_ELLIPSIS,
4371 new BMessage(MENU_REVERT)));
4372 fRevertItem->SetEnabled(false);
4373 menu->AddItem(menuItem = new BMenuItem("Close", new BMessage(MENU_CLOSE), 'W'));
4374
4375 menu->AddSeparatorItem();
4376- menu->AddItem(menuItem = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP)));
4377+ menu->AddItem(menuItem = new BMenuItem("Page setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP)));
4378 menu->AddItem(menuItem = new BMenuItem("Print" B_UTF8_ELLIPSIS, new BMessage(MENU_PRINT), 'P'));
4379
4380 menu->AddSeparatorItem();
4381@@ -159,7 +159,7 @@
4382 menu = new BMenu("Edit");
4383 fMenuBar->AddItem(menu);
4384
4385- menu->AddItem(fUndoItem = new BMenuItem("Can't Undo", new BMessage(B_UNDO), 'Z'));
4386+ menu->AddItem(fUndoItem = new BMenuItem("Can't undo", new BMessage(B_UNDO), 'Z'));
4387 fUndoItem->SetEnabled(false);
4388
4389 menu->AddSeparatorItem();
4390@@ -178,17 +178,17 @@
4391 fClearItem->SetTarget(fTextView);
4392
4393 menu->AddSeparatorItem();
4394- menu->AddItem(menuItem = new BMenuItem("Select All", new BMessage(B_SELECT_ALL), 'A'));
4395+ menu->AddItem(menuItem = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A'));
4396 menuItem->SetTarget(fTextView);
4397
4398 menu->AddSeparatorItem();
4399 menu->AddItem(menuItem = new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(MENU_FIND),'F'));
4400- menu->AddItem(fFindAgainItem= new BMenuItem("Find Again",new BMessage(MENU_FIND_AGAIN),'G'));
4401+ menu->AddItem(fFindAgainItem= new BMenuItem("Find again",new BMessage(MENU_FIND_AGAIN),'G'));
4402 fFindAgainItem->SetEnabled(false);
4403
4404- menu->AddItem(menuItem = new BMenuItem("Find Selection", new BMessage(MENU_FIND_SELECTION),'H'));
4405+ menu->AddItem(menuItem = new BMenuItem("Find selection", new BMessage(MENU_FIND_SELECTION),'H'));
4406 menu->AddItem(menuItem = new BMenuItem("Replace" B_UTF8_ELLIPSIS, new BMessage(MENU_REPLACE),'R'));
4407- menu->AddItem(fReplaceSameItem = new BMenuItem("Replace Same", new BMessage(MENU_REPLACE_SAME),'T'));
4408+ menu->AddItem(fReplaceSameItem = new BMenuItem("Replace same", new BMessage(MENU_REPLACE_SAME),'T'));
4409 fReplaceSameItem->SetEnabled(false);
4410
4411 // Add the "Font"-menu:
4412@@ -269,7 +269,7 @@
4413 subMenu->AddItem(fAlignCenter = new BMenuItem("Center", new BMessage(ALIGN_CENTER)));
4414 subMenu->AddItem(fAlignRight = new BMenuItem("Right", new BMessage(ALIGN_RIGHT)));
4415 menu->AddItem(subMenu);
4416- menu->AddItem(fWrapItem = new BMenuItem("Wrap Lines", new BMessage(WRAP_LINES)));
4417+ menu->AddItem(fWrapItem = new BMenuItem("Wrap lines", new BMessage(WRAP_LINES)));
4418 fWrapItem->SetMarked(true);
4419
4420 fSavePanel = NULL;
4421@@ -542,7 +542,7 @@
4422 // set mode
4423 fCanUndo = false;
4424 fCanRedo = true;
4425- fUndoItem->SetLabel("Redo Typing");
4426+ fUndoItem->SetLabel("Redo typing");
4427 fUndoItem->SetEnabled(true);
4428 fUndoFlag = false;
4429 } else {
4430@@ -562,7 +562,7 @@
4431 // set mode
4432 fCanUndo = true;
4433 fCanRedo = false;
4434- fUndoItem->SetLabel("Undo Typing");
4435+ fUndoItem->SetLabel("Undo typing");
4436 fUndoItem->SetEnabled(true);
4437 fRedoFlag = false;
4438 }
4439@@ -744,7 +744,7 @@
4440
4441 BString alertText("Save changes to the document \"");
4442 alertText<< Title() <<"\"? ";
4443- int32 index = _ShowAlert(alertText, "Cancel", "Don't Save", "Save",
4444+ int32 index = _ShowAlert(alertText, "Cancel", "Don't save", "Save",
4445 B_WARNING_ALERT);
4446
4447 if (index == 0)
4448@@ -988,7 +988,7 @@
4449 return;
4450
4451 // clear undo modes
4452- fUndoItem->SetLabel("Can't Undo");
4453+ fUndoItem->SetLabel("Can't undo");
4454 fUndoItem->SetEnabled(false);
4455 fUndoFlag = false;
4456 fCanUndo = false;
4457Index: src/apps/stylededit/ReplaceWindow.cpp
4458===================================================================
4459--- src/apps/stylededit/ReplaceWindow.cpp (Revision 34761)
4460+++ src/apps/stylededit/ReplaceWindow.cpp (Arbeitskopie)
4461@@ -1,5 +1,5 @@
4462 /*
4463- * Copyright 2002-2006, Haiku, Inc. All Rights Reserved.
4464+ * Copyright 2002-2009, Haiku, Inc. All rights reserved.
4465 * Distributed under the terms of the MIT License.
4466 *
4467 * Authors:
4468@@ -61,7 +61,7 @@
4469 fUIchange = false;
4470
4471 fReplaceView->AddChild(fReplaceAllButton = new BButton(BRect(10, 150, 98, 166),
4472- "", "Replace All", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4473+ "", "Replace all", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4474 B_WILL_DRAW | B_NAVIGABLE));
4475 fReplaceView->AddChild(fCancelButton = new BButton(BRect(141, 150, 211, 166),
4476 "", "Cancel", new BMessage(B_QUIT_REQUESTED), B_FOLLOW_LEFT | B_FOLLOW_TOP,
4477Index: src/apps/sudoku/SudokuWindow.cpp
4478===================================================================
4479--- src/apps/sudoku/SudokuWindow.cpp (Revision 34761)
4480+++ src/apps/sudoku/SudokuWindow.cpp (Arbeitskopie)
4481@@ -1,5 +1,5 @@
4482 /*
4483- * Copyright 2007-2008, Axel Dörfler, axeld@pinc-software.de.
4484+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de.
4485 * Distributed under the terms of the MIT License.
4486 */
4487
4488@@ -182,10 +182,10 @@
4489 // "File" menu
4490 BMenu* menu = new BMenu("File");
4491 menu->AddItem(new BMenuItem("New", new BMessage(kMsgNew)));
4492- menu->AddItem(new BMenuItem("Start Again", new BMessage(kMsgStartAgain)));
4493+ menu->AddItem(new BMenuItem("Start again", new BMessage(kMsgStartAgain)));
4494 menu->AddSeparatorItem();
4495 BMenu* recentsMenu = BRecentFilesList::NewFileListMenu(
4496- "Open File" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL,
4497+ "Open file" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL,
4498 kSignature);
4499 BMenuItem *item;
4500 menu->AddItem(item = new BMenuItem(recentsMenu,
4501@@ -202,7 +202,7 @@
4502
4503 menu->AddSeparatorItem();
4504
4505- subMenu = new BMenu("Export As" B_UTF8_ELLIPSIS);
4506+ subMenu = new BMenu("Export as" B_UTF8_ELLIPSIS);
4507 BMessage *msg;
4508 msg = new BMessage(kMsgExportAs);
4509 msg->AddInt32("as", kExportAsText);
4510@@ -233,11 +233,11 @@
4511
4512 // "View" menu
4513 menu = new BMenu("View");
4514- menu->AddItem(item = new BMenuItem("Mark Invalid Values",
4515+ menu->AddItem(item = new BMenuItem("Mark invalid values",
4516 new BMessage(kMsgMarkInvalid)));
4517 if (fSudokuView->HintFlags() & kMarkInvalid)
4518 item->SetMarked(true);
4519- menu->AddItem(item = new BMenuItem("Mark Valid Hints",
4520+ menu->AddItem(item = new BMenuItem("Mark valid hints",
4521 new BMessage(kMsgMarkValidHints)));
4522 if (fSudokuView->HintFlags() & kMarkValidHints)
4523 item->SetMarked(true);
4524@@ -253,14 +253,14 @@
4525 fRedoItem->SetEnabled(false);
4526 menu->AddSeparatorItem();
4527
4528- menu->AddItem(new BMenuItem("Snapshot Current", new BMessage(kMsgStoreState)));
4529- menu->AddItem(fRestoreStateItem = new BMenuItem("Restore Snapshot",
4530+ menu->AddItem(new BMenuItem("Snapshot current", new BMessage(kMsgStoreState)));
4531+ menu->AddItem(fRestoreStateItem = new BMenuItem("Restore snapshot",
4532 new BMessage(kMsgRestoreState)));
4533 fRestoreStateItem->SetEnabled(fStoredState != NULL);
4534 menu->AddSeparatorItem();
4535
4536 menu->AddItem(new BMenuItem("Solve", new BMessage(kMsgSolveSudoku)));
4537- menu->AddItem(new BMenuItem("Solve Single Field",
4538+ menu->AddItem(new BMenuItem("Solve single field",
4539 new BMessage(kMsgSolveSingle)));
4540 menu->SetTargetForItems(fSudokuView);
4541 menuBar->AddItem(menu);
4542@@ -386,7 +386,7 @@
4543 }
4544
4545 (new BAlert("Sudoku request",
4546- buffer, "Ok", NULL, NULL,
4547+ buffer, "OK", NULL, NULL,
4548 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
4549 }
4550 }
4551@@ -528,7 +528,7 @@
4552
4553 case kMsgSudokuSolved:
4554 (new BAlert("Sudoku request",
4555- "Sudoku solved - congratulations!", "Ok", NULL, NULL,
4556+ "Sudoku solved - congratulations!", "OK", NULL, NULL,
4557 B_WIDTH_AS_USUAL, B_IDEA_ALERT))->Go();
4558 break;
4559
4560Index: src/apps/sudoku/Sudoku.cpp
4561===================================================================
4562--- src/apps/sudoku/Sudoku.cpp (Revision 34761)
4563+++ src/apps/sudoku/Sudoku.cpp (Arbeitskopie)
4564@@ -1,5 +1,5 @@
4565 /*
4566- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4567+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4568 * Distributed under the terms of the MIT License.
4569 */
4570
4571@@ -63,7 +63,7 @@
4572 {
4573 BAlert *alert = new BAlert("about", "Sudoku\n"
4574 "\twritten by Axel Dörfler\n"
4575- "\tCopyright 2007, Haiku Inc.\n", "Ok");
4576+ "\tCopyright 2007, Haiku Inc.\n", "OK");
4577 BTextView *view = alert->TextView();
4578 BFont font;
4579
4580Index: src/apps/sudoku/ProgressWindow.cpp
4581===================================================================
4582--- src/apps/sudoku/ProgressWindow.cpp (Revision 34761)
4583+++ src/apps/sudoku/ProgressWindow.cpp (Arbeitskopie)
4584@@ -1,5 +1,5 @@
4585 /*
4586- * Copyright 2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4587+ * Copyright 2007-2009, Axel Dörfler, axeld@pinc-software.de. All rights reserved.
4588 * Distributed under the terms of the MIT License.
4589 */
4590
4591@@ -20,7 +20,7 @@
4592
4593 ProgressWindow::ProgressWindow(BWindow* referenceWindow,
4594 BMessage* abortMessage)
4595- : BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
4596+ : BWindow(BRect(0, 0, 250, 100), "Progress monitor",
4597 B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
4598 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
4599 fRunner(NULL)
4600Index: src/apps/terminal/TermWindow.cpp
4601===================================================================
4602--- src/apps/terminal/TermWindow.cpp (Revision 34761)
4603+++ src/apps/terminal/TermWindow.cpp (Arbeitskopie)
4604@@ -1,5 +1,5 @@
4605 /*
4606- * Copyright 2007 Haiku, Inc.
4607+ * Copyright 2007-2009 Haiku, Inc. All rights reserved.
4608 * Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
4609 * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
4610 * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4611@@ -253,7 +253,7 @@
4612 BMenu *
4613 TermWindow::_MakeEncodingMenu()
4614 {
4615- BMenu *menu = new (std::nothrow) BMenu("Text Encoding");
4616+ BMenu *menu = new (std::nothrow) BMenu("Text encoding");
4617 if (menu == NULL)
4618 return NULL;
4619
4620@@ -285,19 +285,19 @@
4621 fFilemenu = new BMenu("Terminal");
4622 fFilemenu->AddItem(new BMenuItem("Switch Terminals",
4623 new BMessage(MENU_SWITCH_TERM), B_TAB));
4624- fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS,
4625+ fFilemenu->AddItem(new BMenuItem("New Terminal",
4626 new BMessage(MENU_NEW_TERM), 'N'));
4627- fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T'));
4628+ fFilemenu->AddItem(new BMenuItem("New tab", new BMessage(kNewTab), 'T'));
4629
4630 fFilemenu->AddSeparatorItem();
4631- fFilemenu->AddItem(new BMenuItem("Page Setup" B_UTF8_ELLIPSIS,
4632+ fFilemenu->AddItem(new BMenuItem("Page setup" B_UTF8_ELLIPSIS,
4633 new BMessage(MENU_PAGE_SETUP)));
4634 fFilemenu->AddItem(new BMenuItem("Print", new BMessage(MENU_PRINT),'P'));
4635 fFilemenu->AddSeparatorItem();
4636 fFilemenu->AddItem(new BMenuItem("About Terminal" B_UTF8_ELLIPSIS,
4637 new BMessage(B_ABOUT_REQUESTED)));
4638 fFilemenu->AddSeparatorItem();
4639- fFilemenu->AddItem(new BMenuItem("Close Active Tab",
4640+ fFilemenu->AddItem(new BMenuItem("Close active tab",
4641 new BMessage(kCloseView), 'W', B_SHIFT_KEY));
4642 fFilemenu->AddItem(new BMenuItem("Quit",
4643 new BMessage(B_QUIT_REQUESTED), 'Q'));
4644@@ -308,18 +308,18 @@
4645 fEditmenu->AddItem(new BMenuItem("Copy", new BMessage(B_COPY),'C'));
4646 fEditmenu->AddItem(new BMenuItem("Paste", new BMessage(B_PASTE),'V'));
4647 fEditmenu->AddSeparatorItem();
4648- fEditmenu->AddItem(new BMenuItem("Select All",
4649+ fEditmenu->AddItem(new BMenuItem("Select all",
4650 new BMessage(B_SELECT_ALL), 'A'));
4651- fEditmenu->AddItem(new BMenuItem("Clear All",
4652+ fEditmenu->AddItem(new BMenuItem("Clear all",
4653 new BMessage(MENU_CLEAR_ALL), 'L'));
4654 fEditmenu->AddSeparatorItem();
4655 fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS,
4656 new BMessage(MENU_FIND_STRING),'F'));
4657- fFindPreviousMenuItem = new BMenuItem("Find Previous",
4658+ fFindPreviousMenuItem = new BMenuItem("Find previous",
4659 new BMessage(MENU_FIND_PREVIOUS), 'G', B_SHIFT_KEY);
4660 fEditmenu->AddItem(fFindPreviousMenuItem);
4661 fFindPreviousMenuItem->SetEnabled(false);
4662- fFindNextMenuItem = new BMenuItem("Find Next",
4663+ fFindNextMenuItem = new BMenuItem("Find next",
4664 new BMessage(MENU_FIND_NEXT), 'G');
4665 fEditmenu->AddItem(fFindNextMenuItem);
4666 fFindNextMenuItem->SetEnabled(false);
4667@@ -332,7 +332,7 @@
4668
4669 fEncodingmenu = _MakeEncodingMenu();
4670
4671- fSizeMenu = new BMenu("Text Size");
4672+ fSizeMenu = new BMenu("Text size");
4673
4674 fIncreaseFontSizeMenuItem = new BMenuItem("Increase",
4675 new BMessage(kIncreaseFontSize), '+', B_COMMAND_KEY);
4676@@ -347,7 +347,7 @@
4677 fHelpmenu->AddItem(fEncodingmenu);
4678 fHelpmenu->AddItem(fSizeMenu);
4679 fHelpmenu->AddSeparatorItem();
4680- fHelpmenu->AddItem(new BMenuItem("Preferences" B_UTF8_ELLIPSIS,
4681+ fHelpmenu->AddItem(new BMenuItem("Settings" B_UTF8_ELLIPSIS,
4682 new BMessage(MENU_PREF_OPEN)));
4683 fHelpmenu->AddSeparatorItem();
4684 fHelpmenu->AddItem(new BMenuItem("Save as default",
4685@@ -452,7 +452,7 @@
4686 if (fFindString.Length() == 0) {
4687 const char* errorMsg = !fFindSelection
4688 ? "No search string was entered." : "Nothing is selected.";
4689- BAlert* alert = new BAlert("Find failed", errorMsg, "Ok", NULL,
4690+ BAlert* alert = new BAlert("Find failed", errorMsg, "OK", NULL,
4691 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4692
4693 alert->Go();
4694@@ -467,7 +467,7 @@
4695 findresult = _ActiveTermView()->Find(fFindString, fForwardSearch, fMatchCase, fMatchWord);
4696
4697 if (!findresult) {
4698- BAlert *alert = new BAlert("Find failed", "Text not found.", "Ok", NULL,
4699+ BAlert *alert = new BAlert("Find failed", "Text not found.", "OK", NULL,
4700 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4701 alert->SetShortcut(0, B_ESCAPE);
4702 alert->Go();
4703@@ -488,7 +488,7 @@
4704 (message->what == MENU_FIND_NEXT) == fForwardSearch,
4705 fMatchCase, fMatchWord);
4706 if (!findresult) {
4707- BAlert *alert = new BAlert("find failed", "Not Found.", "Okay",
4708+ BAlert *alert = new BAlert("Find failed", "Not found.", "OK",
4709 NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
4710 alert->SetShortcut(0, B_ESCAPE);
4711 alert->Go();
4712@@ -976,7 +976,7 @@
4713 BMenu*
4714 TermWindow::_MakeWindowSizeMenu()
4715 {
4716- BMenu *menu = new (std::nothrow) BMenu("Window Size");
4717+ BMenu *menu = new (std::nothrow) BMenu("Window size");
4718 if (menu == NULL)
4719 return NULL;
4720
4721@@ -1000,7 +1000,7 @@
4722 }
4723
4724 menu->AddSeparatorItem();
4725- menu->AddItem(new BMenuItem("Fullscreen", new BMessage(FULLSCREEN),
4726+ menu->AddItem(new BMenuItem("Full screen", new BMessage(FULLSCREEN),
4727 B_ENTER));
4728
4729 return menu;
4730Index: src/apps/terminal/TermView.cpp
4731===================================================================
4732--- src/apps/terminal/TermView.cpp (Revision 34761)
4733+++ src/apps/terminal/TermView.cpp (Arbeitskopie)
4734@@ -1794,11 +1794,11 @@
4735 cpMessage->what = kSecondaryMouseDropAction;
4736 cpMessage->AddInt8("action", kCopyFiles);
4737
4738- BMenuItem* insertItem = new BMenuItem("Insert Path", insertMessage);
4739- BMenuItem* cdItem = new BMenuItem("Change Directory", cdMessage);
4740- BMenuItem* lnItem = new BMenuItem("Create Link Here", lnMessage);
4741- BMenuItem* mvItem = new BMenuItem("Move Here", mvMessage);
4742- BMenuItem* cpItem = new BMenuItem("Copy Here", cpMessage);
4743+ BMenuItem* insertItem = new BMenuItem("Insert path", insertMessage);
4744+ BMenuItem* cdItem = new BMenuItem("Change directory", cdMessage);
4745+ BMenuItem* lnItem = new BMenuItem("Create link here", lnMessage);
4746+ BMenuItem* mvItem = new BMenuItem("Move here", mvMessage);
4747+ BMenuItem* cpItem = new BMenuItem("Copy here", cpMessage);
4748 BMenuItem* chItem = new BMenuItem("Cancel", NULL);
4749
4750 // if the refs point to different directorys disable the cd menu item
4751@@ -2740,7 +2740,7 @@
4752 "Terminal\n\n"
4753 "written by Kazuho Okui and Takashi Murai\n"
4754 "updated by Kian Duffy and others\n\n"
4755- "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "Ok");
4756+ "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "OK");
4757 if (alert != NULL)
4758 alert->Go();
4759 }
4760Index: src/apps/terminal/PrefWindow.cpp
4761===================================================================
4762--- src/apps/terminal/PrefWindow.cpp (Revision 34761)
4763+++ src/apps/terminal/PrefWindow.cpp (Arbeitskopie)
4764@@ -1,5 +1,5 @@
4765 /*
4766- * Copyright 2007-2008, Haiku, Inc.
4767+ * Copyright 2007-2009, Haiku, Inc. All rights reserved.
4768 * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net
4769 * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
4770 * All rights reserved. Distributed under the terms of the MIT license.
4771@@ -23,7 +23,7 @@
4772
4773
4774 PrefWindow::PrefWindow(const BMessenger &messenger)
4775- : BWindow(BRect(0, 0, 375, 185), "Terminal Preferences",
4776+ : BWindow(BRect(0, 0, 375, 185), "Terminal settings",
4777 B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
4778 B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_AUTO_UPDATE_SIZE_LIMITS),
4779 fPreviousPref(new PrefHandler(PrefHandler::Default())),
4780@@ -37,7 +37,7 @@
4781 .Add(new AppearancePrefView("Appearance", fTerminalMessenger))
4782 .AddGroup(B_HORIZONTAL)
4783 .Add(fSaveAsFileButton = new BButton("savebutton",
4784- "Save to File" B_UTF8_ELLIPSIS,
4785+ "Save to file" B_UTF8_ELLIPSIS,
4786 new BMessage(MSG_SAVEAS_PRESSED), B_WILL_DRAW))
4787 .AddGlue()
4788 .Add(fRevertButton = new BButton("revertbutton",
4789@@ -79,8 +79,8 @@
4790 if (!fDirty)
4791 return true;
4792
4793- BAlert *alert = new BAlert("", "Save changes to this preference panel?",
4794- "Cancel", "Don't Save", "Save",
4795+ BAlert *alert = new BAlert("", "Save changes to this settings panel?",
4796+ "Cancel", "Don't save", "Save",
4797 B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
4798 B_WARNING_ALERT);
4799 alert->SetShortcut(0, B_ESCAPE);
4800Index: src/apps/terminal/Shell.cpp
4801===================================================================
4802--- src/apps/terminal/Shell.cpp (Revision 34761)
4803+++ src/apps/terminal/Shell.cpp (Arbeitskopie)
4804@@ -1,5 +1,5 @@
4805 /*
4806- * Copyright 2007 Haiku, inc.
4807+ * Copyright 2007-2009 Haiku, Inc. All rights reserved.
4808 * Copyright (c) 2003-4 Kian Duffy <myob@users.sourceforge.net>
4809 * Copyright (c) 2004 Daniel Furrer <assimil8or@users.sourceforge.net>
4810 * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4811@@ -504,7 +504,7 @@
4812 const char *spawnAlertMessage = "alert --stop "
4813 "'Cannot execute \"%s\":\n"
4814 "\t%s' "
4815- "'Use Default Shell' 'Abort'";
4816+ "'Use default shell' 'Abort'";
4817 char errorMessage[256];
4818 snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, argv[0], strerror(errno));
4819
4820Index: src/apps/terminal/SmartTabView.cpp
4821===================================================================
4822--- src/apps/terminal/SmartTabView.cpp (Revision 34761)
4823+++ src/apps/terminal/SmartTabView.cpp (Arbeitskopie)
4824@@ -76,7 +76,7 @@
4825 message->AddInt32("index", tabIndex);
4826
4827 BPopUpMenu* popUpMenu = new BPopUpMenu("tab menu");
4828- popUpMenu->AddItem(new BMenuItem("Close Tab", message));
4829+ popUpMenu->AddItem(new BMenuItem("Close tab", message));
4830 popUpMenu->SetAsyncAutoDestruct(true);
4831 popUpMenu->SetTargetForItems(BMessenger(this));
4832 popUpMenu->Go(ConvertToScreen(point), true, true, true);
4833Index: src/apps/terminal/FindWindow.cpp
4834===================================================================
4835--- src/apps/terminal/FindWindow.cpp (Revision 34761)
4836+++ src/apps/terminal/FindWindow.cpp (Arbeitskopie)
4837@@ -1,5 +1,5 @@
4838 /*
4839- * Copyright 2007, Haiku, Inc.
4840+ * Copyright 2007-2009, Haiku, Inc. All rights reserved.
4841 * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net
4842 * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai.
4843 * All rights reserved. Distributed under the terms of the MIT license.
4844@@ -39,18 +39,18 @@
4845
4846 BView *layoutView = BGroupLayoutBuilder(B_VERTICAL, 10)
4847 .SetInsets(5, 5, 5, 5)
4848- .Add(fTextRadio = new BRadioButton("fTextRadio", "Use Text: ",
4849+ .Add(fTextRadio = new BRadioButton("fTextRadio", "Use text: ",
4850 NULL))
4851 .Add(fFindLabel = new BTextControl("fFindLabel", "", "", NULL))
4852 .Add(fSelectionRadio = new BRadioButton("fSelectionRadio",
4853- "Use Selection", NULL))
4854+ "Use selection", NULL))
4855 .Add(separator)
4856 .Add(fForwardSearchBox = new BCheckBox("fForwardSearchBox",
4857- "Search Forward", NULL))
4858+ "Search forward", NULL))
4859 .Add(fMatchCaseBox = new BCheckBox("fMatchCaseBox",
4860- "Match Case", NULL))
4861+ "Match case", NULL))
4862 .Add(fMatchWordBox = new BCheckBox("fMatchWordBox",
4863- "Match Word", NULL))
4864+ "Match word", NULL))
4865 .Add(fFindButton = new BButton("fFindButton", "Find",
4866 new BMessage(MSG_FIND)))
4867 .End();
4868Index: src/apps/terminal/TermApp.cpp
4869===================================================================
4870--- src/apps/terminal/TermApp.cpp (Revision 34761)
4871+++ src/apps/terminal/TermApp.cpp (Arbeitskopie)
4872@@ -1,5 +1,5 @@
4873 /*
4874- * Copyright 2001-2008, Haiku.
4875+ * Copyright 2001-2009, Haiku.
4876 * Copyright (c) 2003-2004 Kian Duffy <myob@users.sourceforge.net>
4877 * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai.
4878 *
4879@@ -114,7 +114,7 @@
4880 // TODO: This alert does never show up.
4881 if (status < B_OK) {
4882 (new BAlert("alert", "Terminal couldn't start the shell. Sorry.",
4883- "ok", NULL, NULL, B_WIDTH_FROM_LABEL,
4884+ "OK", NULL, NULL, B_WIDTH_FROM_LABEL,
4885 B_INFO_ALERT))->Go(NULL);
4886 PostMessage(B_QUIT_REQUESTED);
4887 return;
4888Index: src/apps/terminal/TermConst.h
4889===================================================================
4890--- src/apps/terminal/TermConst.h (Revision 34761)
4891+++ src/apps/terminal/TermConst.h (Arbeitskopie)
4892@@ -100,34 +100,34 @@
4893
4894 const char* const PREF_TEXT_FORE_COLOR = "Text";
4895 const char* const PREF_TEXT_BACK_COLOR = "Background";
4896-const char* const PREF_SELECT_FORE_COLOR = "Selected Text";
4897-const char* const PREF_SELECT_BACK_COLOR = "Selected Background";
4898-const char* const PREF_CURSOR_FORE_COLOR = "Cursor Text";
4899-const char* const PREF_CURSOR_BACK_COLOR = "Cursor Background";
4900+const char* const PREF_SELECT_FORE_COLOR = "Selected text";
4901+const char* const PREF_SELECT_BACK_COLOR = "Selected background";
4902+const char* const PREF_CURSOR_FORE_COLOR = "Cursor text";
4903+const char* const PREF_CURSOR_BACK_COLOR = "Cursor background";
4904
4905-const char* const PREF_IM_FORE_COLOR = "IM Foreground Color";
4906-const char* const PREF_IM_BACK_COLOR = "IM Background Color";
4907-const char* const PREF_IM_SELECT_COLOR = "IM Selection Color";
4908+const char* const PREF_IM_FORE_COLOR = "IM foreground color";
4909+const char* const PREF_IM_BACK_COLOR = "IM background color";
4910+const char* const PREF_IM_SELECT_COLOR = "IM selection color";
4911
4912-const char* const PREF_ANSI_BLACK_COLOR = "ANSI Black Color";
4913-const char* const PREF_ANSI_RED_COLOR = "ANSI Red Color";
4914-const char* const PREF_ANSI_GREEN_COLOR = "ANSI Green Color";
4915-const char* const PREF_ANSI_YELLOW_COLOR = "ANSI Yellow Color";
4916-const char* const PREF_ANSI_BLUE_COLOR = "ANSI Blue Color";
4917-const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI Magenta Color";
4918-const char* const PREF_ANSI_CYAN_COLOR = "ANSI Cyan Color";
4919-const char* const PREF_ANSI_WHITE_COLOR = "ANSI White Color";
4920+const char* const PREF_ANSI_BLACK_COLOR = "ANSI black color";
4921+const char* const PREF_ANSI_RED_COLOR = "ANSI red color";
4922+const char* const PREF_ANSI_GREEN_COLOR = "ANSI green color";
4923+const char* const PREF_ANSI_YELLOW_COLOR = "ANSI yellow color";
4924+const char* const PREF_ANSI_BLUE_COLOR = "ANSI blue color";
4925+const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI magenta color";
4926+const char* const PREF_ANSI_CYAN_COLOR = "ANSI cyan color";
4927+const char* const PREF_ANSI_WHITE_COLOR = "ANSI white color";
4928
4929-const char* const PREF_HISTORY_SIZE = "History Size";
4930-const char* const PREF_CURSOR_BLINKING = "Cursor Blinking Rate";
4931+const char* const PREF_HISTORY_SIZE = "History size";
4932+const char* const PREF_CURSOR_BLINKING = "Cursor blinking rate";
4933
4934-const char* const PREF_IM_AWARE = "Input Method Aware";
4935+const char* const PREF_IM_AWARE = "Input method aware";
4936
4937 const char* const PREF_COLS = "Cols";
4938 const char* const PREF_ROWS = "Rows";
4939 const char* const PREF_SHELL = "Shell";
4940
4941-const char* const PREF_TEXT_ENCODING = "Text Encoding";
4942+const char* const PREF_TEXT_ENCODING = "Text encoding";
4943 const char* const PREF_GUI_LANGUAGE = "Language";
4944
4945 // Color type
4946Index: src/apps/soundrecorder/SoundListView.cpp
4947===================================================================
4948--- src/apps/soundrecorder/SoundListView.cpp (Revision 34761)
4949+++ src/apps/soundrecorder/SoundListView.cpp (Arbeitskopie)
4950@@ -1,5 +1,5 @@
4951 /*
4952- * Copyright 2005, Jérôme Duval. All rights reserved.
4953+ * Copyright 2005-2009, Jérôme Duval. All rights reserved.
4954 * Distributed under the terms of the MIT License.
4955 *
4956 * Inspired by SoundCapture from Be newsletter (Media Kit Basics: Consumers and Producers)
4957@@ -36,12 +36,12 @@
4958 SetFont(&font);
4959 font_height height;
4960 font.GetHeight(&height);
4961- float width = font.StringWidth("Drop Files Here");
4962+ float width = font.StringWidth("Drop files here");
4963
4964 BPoint pt;
4965 pt.x = (Bounds().Width() - width) / 2;
4966 pt.y = (Bounds().Height() + height.ascent + height.descent)/ 2;
4967- DrawString("Drop Files Here", pt);
4968+ DrawString("Drop files here", pt);
4969 }
4970 BListView::Draw(updateRect);
4971 }
4972Index: src/apps/soundrecorder/RecorderWindow.cpp
4973===================================================================
4974--- src/apps/soundrecorder/RecorderWindow.cpp (Revision 34761)
4975+++ src/apps/soundrecorder/RecorderWindow.cpp (Arbeitskopie)
4976@@ -1,5 +1,5 @@
4977 /*
4978- * Copyright 2005, Jérôme Duval. All rights reserved.
4979+ * Copyright 2005-2009, Jérôme Duval. All rights reserved.
4980 * Distributed under the terms of the MIT License.
4981 *
4982 * Inspired by SoundCapture from Be newsletter (Media Kit Basics:
4983@@ -379,14 +379,14 @@
4984 r.InsetBy(10, 8);
4985 r.top -= 1;
4986 fFileInfoBox = new BBox(r, "fileinfo", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
4987- fFileInfoBox->SetLabel("File Info");
4988+ fFileInfoBox->SetLabel("File info");
4989
4990 r = fFileInfoBox->Bounds();
4991 r.left = 8;
4992 r.top = 13;
4993 r.bottom = r.top + 15;
4994 r.right -= 10;
4995- fFilename = new BStringView(r, "filename", "File Name:");
4996+ fFilename = new BStringView(r, "filename", "File name:");
4997 fFileInfoBox->AddChild(fFilename);
4998 r.top += 13;
4999 r.bottom = r.top + 15;
5000@@ -402,11 +402,11 @@
5001 fFileInfoBox->AddChild(fChannels);
5002 r.top += 13;
5003 r.bottom = r.top + 15;
5004- fSampleSize = new BStringView(r, "samplesize", "Sample Size:");
5005+ fSampleSize = new BStringView(r, "samplesize", "Sample size:");
5006 fFileInfoBox->AddChild(fSampleSize);
5007 r.top += 13;
5008 r.bottom = r.top + 15;
5009- fSampleRate = new BStringView(r, "samplerate", "Sample Rate:");
5010+ fSampleRate = new BStringView(r, "samplerate", "Sample rate:");
5011 fFileInfoBox->AddChild(fSampleRate);
5012 r.top += 13;
5013 r.bottom = r.top + 15;
5014@@ -429,7 +429,7 @@
5015 WINDOW((stderr, "dropped %ld inputs\n", real_count - max_input_count));
5016 real_count = max_input_count;
5017 }
5018- char selected_name[B_MEDIA_NAME_LENGTH] = "Default Input";
5019+ char selected_name[B_MEDIA_NAME_LENGTH] = "Default input";
5020 BMessage * msg;
5021 BMenuItem * item;
5022 for (int i = 0; i < real_count; i++) {
5023@@ -1093,7 +1093,7 @@
5024 if (!updateDisplay)
5025 return B_OK;
5026
5027- BString filename = "File Name: ";
5028+ BString filename = "File name: ";
5029 filename << ref.name;
5030 fFilename->SetText(filename.String());
5031
5032@@ -1111,9 +1111,9 @@
5033 }
5034 BString channels = "Channels: ";
5035 channels << fPlayFormat.u.raw_audio.channel_count;
5036- BString samplesize = "Sample Size: ";
5037+ BString samplesize = "Sample size: ";
5038 samplesize << 8 * (fPlayFormat.u.raw_audio.format & 0xf) << " bits";
5039- BString samplerate = "Sample Rate: ";
5040+ BString samplerate = "Sample rate: ";
5041 samplerate << (int)fPlayFormat.u.raw_audio.frame_rate;
5042 BString durationString = "Duration: ";
5043 bigtime_t duration = fPlayTrack->Duration();
5044@@ -1302,7 +1302,7 @@
5045 }
5046
5047 if (countBad > 0 && countGood == 0)
5048- (new BAlert("Nothing to Play", "None of the files appear to be "
5049+ (new BAlert("Nothing to play", "None of the files appear to be "
5050 "audio files", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
5051 else if (countGood > 0) {
5052 if (countBad > 0)
5053Index: src/apps/gradients/GradientsWindow.cpp
5054===================================================================
5055--- src/apps/gradients/GradientsWindow.cpp (Revision 34761)
5056+++ src/apps/gradients/GradientsWindow.cpp (Arbeitskopie)
5057@@ -18,7 +18,7 @@
5058 fGradientsMenu = new BPopUpMenu("gradientsType");
5059 fLinearItem = new BMenuItem("Linear", new BMessage(MSG_LINEAR));
5060 fRadialItem = new BMenuItem("Radial", new BMessage(MSG_RADIAL));
5061- fRadialFocusItem = new BMenuItem("Radial Focus",
5062+ fRadialFocusItem = new BMenuItem("Radial focus",
5063 new BMessage(MSG_RADIAL_FOCUS));
5064
5065 fDiamondItem = new BMenuItem("Diamond", new BMessage(MSG_DIAMOND));
5066Index: src/apps/mail/Signature.cpp
5067===================================================================
5068--- src/apps/mail/Signature.cpp (Revision 34761)
5069+++ src/apps/mail/Signature.cpp (Arbeitskopie)
5070@@ -4,6 +4,7 @@
5071 Terms and Conditions
5072
5073 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5074+Copyright (c) 2009, Haiku, Inc.
5075
5076 Permission is hereby granted, free of charge, to any person obtaining a copy of
5077 this software and associated documentation files (the "Software"), to deal in
5078@@ -92,7 +93,7 @@
5079 menu->AddItem(fPaste = new BMenuItem(MDR_DIALECT_CHOICE ("Paste","V) 貼り付け"), new BMessage(B_PASTE), 'V'));
5080 fPaste->SetTarget(NULL, this);
5081 menu->AddSeparatorItem();
5082- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select All","A) 全文選択"), new BMessage(M_SELECT), 'A'));
5083+ menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select all","A) 全文選択"), new BMessage(M_SELECT), 'A'));
5084 item->SetTarget(NULL, this);
5085 menu_bar->AddItem(menu);
5086
5087@@ -285,7 +286,7 @@
5088 beep();
5089 BAlert *alert = new BAlert("",
5090 MDR_DIALECT_CHOICE ("Save changes to this signature?","変更した署名を保存しますか?"),
5091- MDR_DIALECT_CHOICE ("Don't Save","保存しない"),
5092+ MDR_DIALECT_CHOICE ("Don't save","保存しない"),
5093 MDR_DIALECT_CHOICE ("Cancel","中止"),
5094 MDR_DIALECT_CHOICE ("Save","保存する"),
5095 B_WIDTH_AS_USUAL, B_WARNING_ALERT);
5096Index: src/apps/mail/Enclosures.h
5097===================================================================
5098--- src/apps/mail/Enclosures.h (Revision 34761)
5099+++ src/apps/mail/Enclosures.h (Arbeitskopie)
5100@@ -4,6 +4,7 @@
5101 Terms and Conditions
5102
5103 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5104+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5105
5106 Permission is hereby granted, free of charge, to any person obtaining a copy of
5107 this software and associated documentation files (the "Software"), to deal in
5108@@ -56,7 +57,7 @@
5109
5110 #define ENCLOSURES_HEIGHT 65
5111
5112-#define ENCLOSE_TEXT "Enclosures:"
5113+#define ENCLOSE_TEXT "Attachments:"
5114 #define ENCLOSE_TEXT_H 7
5115 #define ENCLOSE_TEXT_V 3
5116 #define ENCLOSE_FIELD_V 3
5117Index: src/apps/mail/MailWindow.cpp
5118===================================================================
5119--- src/apps/mail/MailWindow.cpp (Revision 34761)
5120+++ src/apps/mail/MailWindow.cpp (Arbeitskopie)
5121@@ -4,6 +4,7 @@
5122 Terms and Conditions
5123
5124 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5125+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5126
5127 Permission is hereby granted, free of charge, to any person obtaining a copy of
5128 this software and associated documentation files (the "Software"), to deal in
5129@@ -91,29 +92,29 @@
5130
5131 const char *kUndoStrings[] = {
5132 MDR_DIALECT_CHOICE ("Undo","Z) 取り消し"),
5133- MDR_DIALECT_CHOICE ("Undo Typing","Z) 取り消し(入力)"),
5134- MDR_DIALECT_CHOICE ("Undo Cut","Z) 取り消し(切り取り)"),
5135- MDR_DIALECT_CHOICE ("Undo Paste","Z) 取り消し(貼り付け)"),
5136- MDR_DIALECT_CHOICE ("Undo Clear","Z) 取り消し(消去)"),
5137- MDR_DIALECT_CHOICE ("Undo Drop","Z) 取り消し(ドロップ)")
5138+ MDR_DIALECT_CHOICE ("Undo typing","Z) 取り消し(入力)"),
5139+ MDR_DIALECT_CHOICE ("Undo cut","Z) 取り消し(切り取り)"),
5140+ MDR_DIALECT_CHOICE ("Undo paste","Z) 取り消し(貼り付け)"),
5141+ MDR_DIALECT_CHOICE ("Undo clear","Z) 取り消し(消去)"),
5142+ MDR_DIALECT_CHOICE ("Undo drop","Z) 取り消し(ドロップ)")
5143 };
5144
5145 const char *kRedoStrings[] = {
5146 MDR_DIALECT_CHOICE ("Redo", "Z) やり直し"),
5147- MDR_DIALECT_CHOICE ("Redo Typing", "Z) やり直し(入力)"),
5148- MDR_DIALECT_CHOICE ("Redo Cut", "Z) やり直し(切り取り)"),
5149- MDR_DIALECT_CHOICE ("Redo Paste", "Z) やり直し(貼り付け)"),
5150- MDR_DIALECT_CHOICE ("Redo Clear", "Z) やり直し(消去)"),
5151- MDR_DIALECT_CHOICE ("Redo Drop", "Z) やり直し(ドロップ)")
5152+ MDR_DIALECT_CHOICE ("Redo typing", "Z) やり直し(入力)"),
5153+ MDR_DIALECT_CHOICE ("Redo cut", "Z) やり直し(切り取り)"),
5154+ MDR_DIALECT_CHOICE ("Redo paste", "Z) やり直し(貼り付け)"),
5155+ MDR_DIALECT_CHOICE ("Redo clear", "Z) やり直し(消去)"),
5156+ MDR_DIALECT_CHOICE ("Redo drop", "Z) やり直し(ドロップ)")
5157 };
5158
5159
5160 // Text for both the main menu and the pop-up menu.
5161 static const char *kSpamMenuItemTextArray[] = {
5162- "Mark as Spam and Move to Trash", // M_TRAIN_SPAM_AND_DELETE
5163- "Mark as Spam", // M_TRAIN_SPAM
5164- "Unmark this Message", // M_UNTRAIN
5165- "Mark as Genuine" // M_TRAIN_GENUINE
5166+ "Mark as spam and move to trash", // M_TRAIN_SPAM_AND_DELETE
5167+ "Mark as spam", // M_TRAIN_SPAM
5168+ "Unmark this message", // M_UNTRAIN
5169+ "Mark as genuine" // M_TRAIN_GENUINE
5170 };
5171
5172 static const uint32 kMsgQuitAndKeepAllStatus = 'Casm';
5173@@ -200,7 +201,7 @@
5174 msg = new BMessage(M_NEW);
5175 msg->AddInt32("type", M_NEW);
5176 menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE (
5177- "New Mail Message", "N) 新規メッセージ作成"), msg, 'N'));
5178+ "New mail message", "N) 新規メッセージ作成"), msg, 'N'));
5179 item->SetTarget(be_app);
5180
5181 // Cheap hack - only show the drafts menu when composing messages. Insert
5182@@ -216,7 +217,7 @@
5183
5184 if (!fIncoming) {
5185 QueryMenu *queryMenu;
5186- queryMenu = new QueryMenu(MDR_DIALECT_CHOICE ("Open Draft", "O) ドラフトを開く"), false);
5187+ queryMenu = new QueryMenu(MDR_DIALECT_CHOICE ("Open draft", "O) ドラフトを開く"), false);
5188 queryMenu->SetTargetForItems(be_app);
5189
5190 queryMenu->SetPredicate("MAIL:draft==1");
5191@@ -225,7 +226,7 @@
5192
5193 if (!fIncoming || resending) {
5194 menu->AddItem(fSendLater = new BMenuItem(
5195- MDR_DIALECT_CHOICE ("Save as Draft", "S)ドラフトとして保存"),
5196+ MDR_DIALECT_CHOICE ("Save as draft", "S)ドラフトとして保存"),
5197 new BMessage(M_SAVE_AS_DRAFT), 'S'));
5198 }
5199
5200@@ -259,7 +260,7 @@
5201 AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(M_CLOSE_SAME));
5202 }
5203
5204- subMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Move to Trash",
5205+ subMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Move to trash",
5206 "T) 削除"), new BMessage(M_DELETE), 'T', B_CONTROL_KEY));
5207 AddShortcut('T', B_SHIFT_KEY | B_COMMAND_KEY, new BMessage(M_DELETE_NEXT));
5208
5209@@ -290,7 +291,7 @@
5210
5211 menu->AddSeparatorItem();
5212 menu->AddItem(fPrint = new BMenuItem(
5213- MDR_DIALECT_CHOICE ("Page Setup", "G) ページ設定") B_UTF8_ELLIPSIS,
5214+ MDR_DIALECT_CHOICE ("Page setup", "G) ページ設定") B_UTF8_ELLIPSIS,
5215 new BMessage(M_PRINT_SETUP)));
5216 menu->AddItem(fPrint = new BMenuItem(
5217 MDR_DIALECT_CHOICE ("Print", "P) 印刷") B_UTF8_ELLIPSIS,
5218@@ -324,22 +325,22 @@
5219 menu->AddItem(fPaste = new BMenuItem(MDR_DIALECT_CHOICE ("Paste","V) 貼り付け"), new BMessage(B_PASTE), 'V'));
5220 fPaste->SetTarget(NULL, this);
5221 menu->AddSeparatorItem();
5222- menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select All", "A) 全文選択"), new BMessage(M_SELECT), 'A'));
5223+ menu->AddItem(item = new BMenuItem(MDR_DIALECT_CHOICE ("Select all", "A) 全文選択"), new BMessage(M_SELECT), 'A'));
5224 menu->AddSeparatorItem();
5225 item->SetTarget(NULL, this);
5226 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find", "F) 検索") B_UTF8_ELLIPSIS, new BMessage(M_FIND), 'F'));
5227- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find Again", "G) 次を検索"), new BMessage(M_FIND_AGAIN), 'G'));
5228+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Find again", "G) 次を検索"), new BMessage(M_FIND_AGAIN), 'G'));
5229 if (!fIncoming) {
5230 menu->AddSeparatorItem();
5231 menu->AddItem(fQuote =new BMenuItem(
5232 MDR_DIALECT_CHOICE ("Quote","Q) 引用符をつける"),
5233 new BMessage(M_QUOTE), B_RIGHT_ARROW));
5234 menu->AddItem(fRemoveQuote = new BMenuItem(
5235- MDR_DIALECT_CHOICE ("Remove Quote","R) 引用符を削除"),
5236+ MDR_DIALECT_CHOICE ("Remove quote","R) 引用符を削除"),
5237 new BMessage(M_REMOVE_QUOTE), B_LEFT_ARROW));
5238 menu->AddSeparatorItem();
5239 fSpelling = new BMenuItem(
5240- MDR_DIALECT_CHOICE ("Check Spelling","H) スペルチェック"),
5241+ MDR_DIALECT_CHOICE ("Check spelling","H) スペルチェック"),
5242 new BMessage( M_CHECK_SPELLING ), ';' );
5243 menu->AddItem(fSpelling);
5244 if (fApp->StartWithSpellCheckOn())
5245@@ -347,7 +348,7 @@
5246 }
5247 menu->AddSeparatorItem();
5248 menu->AddItem(item = new BMenuItem(
5249- MDR_DIALECT_CHOICE ("Preferences","P) Mailの設定") B_UTF8_ELLIPSIS,
5250+ MDR_DIALECT_CHOICE ("Settings","P) Mailの設定") B_UTF8_ELLIPSIS,
5251 new BMessage(M_PREFS),','));
5252 item->SetTarget(be_app);
5253 fMenuBar->AddItem(menu);
5254@@ -360,8 +361,8 @@
5255
5256 if (!resending && fIncoming) {
5257 menu = new BMenu("View");
5258- menu->AddItem(fHeader = new BMenuItem(MDR_DIALECT_CHOICE ("Show Header","H) ヘッダーを表示"), new BMessage(M_HEADER), 'H'));
5259- menu->AddItem(fRaw = new BMenuItem(MDR_DIALECT_CHOICE ("Show Raw Message"," メッセージを生で表示"), new BMessage(M_RAW)));
5260+ menu->AddItem(fHeader = new BMenuItem(MDR_DIALECT_CHOICE ("Show header","H) ヘッダーを表示"), new BMessage(M_HEADER), 'H'));
5261+ menu->AddItem(fRaw = new BMenuItem(MDR_DIALECT_CHOICE ("Show raw message"," メッセージを生で表示"), new BMessage(M_RAW)));
5262 fMenuBar->AddItem(menu);
5263 }
5264
5265@@ -372,29 +373,29 @@
5266 if (!resending && fIncoming) {
5267 BMenuItem *menuItem;
5268 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply","R) 返信"), new BMessage(M_REPLY),'R'));
5269- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to Sender","S) 送信者に返信"), new BMessage(M_REPLY_TO_SENDER),'R',B_OPTION_KEY));
5270- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to All","P) 全員に返信"), new BMessage(M_REPLY_ALL), 'R', B_SHIFT_KEY));
5271+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to sender","S) 送信者に返信"), new BMessage(M_REPLY_TO_SENDER),'R',B_OPTION_KEY));
5272+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to all","P) 全員に返信"), new BMessage(M_REPLY_ALL), 'R', B_SHIFT_KEY));
5273
5274 menu->AddSeparatorItem();
5275
5276 menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward","J) 転送"), new BMessage(M_FORWARD), 'J'));
5277- menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward without Attachments","The opposite: F) 添付ファイルを含めて転送"), new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5278+ menu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Forward without attachments","The opposite: F) 添付ファイルを含めて転送"), new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5279 menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Resend"," 再送信"), new BMessage(M_RESEND)));
5280- menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Copy to New","D) 新規メッセージへコピー"), new BMessage(M_COPY_TO_NEW), 'D'));
5281+ menu->AddItem(menuItem = new BMenuItem(MDR_DIALECT_CHOICE ("Copy to new","D) 新規メッセージへコピー"), new BMessage(M_COPY_TO_NEW), 'D'));
5282
5283 menu->AddSeparatorItem();
5284- fDeleteNext = new BMenuItem(MDR_DIALECT_CHOICE ("Move to Trash","T) 削除"), new BMessage(M_DELETE_NEXT), 'T');
5285+ fDeleteNext = new BMenuItem(MDR_DIALECT_CHOICE ("Move to trash","T) 削除"), new BMessage(M_DELETE_NEXT), 'T');
5286 menu->AddItem(fDeleteNext);
5287 menu->AddSeparatorItem();
5288
5289- fPrevMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Previous Message","B) 前のメッセージ"), new BMessage(M_PREVMSG),
5290+ fPrevMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Previous message","B) 前のメッセージ"), new BMessage(M_PREVMSG),
5291 B_UP_ARROW);
5292 menu->AddItem(fPrevMsg);
5293- fNextMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Next Message","N) 次のメッセージ"), new BMessage(M_NEXTMSG),
5294+ fNextMsg = new BMenuItem(MDR_DIALECT_CHOICE ("Next message","N) 次のメッセージ"), new BMessage(M_NEXTMSG),
5295 B_DOWN_ARROW);
5296 menu->AddItem(fNextMsg);
5297 menu->AddSeparatorItem();
5298- fSaveAddrMenu = subMenu = new BMenu(MDR_DIALECT_CHOICE ("Save Address", " アドレスを保存"));
5299+ fSaveAddrMenu = subMenu = new BMenu(MDR_DIALECT_CHOICE ("Save address", " アドレスを保存"));
5300
5301 // create the list of addresses
5302
5303@@ -436,36 +437,36 @@
5304
5305 if (fApp->ShowSpamGUI()) {
5306 menu = new BMenu("Spam Filtering");
5307- menu->AddItem(new BMenuItem("Mark as Spam and Move to Trash",
5308+ menu->AddItem(new BMenuItem("Mark as Spam and move to trash",
5309 new BMessage(M_TRAIN_SPAM_AND_DELETE), 'K'));
5310 menu->AddItem(new BMenuItem("Mark as Spam",
5311 new BMessage(M_TRAIN_SPAM), 'K', B_OPTION_KEY));
5312 menu->AddSeparatorItem();
5313- menu->AddItem(new BMenuItem("Unmark this Message",
5314+ menu->AddItem(new BMenuItem("Unmark this message",
5315 new BMessage(M_UNTRAIN)));
5316 menu->AddSeparatorItem();
5317- menu->AddItem(new BMenuItem("Mark as Genuine",
5318+ menu->AddItem(new BMenuItem("Mark as genuine",
5319 new BMessage(M_TRAIN_GENUINE), 'K', B_SHIFT_KEY));
5320 fMenuBar->AddItem(menu);
5321 }
5322 } else {
5323 menu->AddItem(fSendNow = new BMenuItem(
5324- MDR_DIALECT_CHOICE ("Send Message", "M) メッセージを送信"),
5325+ MDR_DIALECT_CHOICE ("Send message", "M) メッセージを送信"),
5326 new BMessage(M_SEND_NOW), 'M'));
5327
5328 if (!fIncoming) {
5329 menu->AddSeparatorItem();
5330 fSignature = new TMenu(
5331- MDR_DIALECT_CHOICE ("Add Signature", "D) 署名を追加"),
5332+ MDR_DIALECT_CHOICE ("Add signature", "D) 署名を追加"),
5333 INDEX_SIGNATURE, M_SIGNATURE);
5334 menu->AddItem(new BMenuItem(fSignature));
5335 menu->AddItem(item = new BMenuItem(
5336- MDR_DIALECT_CHOICE ("Edit Signatures","S) 署名の編集") B_UTF8_ELLIPSIS,
5337+ MDR_DIALECT_CHOICE ("Edit signatures","S) 署名の編集") B_UTF8_ELLIPSIS,
5338 new BMessage(M_EDIT_SIGNATURE)));
5339 item->SetTarget(be_app);
5340 menu->AddSeparatorItem();
5341- menu->AddItem(fAdd = new BMenuItem(MDR_DIALECT_CHOICE ("Add Enclosure","E) 追加")B_UTF8_ELLIPSIS, new BMessage(M_ADD), 'E'));
5342- menu->AddItem(fRemove = new BMenuItem(MDR_DIALECT_CHOICE ("Remove Enclosure","T) 削除"), new BMessage(M_REMOVE), 'T'));
5343+ menu->AddItem(fAdd = new BMenuItem(MDR_DIALECT_CHOICE ("Add attachment","E) 追加")B_UTF8_ELLIPSIS, new BMessage(M_ADD), 'E'));
5344+ menu->AddItem(fRemove = new BMenuItem(MDR_DIALECT_CHOICE ("Remove attachment","T) 削除"), new BMessage(M_REMOVE), 'T'));
5345 }
5346 fMenuBar->AddItem(menu);
5347 }
5348@@ -998,7 +999,7 @@
5349 uint32 buttons;
5350 if (msg->FindInt32("buttons", (int32 *)&buttons) == B_OK
5351 && buttons == B_SECONDARY_MOUSE_BUTTON) {
5352- BPopUpMenu menu("Spam Actions", false, false);
5353+ BPopUpMenu menu("Spam actions", false, false);
5354 for (int i = 0; i < 4; i++)
5355 menu.AddItem(new BMenuItem(kSpamMenuItemTextArray[i], new BMessage(M_TRAIN_SPAM_AND_DELETE + i)));
5356
5357@@ -1035,10 +1036,10 @@
5358 uint32 buttons;
5359 if (msg->FindInt32("buttons", (int32 *)&buttons) == B_OK
5360 && buttons == B_SECONDARY_MOUSE_BUTTON) {
5361- BPopUpMenu menu("Reply To", false, false);
5362+ BPopUpMenu menu("Reply to", false, false);
5363 menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply","R) 返信"),new BMessage(M_REPLY)));
5364- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to Sender","S) 送信者に返信"),new BMessage(M_REPLY_TO_SENDER)));
5365- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to All","P) 全員に返信"),new BMessage(M_REPLY_ALL)));
5366+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to sender","S) 送信者に返信"),new BMessage(M_REPLY_TO_SENDER)));
5367+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Reply to all","P) 全員に返信"),new BMessage(M_REPLY_ALL)));
5368
5369 BPoint where;
5370 msg->FindPoint("where", &where);
5371@@ -1061,7 +1062,7 @@
5372 BPopUpMenu menu("Forward", false, false);
5373 menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward", "J) 転送"),
5374 new BMessage(M_FORWARD)));
5375- menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward without Attachments",
5376+ menu.AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Forward without attachments",
5377 "The opposite: F) 添付ファイルを含む転送"),
5378 new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS)));
5379
5380@@ -1364,7 +1365,7 @@
5381 {
5382 TMenu *menu;
5383 BMenuItem *item;
5384- menu = new TMenu( "Add Signature", INDEX_SIGNATURE, M_SIGNATURE, true );
5385+ menu = new TMenu( "Add signature", INDEX_SIGNATURE, M_SIGNATURE, true );
5386
5387 BPoint where;
5388 bool open_anyway = true;
5389@@ -1541,7 +1542,7 @@
5390 BAlert* alert = new BAlert("helpful message",
5391 "Put your favorite e-mail queries and query "
5392 "templates in this folder.",
5393- "Ok", NULL, NULL, B_WIDTH_AS_USUAL, B_IDEA_ALERT);
5394+ "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_IDEA_ALERT);
5395 alert->Go(NULL);
5396 }
5397
5398@@ -1634,7 +1635,7 @@
5399 MDR_DIALECT_CHOICE (
5400 "Do you wish to save this message as a draft before closing?",
5401 "閉じる前に保存しますか?"),
5402- MDR_DIALECT_CHOICE ("Don't Save","保存しない"),
5403+ MDR_DIALECT_CHOICE ("Don't save","保存しない"),
5404 MDR_DIALECT_CHOICE ("Cancel","中止"),
5405 MDR_DIALECT_CHOICE ("Save","保存"),
5406 B_WIDTH_AS_USUAL, B_OFFSET_SPACING,
5407@@ -2004,7 +2005,7 @@
5408 void
5409 TMailWindow::Reply(entry_ref *ref, TMailWindow *window, uint32 type)
5410 {
5411- const char *notImplementedString = "<Not Yet Implemented>";
5412+ const char *notImplementedString = "<Not yet implemented>";
5413
5414 fRepliedMail = *ref;
5415 SetOriginatingWindow(window);
5416@@ -2420,8 +2421,8 @@
5417 "The message is queued and will be sent when the mail_daemon is started.",
5418 "mail_daemon が開始されていません "
5419 "このメッセージは処理待ちとなり、mail_daemon 開始後に処理されます"),
5420- MDR_DIALECT_CHOICE ("Start Now","ただちに開始する"),
5421- MDR_DIALECT_CHOICE ("Ok","了解")))->Go();
5422+ MDR_DIALECT_CHOICE ("Start now","ただちに開始する"),
5423+ MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5424
5425 if (start == 0) {
5426 result = be_roster->Launch("application/x-vnd.Be-POST");
5427@@ -2453,7 +2454,7 @@
5428
5429 if (result != B_NO_ERROR && result != B_MAIL_NO_DAEMON) {
5430 beep();
5431- (new BAlert("", errorMessage, "Ok"))->Go();
5432+ (new BAlert("", errorMessage, "OK"))->Go();
5433 }
5434 if (close)
5435 PostMessage(B_QUIT_REQUESTED);
5436@@ -2956,7 +2957,7 @@
5437 delete item;
5438 }
5439
5440- fQueryMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Edit Queries" B_UTF8_ELLIPSIS,"???" B_UTF8_ELLIPSIS),
5441+ fQueryMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Edit queries" B_UTF8_ELLIPSIS,"???" B_UTF8_ELLIPSIS),
5442 new BMessage(M_EDIT_QUERIES), 'E', B_SHIFT_KEY));
5443
5444 bool queryItemsAdded = false;
5445Index: src/apps/mail/Content.cpp
5446===================================================================
5447--- src/apps/mail/Content.cpp (Revision 34761)
5448+++ src/apps/mail/Content.cpp (Arbeitskopie)
5449@@ -4,6 +4,7 @@
5450 Terms and Conditions
5451
5452 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5453+Copyright (c) 2009, Haiku, Inc.
5454
5455 Permission is hereby granted, free of charge, to any person obtaining a copy of
5456 this software and associated documentation files (the "Software"), to deal in
5457@@ -885,8 +886,8 @@
5458 //
5459 fEnclosureMenu = new BPopUpMenu("Enclosure", false, false);
5460 fEnclosureMenu->SetFont(&menuFont);
5461- fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Save Enclosure", "添付ファイルを保存") B_UTF8_ELLIPSIS,new BMessage(M_SAVE)));
5462- fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Open Enclosure", "添付ファイルを開く"), new BMessage(M_OPEN)));
5463+ fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Save attachment", "添付ファイルを保存") B_UTF8_ELLIPSIS,new BMessage(M_SAVE)));
5464+ fEnclosureMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE ("Open attachment", "添付ファイルを開く"), new BMessage(M_OPEN)));
5465
5466 //
5467 // Hyperlink pop up menu
5468@@ -894,10 +895,10 @@
5469 fLinkMenu = new BPopUpMenu("Link", false, false);
5470 fLinkMenu->SetFont(&menuFont);
5471 fLinkMenu->AddItem(new BMenuItem(
5472- MDR_DIALECT_CHOICE ("Open This Link", "リンク先を開く"),
5473+ MDR_DIALECT_CHOICE ("Open this link", "リンク先を開く"),
5474 new BMessage(M_OPEN)));
5475 fLinkMenu->AddItem(new BMenuItem(
5476- MDR_DIALECT_CHOICE ("Copy Link Location", "リンク先をコピー"),
5477+ MDR_DIALECT_CHOICE ("Copy link location", "リンク先をコピー"),
5478 new BMessage(M_COPY)));
5479
5480 SetDoesUndo(true);
5481@@ -1544,7 +1545,7 @@
5482 delete string;
5483 }
5484 } else {
5485- (menuItem = new BMenuItem("No Matches", NULL))->SetEnabled(false);
5486+ (menuItem = new BMenuItem("No matches", NULL))->SetEnabled(false);
5487 menu.AddItem(menuItem);
5488 }
5489
5490@@ -2044,7 +2045,7 @@
5491 if (result != B_NO_ERROR) {
5492 beep();
5493 MDR_DIALECT_CHOICE(
5494- (new BAlert("", "An error occurred trying to save the enclosure.", "Sorry"))->Go();,
5495+ (new BAlert("", "An error occurred trying to save the attachment.", "Sorry"))->Go();,
5496 (new BAlert("", "添付ファイルを保存するときにエラーが発生しました", "了解"))->Go();
5497 )
5498 }
5499@@ -2290,7 +2291,7 @@
5500
5501 enclosure->type = TYPE_ENCLOSURE;
5502
5503- const char *name = "\n<Enclosure: could not handle>\n";
5504+ const char *name = "\n<Attachment: could not handle>\n";
5505
5506 fView->GetSelection(&enclosure->text_start, &enclosure->text_end);
5507 enclosure->text_start++;
5508@@ -2335,7 +2336,7 @@
5509 if (type.GetShortDescription(typeDescription) != B_OK)
5510 strcpy(typeDescription, type.Type() ? type.Type() : B_EMPTY_STRING);
5511
5512- name = "\n<Enclosure: ";
5513+ name = "\n<Attachment: ";
5514 name << enclosure->name << " (Type: " << typeDescription << ")>\n";
5515
5516 fView->GetSelection(&enclosure->text_start, &enclosure->text_end);
5517@@ -3285,7 +3286,7 @@
5518 } else {
5519 ::beep();
5520 (new BAlert("",
5521- MDR_DIALECT_CHOICE("Inconsistency occurred in the Undo/Redo buffer.",
5522+ MDR_DIALECT_CHOICE("Inconsistency occurred in the undo/redo buffer.",
5523 "Undo/Redoバッファに矛盾が発生しました!"), "OK"))->Go();
5524 }
5525 break;
5526@@ -3331,7 +3332,7 @@
5527 case K_REPLACED:
5528 ::beep();
5529 (new BAlert("",
5530- MDR_DIALECT_CHOICE("Inconsistency occurred in the Undo/Redo buffer.",
5531+ MDR_DIALECT_CHOICE("Inconsistency occurred in the undo/redo buffer.",
5532 "Undo/Redoバッファに矛盾が発生しました!"), "OK"))->Go();
5533 break;
5534 }
5535Index: src/apps/mail/Prefs.cpp
5536===================================================================
5537--- src/apps/mail/Prefs.cpp (Revision 34761)
5538+++ src/apps/mail/Prefs.cpp (Arbeitskopie)
5539@@ -4,6 +4,7 @@
5540 Terms and Conditions
5541
5542 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5543+Copyright (c) 2009, Haiku, Inc.
5544
5545 Permission is hereby granted, free of charge, to any person obtaining a copy of
5546 this software and associated documentation files (the "Software"), to deal in
5547@@ -69,22 +70,22 @@
5548
5549 #define FONT_TEXT MDR_DIALECT_CHOICE ("Font:", "フォント:")
5550 #define SIZE_TEXT MDR_DIALECT_CHOICE ("Size:", "サイズ:")
5551-#define LEVEL_TEXT MDR_DIALECT_CHOICE ("User Level:", "ユーザーレベル:")
5552-#define WRAP_TEXT MDR_DIALECT_CHOICE ("Text Wrapping:", "テキスト・ラップ:")
5553-#define ATTACH_ATTRIBUTES_TEXT MDR_DIALECT_CHOICE ("Attach Attributes:", "ファイル属性情報:")
5554-#define QUOTES_TEXT MDR_DIALECT_CHOICE ("Colored Quotes:", "引用部分の着色:")
5555-#define ACCOUNT_TEXT MDR_DIALECT_CHOICE ("Default Account:", "標準アカウント:")
5556-#define REPLYTO_TEXT MDR_DIALECT_CHOICE ("Reply Account:", "返信用アカウント:")
5557-#define REPLYTO_USE_DEFAULT_TEXT MDR_DIALECT_CHOICE ("Use Default Account", "標準アカウントを使う")
5558-#define REPLYTO_FROM_MAIL_TEXT MDR_DIALECT_CHOICE ("Account From Mail", "メールのアカウントを使う")
5559-#define REPLY_PREAMBLE_TEXT MDR_DIALECT_CHOICE ("Reply Preamble:", "返信へ追加:")
5560-#define SIGNATURE_TEXT MDR_DIALECT_CHOICE ("Auto Signature:", "自動署名:")
5561+#define LEVEL_TEXT MDR_DIALECT_CHOICE ("User level:", "ユーザーレベル:")
5562+#define WRAP_TEXT MDR_DIALECT_CHOICE ("Text wrapping:", "テキスト・ラップ:")
5563+#define ATTACH_ATTRIBUTES_TEXT MDR_DIALECT_CHOICE ("Attach attributes:", "ファイル属性情報:")
5564+#define QUOTES_TEXT MDR_DIALECT_CHOICE ("Colored quotes:", "引用部分の着色:")
5565+#define ACCOUNT_TEXT MDR_DIALECT_CHOICE ("Default account:", "標準アカウント:")
5566+#define REPLYTO_TEXT MDR_DIALECT_CHOICE ("Reply account:", "返信用アカウント:")
5567+#define REPLYTO_USE_DEFAULT_TEXT MDR_DIALECT_CHOICE ("Use default account", "標準アカウントを使う")
5568+#define REPLYTO_FROM_MAIL_TEXT MDR_DIALECT_CHOICE ("Account from mail", "メールのアカウントを使う")
5569+#define REPLY_PREAMBLE_TEXT MDR_DIALECT_CHOICE ("Reply preamble:", "返信へ追加:")
5570+#define SIGNATURE_TEXT MDR_DIALECT_CHOICE ("Auto signature:", "自動署名:")
5571 #define ENCODING_TEXT MDR_DIALECT_CHOICE ("Encoding:", "エンコード形式:")
5572-#define WARN_UNENCODABLE_TEXT MDR_DIALECT_CHOICE ("Warn Unencodable:", "警告: エンコードできません")
5573-#define SPELL_CHECK_START_ON_TEXT MDR_DIALECT_CHOICE ("Initial Spell Check Mode:", "編集時スペルチェック:")
5574+#define WARN_UNENCODABLE_TEXT MDR_DIALECT_CHOICE ("Warn unencodable:", "警告: エンコードできません")
5575+#define SPELL_CHECK_START_ON_TEXT MDR_DIALECT_CHOICE ("Initial spell check mode:", "編集時スペルチェック:")
5576 #define AUTO_MARK_READ_TEXT MDR_DIALECT_CHOICE ("Automatically mark mail as read:", "Automatically mark mail as read:")
5577
5578-#define BUTTONBAR_TEXT MDR_DIALECT_CHOICE ("Button Bar:", "ボタンバー:")
5579+#define BUTTONBAR_TEXT MDR_DIALECT_CHOICE ("Button bar:", "ボタンバー:")
5580
5581 #define OK_BUTTON_X1 (PREF_WIDTH - BUTTON_WIDTH - 6)
5582 #define OK_BUTTON_X2 (OK_BUTTON_X1 + BUTTON_WIDTH)
5583@@ -102,15 +103,15 @@
5584 P_ACCOUNT, P_REPLYTO, P_REPLY_PREAMBLE,
5585 P_COLORED_QUOTES, P_MARK_READ};
5586
5587-#define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show Icons & Labels", "アイコンとラベル")
5588-#define ICON_TEXT MDR_DIALECT_CHOICE ("Show Icons Only", "アイコンのみ")
5589+#define ICON_LABEL_TEXT MDR_DIALECT_CHOICE ("Show icons & labels", "アイコンとラベル")
5590+#define ICON_TEXT MDR_DIALECT_CHOICE ("Show icons only", "アイコンのみ")
5591 #define HIDE_TEXT MDR_DIALECT_CHOICE ("Hide", "隠す")
5592
5593
5594 extern BPoint prefs_window;
5595
5596-#define ATTRIBUTE_ON_TEXT MDR_DIALECT_CHOICE ("Include BeOS Attributes in Attachments", "BeOSの属性を付ける")
5597-#define ATTRIBUTE_OFF_TEXT MDR_DIALECT_CHOICE ("No BeOS Attributes, just Plain Data", "BeOSの属性を付けない(データのみ)")
5598+#define ATTRIBUTE_ON_TEXT MDR_DIALECT_CHOICE ("Include Haiku attributes in attachments", "Haikuの属性を付ける")
5599+#define ATTRIBUTE_OFF_TEXT MDR_DIALECT_CHOICE ("No Haiku attributes, just plain data", "Haikuの属性を付けない(データのみ)")
5600
5601 //#pragma mark -
5602
5603@@ -140,11 +141,11 @@
5604 bool* spellCheckStartOn, bool* autoMarkRead, uint8* buttonBar)
5605 :
5606 #if USE_LAYOUT_MANAGEMENT
5607- BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"),
5608+ BWindow(rect, MDR_DIALECT_CHOICE ("Mail settings", "Mailの設定"),
5609 B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
5610 | B_AUTO_UPDATE_SIZE_LIMITS),
5611 #else
5612- BWindow(rect, MDR_DIALECT_CHOICE ("Mail Preferences", "Mailの設定"),
5613+ BWindow(rect, MDR_DIALECT_CHOICE ("Mail settings", "Mailの設定"),
5614 B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE),
5615 #endif
5616
5617@@ -205,7 +206,7 @@
5618 interfaceLayout->AlignLayoutWith(mailLayout, B_HORIZONTAL);
5619
5620 BBox* interfaceBox = new BBox(B_FANCY_BORDER, interfaceView);
5621- interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User Interface",
5622+ interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User interface",
5623 "ユーザーインターフェース"));
5624 BBox* mailBox = new BBox(B_FANCY_BORDER, mailView);
5625 mailBox->SetLabel(MDR_DIALECT_CHOICE ("Mailing", "メール関係"));
5626@@ -335,7 +336,7 @@
5627
5628 r.Set(8, 4, Bounds().right - 8, 4 + 6 * (height + ITEM_SPACE));
5629 BBox* interfaceBox = new BBox(r , NULL,B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
5630- interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User Interface",
5631+ interfaceBox->SetLabel(MDR_DIALECT_CHOICE ("User interface",
5632 "ユーザーインターフェース"));
5633 view->AddChild(interfaceBox);
5634
5635Index: src/apps/mail/Enclosures.cpp
5636===================================================================
5637--- src/apps/mail/Enclosures.cpp (Revision 34761)
5638+++ src/apps/mail/Enclosures.cpp (Arbeitskopie)
5639@@ -4,6 +4,7 @@
5640 Terms and Conditions
5641
5642 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5643+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5644
5645 Permission is hereby granted, free of charge, to any person obtaining a copy of
5646 this software and associated documentation files (the "Software"), to deal in
5647@@ -137,7 +138,7 @@
5648
5649 BRect r;
5650 r.left = ENCLOSE_TEXT_H + font.StringWidth(
5651- MDR_DIALECT_CHOICE ("Enclosures: ","添付ファイル")) + 5;
5652+ MDR_DIALECT_CHOICE ("Attachments: ","添付ファイル")) + 5;
5653 r.top = ENCLOSE_FIELD_V;
5654 r.right = wind_rect.right - wind_rect.left - B_V_SCROLL_BAR_WIDTH - 9;
5655 r.bottom = Frame().Height() - 8;
5656@@ -224,7 +225,7 @@
5657 window->Mail()->RemoveComponent(item->Component());
5658
5659 (new BAlert("", MDR_DIALECT_CHOICE (
5660- "Removing enclosures from a forwarded mail is not yet implemented!\n"
5661+ "Removing attachments from a forwarded mail is not yet implemented!\n"
5662 "It will not yet work correctly.",
5663 "転送メールから添付ファイルを削除する機能はまだ実装されていません。"),
5664 MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5665@@ -278,9 +279,9 @@
5666 {
5667 beep();
5668 (new BAlert("", MDR_DIALECT_CHOICE (
5669- "Only files can be added as enclosures.",
5670+ "Only files can be added as attachments.",
5671 "添付できるのは、ファイルのみです。"),
5672- MDR_DIALECT_CHOICE ("Ok","了解")))->Go();
5673+ MDR_DIALECT_CHOICE ("OK","了解")))->Go();
5674 }
5675 }
5676 break;
5677@@ -425,10 +426,10 @@
5678 BPopUpMenu menu("enclosure", false, false);
5679 menu.SetFont(&font);
5680 menu.AddItem(new BMenuItem(
5681- MDR_DIALECT_CHOICE ("Open Enclosure","添付ファイルを開く"),
5682+ MDR_DIALECT_CHOICE ("Open attachment","添付ファイルを開く"),
5683 new BMessage(LIST_INVOKED)));
5684 menu.AddItem(new BMenuItem(
5685- MDR_DIALECT_CHOICE ("Remove Enclosure","添付ファイルを削除"),
5686+ MDR_DIALECT_CHOICE ("Remove attachment","添付ファイルを削除"),
5687 new BMessage(M_REMOVE)));
5688
5689 BPoint menuStart = ConvertToScreen(point);
5690@@ -562,6 +563,6 @@
5691 owner->SetDrawingMode(B_OP_COPY);
5692 }
5693 } else
5694- owner->DrawString("<missing enclosure>");
5695+ owner->DrawString("<missing attachment>");
5696 }
5697
5698Index: src/apps/mail/MailApp.cpp
5699===================================================================
5700--- src/apps/mail/MailApp.cpp (Revision 34761)
5701+++ src/apps/mail/MailApp.cpp (Arbeitskopie)
5702@@ -4,6 +4,7 @@
5703 Terms and Conditions
5704
5705 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5706+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5707
5708 Permission is hereby granted, free of charge, to any person obtaining a copy of
5709 this software and associated documentation files (the "Software"), to deal in
5710@@ -150,7 +151,7 @@
5711 BAlert *alert = new BAlert("about", "Mail\n\n"
5712 "written by Robert Polic\n"
5713 "enhanced by the Dr. Zoidberg crew\n\n"
5714- "Copyright 2007, Haiku.\n", "Ok");
5715+ "Copyright 2007, Haiku.\n", "OK");
5716 BTextView *view = alert->TextView();
5717 BFont font;
5718
5719Index: src/apps/mail/Header.cpp
5720===================================================================
5721--- src/apps/mail/Header.cpp (Revision 34761)
5722+++ src/apps/mail/Header.cpp (Arbeitskopie)
5723@@ -4,6 +4,7 @@
5724 Terms and Conditions
5725
5726 Copyright (c) 1991-2001, Be Incorporated. All rights reserved.
5727+Copyright (c) 2009, Haiku, Inc. All rights reserved.
5728
5729 Permission is hereby granted, free of charge, to any person obtaining a copy of
5730 this software and associated documentation files (the "Software"), to deal in
5731@@ -153,7 +154,7 @@
5732 BMessage* msg;
5733
5734 float x = StringWidth( /* The longest title string in the header area */
5735- MDR_DIALECT_CHOICE ("Enclosures: ","添付ファイル:")) + 9;
5736+ MDR_DIALECT_CHOICE ("Attachments: ","添付ファイル:")) + 9;
5737 float y = TO_FIELD_V;
5738
5739 BMenuBar* dummy = new BMenuBar(BRect(0, 0, 100, 15), "Dummy");
5740Index: src/apps/showimage/PrintOptionsWindow.cpp
5741===================================================================
5742--- src/apps/showimage/PrintOptionsWindow.cpp (Revision 34761)
5743+++ src/apps/showimage/PrintOptionsWindow.cpp (Arbeitskopie)
5744@@ -71,7 +71,7 @@
5745 PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions *options,
5746 BWindow* listener)
5747 :
5748- BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print Options",
5749+ BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print options",
5750 B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL,
5751 B_NOT_ZOOMABLE | B_NOT_RESIZABLE),
5752 fPrintOptions(options),
5753@@ -143,10 +143,10 @@
5754 B_PLAIN_BORDER);
5755 AddChild(panel);
5756
5757- AddRadioButton(panel, at, "fit_to_page", "Fit Image to Page",
5758+ AddRadioButton(panel, at, "fit_to_page", "Fit image to page",
5759 kMsgFitToPageSelected, op == PrintOptions::kFitToPage);
5760 textAt = at;
5761- rb = AddRadioButton(panel, at, "zoom_factor", "Zoom Factor in %: ",
5762+ rb = AddRadioButton(panel, at, "zoom_factor", "Zoom factor in %: ",
5763 kMsgZoomFactorSelected, op == PrintOptions::kZoomFactor);
5764 textAt.x = rb->Bounds().right + 5;
5765 fZoomFactor = AddTextControl(panel, textAt, "zoom_factor_text", "",
5766@@ -160,7 +160,7 @@
5767 0, kMsgDPIChanged);
5768
5769 rb = AddRadioButton(panel, at, "width_and_height",
5770- "Resize To (in 1/72 Inches):", kMsgWidthAndHeightSelected,
5771+ "Resize to (in 1/72 inches):", kMsgWidthAndHeightSelected,
5772 op == PrintOptions::kWidth || op == PrintOptions::kHeight);
5773 at.x += 15;
5774 textAt = at;
5775@@ -179,7 +179,7 @@
5776
5777 at.y += 10;
5778 rect.OffsetBy(at);
5779- button = new BButton(rect, "job setup", "Job Setup",
5780+ button = new BButton(rect, "job setup", "Job setup",
5781 new BMessage(kMsgJobSetup));
5782 panel->AddChild(button);
5783 button->ResizeToPreferred();
5784Index: src/apps/showimage/ResizerWindow.cpp
5785===================================================================
5786--- src/apps/showimage/ResizerWindow.cpp (Revision 34761)
5787+++ src/apps/showimage/ResizerWindow.cpp (Arbeitskopie)
5788@@ -28,7 +28,7 @@
5789
5790 static const char* kWidthLabel = "Width:";
5791 static const char* kHeightLabel = "Height:";
5792-static const char* kKeepAspectRatioLabel = "Keep Original Proportions";
5793+static const char* kKeepAspectRatioLabel = "Keep original proportions";
5794 static const char* kApplyLabel = "Apply";
5795
5796 static const float kLineDistance = 5;
5797Index: src/apps/showimage/ShowImageWindow.cpp
5798===================================================================
5799--- src/apps/showimage/ShowImageWindow.cpp (Revision 34761)
5800+++ src/apps/showimage/ShowImageWindow.cpp (Arbeitskopie)
5801@@ -247,9 +247,9 @@
5802 void
5803 ShowImageWindow::_BuildViewMenu(BMenu *menu, bool popupMenu)
5804 {
5805- _AddItemMenu(menu, "Slide Show", MSG_SLIDE_SHOW, 0, 0, this);
5806+ _AddItemMenu(menu, "Slide show", MSG_SLIDE_SHOW, 0, 0, this);
5807 _MarkMenuItem(menu, MSG_SLIDE_SHOW, fImageView->SlideShowStarted());
5808- BMenu* delayMenu = new BMenu("Slide Delay");
5809+ BMenu* delayMenu = new BMenu("Slide delay");
5810 if (fSlideShowDelay == NULL)
5811 fSlideShowDelay = delayMenu;
5812
5813@@ -258,38 +258,38 @@
5814 // if slide show delay is too short! (Especially if loading the image
5815 // takes as long as or longer than the slide show delay). Should load
5816 // in background thread!
5817- _AddDelayItem(delayMenu, "Three Seconds", 3);
5818- _AddDelayItem(delayMenu, "Four Second", 4);
5819- _AddDelayItem(delayMenu, "Five Seconds", 5);
5820- _AddDelayItem(delayMenu, "Six Seconds", 6);
5821- _AddDelayItem(delayMenu, "Seven Seconds", 7);
5822- _AddDelayItem(delayMenu, "Eight Seconds", 8);
5823- _AddDelayItem(delayMenu, "Nine Seconds", 9);
5824- _AddDelayItem(delayMenu, "Ten Seconds", 10);
5825- _AddDelayItem(delayMenu, "Twenty Seconds", 20);
5826+ _AddDelayItem(delayMenu, "3 seconds", 3);
5827+ _AddDelayItem(delayMenu, "4 seconds", 4);
5828+ _AddDelayItem(delayMenu, "5 seconds", 5);
5829+ _AddDelayItem(delayMenu, "6 seconds", 6);
5830+ _AddDelayItem(delayMenu, "7 seconds", 7);
5831+ _AddDelayItem(delayMenu, "8 seconds", 8);
5832+ _AddDelayItem(delayMenu, "9 seconds", 9);
5833+ _AddDelayItem(delayMenu, "10 seconds", 10);
5834+ _AddDelayItem(delayMenu, "20 seconds", 20);
5835 menu->AddItem(delayMenu);
5836
5837 menu->AddSeparatorItem();
5838
5839- _AddItemMenu(menu, "Original Size", MSG_ORIGINAL_SIZE, '1', 0, this);
5840- _AddItemMenu(menu, "Zoom In", MSG_ZOOM_IN, '+', 0, this);
5841- _AddItemMenu(menu, "Zoom Out", MSG_ZOOM_OUT, '-', 0, this);
5842+ _AddItemMenu(menu, "Original size", MSG_ORIGINAL_SIZE, '1', 0, this);
5843+ _AddItemMenu(menu, "Zoom in", MSG_ZOOM_IN, '+', 0, this);
5844+ _AddItemMenu(menu, "Zoom out", MSG_ZOOM_OUT, '-', 0, this);
5845
5846 menu->AddSeparatorItem();
5847
5848- _AddItemMenu(menu, "High-Quality Zooming", MSG_SCALE_BILINEAR, 0, 0, this);
5849+ _AddItemMenu(menu, "High-quality zooming", MSG_SCALE_BILINEAR, 0, 0, this);
5850
5851 menu->AddSeparatorItem();
5852
5853- _AddItemMenu(menu, "Shrink to Window", MSG_SHRINK_TO_WINDOW, 0, 0, this);
5854- _AddItemMenu(menu, "Zoom to Window", MSG_ZOOM_TO_WINDOW, 0, 0, this);
5855+ _AddItemMenu(menu, "Shrink to window", MSG_SHRINK_TO_WINDOW, 0, 0, this);
5856+ _AddItemMenu(menu, "Zoom to window", MSG_ZOOM_TO_WINDOW, 0, 0, this);
5857
5858 menu->AddSeparatorItem();
5859
5860- _AddItemMenu(menu, "Full Screen", MSG_FULL_SCREEN, B_ENTER, 0, this);
5861+ _AddItemMenu(menu, "Full screen", MSG_FULL_SCREEN, B_ENTER, 0, this);
5862 _MarkMenuItem(menu, MSG_FULL_SCREEN, fFullScreen);
5863
5864- _AddItemMenu(menu, "Show Caption in Full Screen Mode", MSG_SHOW_CAPTION, 0,
5865+ _AddItemMenu(menu, "Show caption in full screen mode", MSG_SHOW_CAPTION, 0,
5866 0, this);
5867 _MarkMenuItem(menu, MSG_SHOW_CAPTION, fShowCaption);
5868
5869@@ -309,7 +309,7 @@
5870
5871 if (popupMenu) {
5872 menu->AddSeparatorItem();
5873- _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0,
5874+ _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0,
5875 this);
5876 }
5877 }
5878@@ -326,14 +326,14 @@
5879 fOpenMenu->Superitem()->SetTarget(be_app);
5880 fOpenMenu->Superitem()->SetShortcut('O', 0);
5881 menu->AddSeparatorItem();
5882- BMenu *pmenuSaveAs = new BMenu("Save As" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN);
5883+ BMenu *pmenuSaveAs = new BMenu("Save as" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN);
5884 BTranslationUtils::AddTranslationItems(pmenuSaveAs, B_TRANSLATOR_BITMAP);
5885 // Fill Save As submenu with all types that can be converted
5886 // to from the Be bitmap image format
5887 menu->AddItem(pmenuSaveAs);
5888 _AddItemMenu(menu, "Close", B_QUIT_REQUESTED, 'W', 0, this);
5889 menu->AddSeparatorItem();
5890- _AddItemMenu(menu, "Page Setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this);
5891+ _AddItemMenu(menu, "Page setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this);
5892 _AddItemMenu(menu, "Print" B_UTF8_ELLIPSIS, MSG_PREPARE_PRINT, 'P', 0, this);
5893 menu->AddSeparatorItem();
5894 _AddItemMenu(menu, "About ShowImage" B_UTF8_ELLIPSIS, B_ABOUT_REQUESTED, 0, 0,
5895@@ -350,36 +350,36 @@
5896 _AddItemMenu(menu, "Paste", B_PASTE, 'V', 0, this, false);
5897 _AddItemMenu(menu, "Clear", MSG_CLEAR_SELECT, 0, 0, this, false);
5898 menu->AddSeparatorItem();
5899- _AddItemMenu(menu, "Select All", MSG_SELECT_ALL, 'A', 0, this);
5900+ _AddItemMenu(menu, "Select all", MSG_SELECT_ALL, 'A', 0, this);
5901 bar->AddItem(menu);
5902
5903 menu = fBrowseMenu = new BMenu("Browse");
5904- _AddItemMenu(menu, "First Page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this);
5905- _AddItemMenu(menu, "Last Page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this);
5906- _AddItemMenu(menu, "Previous Page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this);
5907- _AddItemMenu(menu, "Next Page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this);
5908- fGoToPageMenu = new BMenu("Go to Page");
5909+ _AddItemMenu(menu, "First page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this);
5910+ _AddItemMenu(menu, "Last page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this);
5911+ _AddItemMenu(menu, "Previous page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this);
5912+ _AddItemMenu(menu, "Next page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this);
5913+ fGoToPageMenu = new BMenu("Go to page");
5914 fGoToPageMenu->SetRadioMode(true);
5915 menu->AddItem(fGoToPageMenu);
5916 menu->AddSeparatorItem();
5917- _AddItemMenu(menu, "Previous File", MSG_FILE_PREV, B_UP_ARROW, 0, this);
5918- _AddItemMenu(menu, "Next File", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this);
5919+ _AddItemMenu(menu, "Previous file", MSG_FILE_PREV, B_UP_ARROW, 0, this);
5920+ _AddItemMenu(menu, "Next file", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this);
5921 bar->AddItem(menu);
5922
5923 menu = new BMenu("Image");
5924- _AddItemMenu(menu, "Rotate Clockwise", MSG_ROTATE_90, 'R', 0, this);
5925- _AddItemMenu(menu, "Rotate Counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this);
5926+ _AddItemMenu(menu, "Rotate clockwise", MSG_ROTATE_90, 'R', 0, this);
5927+ _AddItemMenu(menu, "Rotate counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this);
5928 menu->AddSeparatorItem();
5929- _AddItemMenu(menu, "Flip Left to Right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this);
5930- _AddItemMenu(menu, "Flip Top to Bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this);
5931+ _AddItemMenu(menu, "Flip left to right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this);
5932+ _AddItemMenu(menu, "Flip top to bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this);
5933 menu->AddSeparatorItem();
5934- _AddItemMenu(menu, "Invert Colors", MSG_INVERT, 0, 0, this);
5935+ _AddItemMenu(menu, "Invert colors", MSG_INVERT, 0, 0, this);
5936 menu->AddSeparatorItem();
5937 fResizeItem = _AddItemMenu(menu, "Resize" B_UTF8_ELLIPSIS,
5938 MSG_OPEN_RESIZER_WINDOW, 0, 0, this);
5939 bar->AddItem(menu);
5940 menu->AddSeparatorItem();
5941- _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0,
5942+ _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0,
5943 this);
5944 }
5945
5946Index: src/apps/showimage/ShowImageView.cpp
5947===================================================================
5948--- src/apps/showimage/ShowImageView.cpp (Revision 34761)
5949+++ src/apps/showimage/ShowImageView.cpp (Arbeitskopie)
5950@@ -1261,7 +1261,7 @@
5951 // If loop terminated because of a break, there was an error
5952 BString errText;
5953 errText << "Sorry, the file '" << name << "' could not be written.";
5954- BAlert *palert = new BAlert(NULL, errText.String(), "Ok");
5955+ BAlert *palert = new BAlert(NULL, errText.String(), "OK");
5956 palert->Go();
5957 }
5958
5959Index: src/apps/showimage/ProgressWindow.cpp
5960===================================================================
5961--- src/apps/showimage/ProgressWindow.cpp (Revision 34761)
5962+++ src/apps/showimage/ProgressWindow.cpp (Arbeitskopie)
5963@@ -21,7 +21,7 @@
5964
5965 ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center)
5966 :
5967- BWindow(BRect(0, 0, 250, 100), "Progress Monitor",
5968+ BWindow(BRect(0, 0, 250, 100), "Progress monitor",
5969 B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL,
5970 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
5971 fRunner(NULL)
5972Index: src/apps/people/PeopleApp.cpp
5973===================================================================
5974--- src/apps/people/PeopleApp.cpp (Revision 34761)
5975+++ src/apps/people/PeopleApp.cpp (Arbeitskopie)
5976@@ -1,5 +1,5 @@
5977 /*
5978- * Copyright 2005 - 2008, Haiku, Inc.
5979+ * Copyright 2005-2009, Haiku, Inc. All rights reserved.
5980 * Distributed under the terms of the MIT license.
5981 *
5982 * Authors:
5983@@ -29,7 +29,7 @@
5984
5985
5986 struct people_field gFields[] = {
5987- { "META:name", 120, "Contact Name" },
5988+ { "META:name", 120, "Contact name" },
5989 { "META:nickname", 120, "Nickname" },
5990 { "META:company", 120, "Company" },
5991 { "META:address", 120, "Address" },
5992@@ -37,8 +37,8 @@
5993 { "META:state", 50, "State" },
5994 { "META:zip", 50, "Zip" },
5995 { "META:country", 120, "Country" },
5996- { "META:hphone", 90, "Home Phone" },
5997- { "META:wphone", 90, "Work Phone" },
5998+ { "META:hphone", 90, "Home phone" },
5999+ { "META:wphone", 90, "Work phone" },
6000 { "META:fax", 90, "Fax" },
6001 { "META:email", 120, "E-mail" },
6002 { "META:url", 120, "URL" },
6003@@ -140,7 +140,7 @@
6004 void
6005 TPeopleApp::AboutRequested(void)
6006 {
6007- (new BAlert("", "...by Robert Polic", "Big Deal"))->Go();
6008+ (new BAlert("", "...by Robert Polic", "OK"))->Go();
6009 }
6010
6011
6012@@ -230,7 +230,7 @@
6013 {
6014 TPeopleWindow *window;
6015
6016- window = new TPeopleWindow(fPosition, "New Person", ref);
6017+ window = new TPeopleWindow(fPosition, "New person", ref);
6018 window->Show();
6019 fWindowCount++;
6020 fPosition.OffsetBy(20, 20);
6021Index: src/apps/people/PeopleWindow.cpp
6022===================================================================
6023--- src/apps/people/PeopleWindow.cpp (Revision 34761)
6024+++ src/apps/people/PeopleWindow.cpp (Arbeitskopie)
6025@@ -7,6 +7,7 @@
6026 //--------------------------------------------------------------------
6027 /*
6028 Copyright 1999, Be Incorporated. All Rights Reserved.
6029+ Copyright 2009, Haiku, Inc. All rights reserved.
6030 This file may be used under the terms of the Be Sample Code License.
6031 */
6032
6033@@ -42,13 +43,13 @@
6034 BRect rect(0, 0, 32767, 15);
6035 BMenuBar* menuBar = new BMenuBar(rect, "");
6036 menu = new BMenu("File");
6037- menu->AddItem(item = new BMenuItem("New Person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N'));
6038+ menu->AddItem(item = new BMenuItem("New person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N'));
6039 item->SetTarget(NULL, be_app);
6040 menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W'));
6041 menu->AddSeparatorItem();
6042 menu->AddItem(fSave = new BMenuItem("Save", new BMessage(M_SAVE), 'S'));
6043 fSave->SetEnabled(FALSE);
6044- menu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS)));
6045+ menu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS)));
6046 menu->AddItem(fRevert = new BMenuItem("Revert", new BMessage(M_REVERT), 'R'));
6047 fRevert->SetEnabled(FALSE);
6048 menu->AddSeparatorItem();
6049@@ -68,7 +69,7 @@
6050 fCopy->SetTarget(NULL, this);
6051 menu->AddItem(fPaste = new BMenuItem("Paste", new BMessage(B_PASTE), 'V'));
6052 fPaste->SetTarget(NULL, this);
6053- menu->AddItem(item = new BMenuItem("Select All", new BMessage(M_SELECT), 'A'));
6054+ menu->AddItem(item = new BMenuItem("Select all", new BMessage(M_SELECT), 'A'));
6055 item->SetTarget(NULL, this);
6056 menuBar->AddItem(menu);
6057 AddChild(menuBar);
6058Index: src/apps/pulse/MiniPulseView.cpp
6059===================================================================
6060--- src/apps/pulse/MiniPulseView.cpp (Revision 34761)
6061+++ src/apps/pulse/MiniPulseView.cpp (Arbeitskopie)
6062@@ -5,6 +5,7 @@
6063 // Written by: Arve Hjonnevag and Daniel Switkin
6064 //
6065 // Copyright 1999, Be Incorporated
6066+// Copyright 2009, Haiku, Inc. All rights reserved.
6067 //
6068 //****************************************************************************************
6069
6070@@ -15,9 +16,9 @@
6071 MiniPulseView::MiniPulseView(BRect rect, const char *name, Prefs *prefs) :
6072 PulseView(rect, name) {
6073
6074- mode1->SetLabel("Normal Mode");
6075+ mode1->SetLabel("Normal mode");
6076 mode1->SetMessage(new BMessage(PV_NORMAL_MODE));
6077- mode2->SetLabel("Deskbar Mode");
6078+ mode2->SetLabel("Deskbar mode");
6079 mode2->SetMessage(new BMessage(PV_DESKBAR_MODE));
6080 quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0);
6081 popupmenu->AddSeparatorItem();
6082Index: src/apps/pulse/ConfigView.cpp
6083===================================================================
6084--- src/apps/pulse/ConfigView.cpp (Revision 34761)
6085+++ src/apps/pulse/ConfigView.cpp (Arbeitskopie)
6086@@ -1,5 +1,5 @@
6087 /*
6088- * Copyright 2002-2006 Haiku, Inc. All Rights Reserved.
6089+ * Copyright 2002-2009 Haiku, Inc. All rights reserved.
6090 * Distributed under the terms of the MIT license.
6091 *
6092 * Copyright 1999, Be Incorporated. All Rights Reserved.
6093@@ -61,7 +61,7 @@
6094 fActiveButton = fIdleButton = fFrameButton = NULL;
6095 fIconWidthControl = NULL;
6096
6097- SetLabel("Bar Colors");
6098+ SetLabel("Bar colors");
6099
6100 font_height fontHeight;
6101 be_bold_font->GetHeight(&fontHeight);
6102Index: src/apps/pulse/PrefsWindow.cpp
6103===================================================================
6104--- src/apps/pulse/PrefsWindow.cpp (Revision 34761)
6105+++ src/apps/pulse/PrefsWindow.cpp (Arbeitskopie)
6106@@ -1,5 +1,5 @@
6107 /*
6108- * Copyright 2002-2006 Haiku, Inc. All Rights Reserved.
6109+ * Copyright 2002-2009 Haiku, Inc. All rights reserved.
6110 * Distributed under the terms of the MIT license.
6111 *
6112 * Copyright 1999, Be Incorporated. All Rights Reserved.
6113@@ -43,15 +43,15 @@
6114 BRect rect = fTabView->ContainerView()->Bounds();
6115 rect.InsetBy(5, 5);
6116
6117- ConfigView *normalView = new ConfigView(rect, "Normal Mode",
6118+ ConfigView *normalView = new ConfigView(rect, "Normal mode",
6119 PRV_NORMAL_CHANGE_COLOR, fTarget, prefs);
6120 fTabView->AddTab(normalView);
6121
6122- ConfigView *miniView = new ConfigView(rect, "Mini Mode", PRV_MINI_CHANGE_COLOR,
6123+ ConfigView *miniView = new ConfigView(rect, "Mini mode", PRV_MINI_CHANGE_COLOR,
6124 fTarget, prefs);
6125 fTabView->AddTab(miniView);
6126
6127- ConfigView *deskbarView = new ConfigView(rect, "Deskbar Mode", PRV_DESKBAR_CHANGE_COLOR,
6128+ ConfigView *deskbarView = new ConfigView(rect, "Deskbar mode", PRV_DESKBAR_CHANGE_COLOR,
6129 fTarget, prefs);
6130 fTabView->AddTab(deskbarView);
6131
6132@@ -102,7 +102,7 @@
6133 Hide();
6134
6135 fTabView->Select(2);
6136- ConfigView *deskbar = (ConfigView *)FindView("Deskbar Mode");
6137+ ConfigView *deskbar = (ConfigView *)FindView("Deskbar mode");
6138 deskbar->UpdateDeskbarIconWidth();
6139
6140 PostMessage(B_QUIT_REQUESTED);
6141Index: src/apps/pulse/DeskbarPulseView.cpp
6142===================================================================
6143--- src/apps/pulse/DeskbarPulseView.cpp (Revision 34761)
6144+++ src/apps/pulse/DeskbarPulseView.cpp (Arbeitskopie)
6145@@ -5,6 +5,7 @@
6146 // Written by: Daniel Switkin
6147 //
6148 // Copyright 1999, Be Incorporated
6149+// Copyright 2009, Haiku, Inc. All rights reserved.
6150 //
6151 //****************************************************************************************
6152
6153@@ -26,9 +27,9 @@
6154 }
6155
6156 DeskbarPulseView::DeskbarPulseView(BMessage *message) : MiniPulseView(message) {
6157- mode1->SetLabel("Normal Mode");
6158+ mode1->SetLabel("Normal mode");
6159 mode1->SetMessage(new BMessage(PV_NORMAL_MODE));
6160- mode2->SetLabel("Mini Mode");
6161+ mode2->SetLabel("Mini mode");
6162 mode2->SetMessage(new BMessage(PV_MINI_MODE));
6163 quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0);
6164 popupmenu->AddSeparatorItem();
6165@@ -113,7 +114,7 @@
6166 prefswindow->Activate(true);
6167 break;
6168 }
6169- prefswindow = new PrefsWindow(prefs->prefs_window_rect, "Pulse Preferences",
6170+ prefswindow = new PrefsWindow(prefs->prefs_window_rect, "Pulse Settings",
6171 new BMessenger(this), prefs);
6172 prefswindow->Show();
6173 break;
6174Index: src/apps/pulse/PulseWindow.cpp
6175===================================================================
6176--- src/apps/pulse/PulseWindow.cpp (Revision 34761)
6177+++ src/apps/pulse/PulseWindow.cpp (Arbeitskopie)
6178@@ -5,6 +5,7 @@
6179 // Written by: Daniel Switkin
6180 //
6181 // Copyright 1999, Be Incorporated
6182+// Copyright 2009, Haiku, Inc. All rights reserved.
6183 //
6184 //****************************************************************************************
6185
6186@@ -89,7 +90,7 @@
6187 // Otherwise launch a new preferences window
6188 PulseApp *pulseapp = (PulseApp *)be_app;
6189 fPrefsWindow = new PrefsWindow(pulseapp->prefs->prefs_window_rect,
6190- "Pulse Preferences", new BMessenger(this), pulseapp->prefs);
6191+ "Pulse settings", new BMessenger(this), pulseapp->prefs);
6192 fPrefsWindow->Show();
6193 break;
6194 }
6195Index: src/apps/pulse/PulseView.cpp
6196===================================================================
6197--- src/apps/pulse/PulseView.cpp (Revision 34761)
6198+++ src/apps/pulse/PulseView.cpp (Arbeitskopie)
6199@@ -5,6 +5,7 @@
6200 // Written by: David Ramsey and Daniel Switkin
6201 //
6202 // Copyright 1999, Be Incorporated
6203+// Copyright 2009, Haiku, Inc. All rights reserved.
6204 //
6205 //****************************************************************************************
6206
6207@@ -50,7 +51,7 @@
6208 popupmenu->SetFont(be_plain_font);
6209 mode1 = new BMenuItem("", NULL, 0, 0);
6210 mode2 = new BMenuItem("", NULL, 0, 0);
6211- preferences = new BMenuItem("Preferences" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0);
6212+ preferences = new BMenuItem("Settings" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0);
6213 about = new BMenuItem("About Pulse" B_UTF8_ELLIPSIS, new BMessage(PV_ABOUT), 0, 0);
6214
6215 popupmenu->AddItem(mode1);
6216Index: src/apps/pulse/NormalPulseView.cpp
6217===================================================================
6218--- src/apps/pulse/NormalPulseView.cpp (Revision 34761)
6219+++ src/apps/pulse/NormalPulseView.cpp (Arbeitskopie)
6220@@ -5,6 +5,7 @@
6221 // Written by: Daniel Switkin
6222 //
6223 // Copyright 1999, Be Incorporated
6224+// Copyright 2009, Haiku, Inc. All rights reserved.
6225 //
6226 //****************************************************************************************
6227
6228@@ -50,9 +51,9 @@
6229 SetViewColor(color);
6230 SetLowColor(color);
6231
6232- mode1->SetLabel("Mini Mode");
6233+ mode1->SetLabel("Mini mode");
6234 mode1->SetMessage(new BMessage(PV_MINI_MODE));
6235- mode2->SetLabel("Deskbar Mode");
6236+ mode2->SetLabel("Deskbar mode");
6237 mode2->SetMessage(new BMessage(PV_DESKBAR_MODE));
6238
6239 DetermineVendorAndProcessor();
6240@@ -69,7 +70,7 @@
6241 BRect r(PROGRESS_MLEFT, PROGRESS_MTOP + ITEM_OFFSET * x,
6242 PROGRESS_MLEFT + ProgressBar::PROGRESS_WIDTH,
6243 PROGRESS_MTOP + ITEM_OFFSET * x + ProgressBar::PROGRESS_HEIGHT);
6244- fProgressBars[x] = new ProgressBar(r, "CPU Progress Bar");
6245+ fProgressBars[x] = new ProgressBar(r, "CPU progress bar");
6246 AddChild(fProgressBars[x]);
6247
6248 r.Set(CPUBUTTON_MLEFT, CPUBUTTON_MTOP + ITEM_OFFSET * x,
6249Index: src/apps/tv/MainWin.cpp
6250===================================================================
6251--- src/apps/tv/MainWin.cpp (Revision 34761)
6252+++ src/apps/tv/MainWin.cpp (Arbeitskopie)
6253@@ -1,5 +1,5 @@
6254 /*
6255- * Copyright (c) 2004-2007 Marcus Overhagen <marcus@overhagen.de>
6256+ * Copyright (c) 2004-2009 Marcus Overhagen <marcus@overhagen.de>
6257 *
6258 * Permission is hereby granted, free of charge, to any person
6259 * obtaining a copy of this software and associated documentation
6260@@ -165,8 +165,8 @@
6261 fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY));
6262
6263 /*
6264- fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6265- fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6266+ fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6267+ fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6268 fChannelMenu->AddSeparatorItem();
6269 fChannelMenu->AddItem(new BMenuItem("RTL", new BMessage(M_DUMMY), '0', B_COMMAND_KEY));
6270 fChannelMenu->AddItem(new BMenuItem("Pro7", new BMessage(M_DUMMY), '1', B_COMMAND_KEY));
6271@@ -177,14 +177,14 @@
6272 */
6273
6274 fSettingsMenu->AddItem(new BMenuItem("Scale to native size", new BMessage(M_SCALE_TO_NATIVE_SIZE), 'N', B_COMMAND_KEY));
6275- fSettingsMenu->AddItem(new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6276+ fSettingsMenu->AddItem(new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6277 fSettingsMenu->AddSeparatorItem();
6278- fSettingsMenu->AddItem(new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6279- fSettingsMenu->AddItem(new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6280- fSettingsMenu->AddItem(new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6281- fSettingsMenu->AddItem(new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6282+ fSettingsMenu->AddItem(new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6283+ fSettingsMenu->AddItem(new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6284+ fSettingsMenu->AddItem(new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6285+ fSettingsMenu->AddItem(new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6286 fSettingsMenu->AddSeparatorItem();
6287- fSettingsMenu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY));
6288+ fSettingsMenu->AddItem(new BMenuItem("Settings"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY));
6289
6290 fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.00000:1", new BMessage(M_ASPECT_100000_1)));
6291 fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.06666:1", new BMessage(M_ASPECT_106666_1)));
6292@@ -235,8 +235,8 @@
6293 if (channels == 0) {
6294 fChannelMenu->AddItem(new BMenuItem("None", new BMessage(M_DUMMY)));
6295 } else {
6296- fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6297- fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6298+ fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY));
6299+ fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY));
6300 fChannelMenu->AddSeparatorItem();
6301 }
6302
6303@@ -481,13 +481,13 @@
6304 menu->AddItem(item = new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY));
6305 item->SetMarked(fIsFullscreen);
6306 menu->AddSeparatorItem();
6307- menu->AddItem(item = new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6308+ menu->AddItem(item = new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY));
6309 item->SetMarked(fNoMenu);
6310- menu->AddItem(item = new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6311+ menu->AddItem(item = new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY));
6312 item->SetMarked(fNoBorder);
6313- menu->AddItem(item = new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6314+ menu->AddItem(item = new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY));
6315 item->SetMarked(fAlwaysOnTop);
6316- menu->AddItem(item = new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6317+ menu->AddItem(item = new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
6318 item->SetMarked(fKeepAspectRatio);
6319 menu->AddSeparatorItem();
6320 menu->AddItem(new BMenuItem("About " NAME B_UTF8_ELLIPSIS, new BMessage(M_FILE_ABOUT)));
6321@@ -1109,7 +1109,7 @@
6322 #if TIME_BOMB_ACTIVE
6323 "\n\n" INFO2
6324 #endif
6325- "\n\nCopyright "COPYRIGHT"\n\nVersion "VERSION"\n\nRevision "REVISION"\n\nBuild "BUILD, "Thanks");
6326+ "\n\nCopyright "COPYRIGHT"\nVersion "VERSION"\nRevision "REVISION"\nBuild "BUILD, "OK");
6327 if (fAlwaysOnTop) {
6328 ToggleAlwaysOnTop();
6329 alert->Go();
6330Index: src/apps/charactermap/CharacterWindow.cpp
6331===================================================================
6332--- src/apps/charactermap/CharacterWindow.cpp (Revision 34761)
6333+++ src/apps/charactermap/CharacterWindow.cpp (Arbeitskopie)
6334@@ -184,7 +184,7 @@
6335 BScrollView* characterScroller = new BScrollView("characterScroller",
6336 fCharacterView, 0, false, true);
6337
6338- fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font Size:",
6339+ fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font size:",
6340 new BMessage(kMsgFontSizeChanged), kMinFontSize, kMaxFontSize);
6341 fFontSizeSlider->SetValue(fontSize);
6342
6343@@ -223,12 +223,12 @@
6344 menuBar->AddItem(menu);
6345
6346 menu = new BMenu("View");
6347- menu->AddItem(item = new BMenuItem("Show Private Blocks",
6348+ menu->AddItem(item = new BMenuItem("Show private blocks",
6349 new BMessage(kMsgPrivateBlocks)));
6350 item->SetMarked(fCharacterView->IsShowingPrivateBlocks());
6351 // TODO: this feature is not yet supported by Haiku!
6352 #if 0
6353- menu->AddItem(item = new BMenuItem("Only Show Blocks Contained in Font",
6354+ menu->AddItem(item = new BMenuItem("Only show blocks contained in font",
6355 new BMessage(kMsgContainedBlocks)));
6356 item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly());
6357 #endif
6358Index: src/apps/charactermap/UnicodeBlocks.cpp
6359===================================================================
6360--- src/apps/charactermap/UnicodeBlocks.cpp (Revision 34761)
6361+++ src/apps/charactermap/UnicodeBlocks.cpp (Arbeitskopie)
6362@@ -11,25 +11,25 @@
6363
6364 const struct unicode_block_entry kUnicodeBlocks[] = {
6365 {"Basic Latin", 0x0000, 0x007f, false, B_BASIC_LATIN_BLOCK},
6366- {"Latin-1 Supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK},
6367- {"Latin Extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK},
6368- {"Latin Extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK},
6369- {"IPA Extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK},
6370- {"Spacing Modifier Letters", 0x02b0, 0x02ff, false,
6371+ {"Latin-1 supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK},
6372+ {"Latin extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK},
6373+ {"Latin extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK},
6374+ {"IPA extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK},
6375+ {"Spacing modifier letters", 0x02b0, 0x02ff, false,
6376 B_SPACING_MODIFIER_LETTERS_BLOCK},
6377- {"Combining Diacritical Marks", 0x0300, 0x036f, false,
6378+ {"Combining diacritical marks", 0x0300, 0x036f, false,
6379 B_COMBINING_DIACRITICAL_MARKS_BLOCK},
6380 {"Greek and Coptic", 0x0370, 0x03ff, false,
6381 B_BASIC_GREEK_BLOCK | B_GREEK_SYMBOLS_AND_COPTIC_BLOCK},
6382 {"Cyrillic", 0x0400, 0x04ff, false, B_CYRILLIC_BLOCK},
6383- {"Cyrillic Supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK},
6384+ {"Cyrillic supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK},
6385 {"Armenian", 0x0530, 0x058f, false, B_ARMENIAN_BLOCK},
6386 {"Hebrew", 0x0590, 0x05ff, false,
6387 B_BASIC_HEBREW_BLOCK | B_HEBREW_EXTENDED_BLOCK},
6388 {"Arabic", 0x0600, 0x06ff, false,
6389 B_BASIC_ARABIC_BLOCK | B_ARABIC_EXTENDED_BLOCK},
6390 {"Syriac", 0x0700, 0x074f, false, kNoBlock},
6391- {"Arabic Supplement", 0x0750, 0x077f, false, kNoBlock},
6392+ {"Arabic supplement", 0x0750, 0x077f, false, kNoBlock},
6393 {"Thaana", 0x0780, 0x07bf, false, kNoBlock},
6394 {"N'Ko", 0x07c0, 0x07ff, false, kNoBlock},
6395 {"Devanagari", 0x0900, 0x097f, false, B_DEVANAGARI_BLOCK},
6396@@ -50,9 +50,9 @@
6397 {"Hangul Jamo", 0x1100, 0x11ff, false, kNoBlock},
6398 // TODO!
6399 {"Ethiopic", 0x1200, 0x137f, false, kNoBlock},
6400- {"Ethiopic Supplement", 0x1380, 0x139f, false, kNoBlock},
6401+ {"Ethiopic supplement", 0x1380, 0x139f, false, kNoBlock},
6402 {"Cherokee", 0x13a0, 0x13ff, false, kNoBlock},
6403- {"Unified Canadian Aboriginal Syllabics", 0x1400, 0x167f, false, kNoBlock},
6404+ {"Unified Canadian Aboriginal syllabics", 0x1400, 0x167f, false, kNoBlock},
6405 {"Ogham", 0x1680, 0x169f, false, kNoBlock},
6406 {"Runic", 0x16a0, 0x16ff, false, kNoBlock},
6407 {"Tagalog", 0x1700, 0x171f, false, kNoBlock},
6408@@ -64,131 +64,131 @@
6409 {"Limbu", 0x1900, 0x194f, false, kNoBlock},
6410 {"Tai Le", 0x1950, 0x197f, false, kNoBlock},
6411 {"New Tai Lue", 0x1980, 0x19df, false, kNoBlock},
6412- {"Khmer Symbols", 0x19e0, 0x19ff, false, kNoBlock},
6413+ {"Khmer symbols", 0x19e0, 0x19ff, false, kNoBlock},
6414 {"Buginese", 0x1a00, 0x1a1f, false, kNoBlock},
6415 {"Balinese", 0x1b00, 0x1b7f, false, kNoBlock},
6416 {"Sundanese", 0x1b80, 0x1bbf, false, kNoBlock},
6417 {"Lepcha", 0x1c00, 0x1c4f, false, kNoBlock},
6418 {"Ol Chiki", 0x1c50, 0x1c7f, false, kNoBlock},
6419- {"Phonetic Extensions", 0x1d00, 0x1d7f, false, kNoBlock},
6420- {"Phonetic Extensions Supplement", 0x1d80, 0x1dbf, false, kNoBlock},
6421- {"Combining Diacritical Marks Supplement", 0x1dc0, 0x1dff, false, kNoBlock},
6422- {"Latin Extended Additional", 0x1e00, 0x1eff, false, kNoBlock},
6423- {"Greek Extended", 0x1f00, 0x1fff, false, kNoBlock},
6424- {"General Punctuation", 0x2000, 0x206f, false, kNoBlock},
6425- {"Superscripts and Subscripts", 0x2070, 0x209f, false, kNoBlock},
6426- {"Currency Symbols", 0x20a0, 0x20cf, false, kNoBlock},
6427- {"Combining Diacritical Marks for Symbols", 0x20d0, 0x20ff, false,
6428+ {"Phonetic extensions", 0x1d00, 0x1d7f, false, kNoBlock},
6429+ {"Phonetic extensions supplement", 0x1d80, 0x1dbf, false, kNoBlock},
6430+ {"Combining diacritical marks supplement", 0x1dc0, 0x1dff, false, kNoBlock},
6431+ {"Latin extended additional", 0x1e00, 0x1eff, false, kNoBlock},
6432+ {"Greek extended", 0x1f00, 0x1fff, false, kNoBlock},
6433+ {"General punctuation", 0x2000, 0x206f, false, kNoBlock},
6434+ {"Superscripts and subscripts", 0x2070, 0x209f, false, kNoBlock},
6435+ {"Currency symbols", 0x20a0, 0x20cf, false, kNoBlock},
6436+ {"Combining diacritical marks for symbols", 0x20d0, 0x20ff, false,
6437 kNoBlock},
6438- {"Letterlike Symbols", 0x2100, 0x214f, false, kNoBlock},
6439- {"Number Forms", 0x2150, 0x218f, false, kNoBlock},
6440+ {"Letterlike symbols", 0x2100, 0x214f, false, kNoBlock},
6441+ {"Number forms", 0x2150, 0x218f, false, kNoBlock},
6442 {"Arrows", 0x2190, 0x21ff, false, kNoBlock},
6443- {"Mathematical Operators", 0x2200, 0x22ff, false, kNoBlock},
6444- {"Miscellaneous Technical", 0x2300, 0x23ff, false, kNoBlock},
6445- {"Control Pictures", 0x2400, 0x243f, false, kNoBlock},
6446- {"Optical Character Recognition", 0x2440, 0x245f, false, kNoBlock},
6447- {"Enclosed Alphanumerics", 0x2460, 0x24ff, false, kNoBlock},
6448- {"Box Drawing", 0x2500, 0x257f, false, kNoBlock},
6449- {"Block Elements", 0x2580, 0x259f, false, kNoBlock},
6450- {"Geometric Shapes", 0x25a0, 0x25ff, false, kNoBlock},
6451- {"Miscellaneous Symbols", 0x2600, 0x26ff, false, kNoBlock},
6452+ {"Mathematical operators", 0x2200, 0x22ff, false, kNoBlock},
6453+ {"Miscellaneous technical", 0x2300, 0x23ff, false, kNoBlock},
6454+ {"Control pictures", 0x2400, 0x243f, false, kNoBlock},
6455+ {"Optical character recognition", 0x2440, 0x245f, false, kNoBlock},
6456+ {"Enclosed alphanumerics", 0x2460, 0x24ff, false, kNoBlock},
6457+ {"Box drawing", 0x2500, 0x257f, false, kNoBlock},
6458+ {"Block elements", 0x2580, 0x259f, false, kNoBlock},
6459+ {"Geometric shapes", 0x25a0, 0x25ff, false, kNoBlock},
6460+ {"Miscellaneous symbols", 0x2600, 0x26ff, false, kNoBlock},
6461 {"Dingbats", 0x2700, 0x27bf, false, kNoBlock},
6462- {"Miscellaneous Mathematical Symbols A", 0x27c0, 0x27ef, false, kNoBlock},
6463- {"Supplemental Arrows A", 0x27f0, 0x27ff, false, kNoBlock},
6464- {"Braille Patterns", 0x2800, 0x28ff, false, kNoBlock},
6465- {"Supplemental Arrows B", 0x2900, 0x297f, false, kNoBlock},
6466- {"Miscellaneous Mathematical Symbols B", 0x2980, 0x29ff, false, kNoBlock},
6467- {"Supplemental Mathematical Operators", 0x2a00, 0x2aff, false, kNoBlock},
6468- {"Miscellaneous Symbols And Arrows", 0x2b00, 0x2bff, false, kNoBlock},
6469+ {"Miscellaneous mathematical symbols A", 0x27c0, 0x27ef, false, kNoBlock},
6470+ {"Supplemental arrows A", 0x27f0, 0x27ff, false, kNoBlock},
6471+ {"Braille patterns", 0x2800, 0x28ff, false, kNoBlock},
6472+ {"Supplemental arrows B", 0x2900, 0x297f, false, kNoBlock},
6473+ {"Miscellaneous mathematical symbols B", 0x2980, 0x29ff, false, kNoBlock},
6474+ {"Supplemental mathematical operators", 0x2a00, 0x2aff, false, kNoBlock},
6475+ {"Miscellaneous symbols and arrows", 0x2b00, 0x2bff, false, kNoBlock},
6476 {"Glagotic", 0x2c00, 0x2c5f, false, kNoBlock},
6477- {"Latin Extended C", 0x2c60, 0x2c7f, false, kNoBlock},
6478+ {"Latin extended C", 0x2c60, 0x2c7f, false, kNoBlock},
6479 {"Coptic", 0x2c80, 0x2cff, false, kNoBlock},
6480- {"Georgian Supplement", 0x2d00, 0x2d2f, false, kNoBlock},
6481+ {"Georgian supplement", 0x2d00, 0x2d2f, false, kNoBlock},
6482 {"Tifinagh", 0x2d30, 0x2d7f, false, kNoBlock},
6483- {"Ethiopic Extended", 0x2d80, 0x2ddf, false, kNoBlock},
6484- {"Cyrillic Extended A", 0x2de0, 0x2dff, false, kNoBlock},
6485- {"Supplement Punctuation", 0x2e00, 0x2e7f, false, kNoBlock},
6486- {"CJK Radicals Supplement", 0x2e80, 0x2eff, false, kNoBlock},
6487- {"Kangxi Radicals", 0x2f00, 0x2fdf, false, kNoBlock},
6488- {"Ideographic Description Characters", 0x2ff0, 0x2fff, false, kNoBlock},
6489- {"CJK Symbols and Punctuation", 0x3000, 0x303f, false, kNoBlock},
6490+ {"Ethiopic extended", 0x2d80, 0x2ddf, false, kNoBlock},
6491+ {"Cyrillic extended A", 0x2de0, 0x2dff, false, kNoBlock},
6492+ {"Supplement punctuation", 0x2e00, 0x2e7f, false, kNoBlock},
6493+ {"CJK radicals supplement", 0x2e80, 0x2eff, false, kNoBlock},
6494+ {"Kangxi radicals", 0x2f00, 0x2fdf, false, kNoBlock},
6495+ {"Ideographic description characters", 0x2ff0, 0x2fff, false, kNoBlock},
6496+ {"CJK symbols and punctuation", 0x3000, 0x303f, false, kNoBlock},
6497 {"Hiragana", 0x3040, 0x309f, false, kNoBlock},
6498 {"Katakana", 0x30a0, 0x30ff, false, kNoBlock},
6499 {"Bopomofo", 0x3100, 0x312f, false, kNoBlock},
6500- {"Hangul Compatibility Jamo", 0x3130, 0x318f, false, kNoBlock},
6501+ {"Hangul compatibility Jamo", 0x3130, 0x318f, false, kNoBlock},
6502 {"Kanbun", 0x3190, 0x319f, false, kNoBlock},
6503- {"Bopomofo Extended", 0x31a0, 0x31bf, false, kNoBlock},
6504- {"CJK Strokes", 0x31c0, 0x31ef, false, kNoBlock},
6505- {"Katakana Phonetic Extensions", 0x31f0, 0x31ff, false, kNoBlock},
6506- {"Enclosed CJK Letters and Months", 0x3200, 0x32ff, false, kNoBlock},
6507- {"CJK Compatibility", 0x3300, 0x33ff, false, kNoBlock},
6508- {"CJK Unified Ideographs Extension A", 0x3400, 0x4dbf, false, kNoBlock},
6509- {"Yijing Hexagram Symbols", 0x4dc0, 0x4dff, false, kNoBlock},
6510- {"CJK Unified Ideographs", 0x4e00, 0x9fff, false, kNoBlock},
6511- {"Yi Syllables", 0xa000, 0xa48f, false, kNoBlock},
6512+ {"Bopomofo extended", 0x31a0, 0x31bf, false, kNoBlock},
6513+ {"CJK strokes", 0x31c0, 0x31ef, false, kNoBlock},
6514+ {"Katakana phonetic extensions", 0x31f0, 0x31ff, false, kNoBlock},
6515+ {"Enclosed CJK letters and months", 0x3200, 0x32ff, false, kNoBlock},
6516+ {"CJK compatibility", 0x3300, 0x33ff, false, kNoBlock},
6517+ {"CJK unified ideographs extension A", 0x3400, 0x4dbf, false, kNoBlock},
6518+ {"Yijing hexagram symbols", 0x4dc0, 0x4dff, false, kNoBlock},
6519+ {"CJK unified ideographs", 0x4e00, 0x9fff, false, kNoBlock},
6520+ {"Yi syllables", 0xa000, 0xa48f, false, kNoBlock},
6521 {"Yi Radicals", 0xa490, 0xa4cf, false, kNoBlock},
6522 {"Vai", 0xa500, 0xa63f, false, kNoBlock},
6523- {"Cyrillic Extended B", 0xa640, 0xa69f, false, kNoBlock},
6524- {"Modifier Tone Letters", 0xa700, 0xa71f, false, kNoBlock},
6525- {"Latin Extended D", 0xa720, 0xa7ff, false, kNoBlock},
6526+ {"Cyrillic extended B", 0xa640, 0xa69f, false, kNoBlock},
6527+ {"Modifier tone letters", 0xa700, 0xa71f, false, kNoBlock},
6528+ {"Latin extended D", 0xa720, 0xa7ff, false, kNoBlock},
6529 {"Syloti Nagri", 0xa800, 0xa82f, false, kNoBlock},
6530 {"Phags-pa", 0xa840, 0xa87f, false, kNoBlock},
6531 {"Saurashtra", 0xa880, 0xa8df, false, kNoBlock},
6532 {"Kayah Li", 0xa900, 0xa92f, false, kNoBlock},
6533 {"Rejang", 0xa930, 0xa95f, false, kNoBlock},
6534 {"Cham", 0xaa00, 0xaa5f, false, kNoBlock},
6535- {"Hangul Syllables", 0xac00, 0xd7af, false, kNoBlock},
6536-// {"High Surrogates", 0xd800, 0xdb7f, false, kNoBlock},
6537-// {"High Private Use Surrogates", 0xdb80, 0xdbff, false, kNoBlock},
6538-// {"Low Surrogates", 0xdc00, 0xdfff, false, kNoBlock},
6539- {"Private Use Area", 0xe000, 0xf8ff, true, kNoBlock},
6540- {"CJK Compatibility Ideographs", 0xf900, 0xfaff, false, kNoBlock},
6541- {"Alphabetic Presentation Forms", 0xfb00, 0xfb4f, false, kNoBlock},
6542- {"Arabic Presentation Forms A", 0xfb50, 0xfdff, false, kNoBlock},
6543- {"Variation Selectors", 0xfe00, 0xfe0f, false, kNoBlock},
6544- {"Vertical Forms", 0xfe10, 0xfe1f, false, kNoBlock},
6545- {"Combining Half Marks", 0xfe20, 0xfe2f, false, kNoBlock},
6546- {"CJK Compatibility Forms", 0xfe30, 0xfe4f, false, kNoBlock},
6547- {"Small Form Variants", 0xfe50, 0xfe6f, false, kNoBlock},
6548- {"Arabic Presentation Forms B", 0xfe70, 0xfeff, false, kNoBlock},
6549- {"Halfwidth and Fullwidth Forms", 0xff00, 0xffef, false, kNoBlock},
6550+ {"Hangul syllables", 0xac00, 0xd7af, false, kNoBlock},
6551+// {"High surrogates", 0xd800, 0xdb7f, false, kNoBlock},
6552+// {"High private use surrogates", 0xdb80, 0xdbff, false, kNoBlock},
6553+// {"Low surrogates", 0xdc00, 0xdfff, false, kNoBlock},
6554+ {"Private use area", 0xe000, 0xf8ff, true, kNoBlock},
6555+ {"CJK compatibility ideographs", 0xf900, 0xfaff, false, kNoBlock},
6556+ {"Alphabetic presentation forms", 0xfb00, 0xfb4f, false, kNoBlock},
6557+ {"Arabic presentation forms A", 0xfb50, 0xfdff, false, kNoBlock},
6558+ {"Variation selectors", 0xfe00, 0xfe0f, false, kNoBlock},
6559+ {"Vertical forms", 0xfe10, 0xfe1f, false, kNoBlock},
6560+ {"Combining half marks", 0xfe20, 0xfe2f, false, kNoBlock},
6561+ {"CJK compatibility forms", 0xfe30, 0xfe4f, false, kNoBlock},
6562+ {"Small form variants", 0xfe50, 0xfe6f, false, kNoBlock},
6563+ {"Arabic presentation forms B", 0xfe70, 0xfeff, false, kNoBlock},
6564+ {"Halfwidth and fullwidth forms", 0xff00, 0xffef, false, kNoBlock},
6565 {"Specials", 0xfff0, 0xffff, false, kNoBlock},
6566- {"Linear B Syllabary", 0x010000, 0x01007f, false, kNoBlock},
6567- {"Linear B Ideograms", 0x010080, 0x0100ff, false, kNoBlock},
6568- {"Aegean Numbers", 0x010100, 0x01013f, false, kNoBlock},
6569- {"Ancient Greek Numbers", 0x010140, 0x01018f, false, kNoBlock},
6570- {"Ancient Symbols", 0x010190, 0x0101cf, false, kNoBlock},
6571- {"Phaistos Disc", 0x0101d0, 0x0101ff, false, kNoBlock},
6572+ {"Linear B syllabary", 0x010000, 0x01007f, false, kNoBlock},
6573+ {"Linear B ideograms", 0x010080, 0x0100ff, false, kNoBlock},
6574+ {"Aegean numbers", 0x010100, 0x01013f, false, kNoBlock},
6575+ {"Ancient Greek numbers", 0x010140, 0x01018f, false, kNoBlock},
6576+ {"Ancient smbols", 0x010190, 0x0101cf, false, kNoBlock},
6577+ {"Phaistos disc", 0x0101d0, 0x0101ff, false, kNoBlock},
6578 {"Lycian", 0x010280, 0x01029f, false, kNoBlock},
6579 {"Carian", 0x0102a0, 0x0102df, false, kNoBlock},
6580- {"Old Italic", 0x010300, 0x01032f, false, kNoBlock},
6581+ {"Old italic", 0x010300, 0x01032f, false, kNoBlock},
6582 {"Gothic", 0x010330, 0x01034f, false, kNoBlock},
6583 {"Ugaritic", 0x010380, 0x01039f, false, kNoBlock},
6584 {"Old Persian", 0x0103a0, 0x0103df, false, kNoBlock},
6585 {"Deseret", 0x010400, 0x01044f, false, kNoBlock},
6586 {"Shavian", 0x010450, 0x01047f, false, kNoBlock},
6587 {"Osmanya", 0x010480, 0x0104af, false, kNoBlock},
6588- {"Cypriot Syllabary", 0x010800, 0x01083f, false, kNoBlock},
6589+ {"Cypriot syllabary", 0x010800, 0x01083f, false, kNoBlock},
6590 {"Phoenician", 0x010900, 0x01091f, false, kNoBlock},
6591 {"Lydian", 0x010920, 0x01093f, false, kNoBlock},
6592 {"Kharoshthi", 0x010a00, 0x010a5f, false, kNoBlock},
6593 {"Cuneiform", 0x012000, 0x0123ff, false, kNoBlock},
6594- {"Cuneiform Numbers and Punctuation", 0x012400, 0x01247f, false, kNoBlock},
6595- {"Byzantine Musical Symbols", 0x01d000, 0x01d0ff, false, kNoBlock},
6596- {"Muscial Symbols", 0x01d100, 0x01d1ff, false, kNoBlock},
6597- {"Ancient Greek Musical Notation", 0x01d200, 0x01d24f, false, kNoBlock},
6598- {"Tai Xuan Jing Symbols", 0x01d300, 0x01d35f, false, kNoBlock},
6599- {"Counting Rod Numerals", 0x01d360, 0x01d37f, false, kNoBlock},
6600- {"Mathematical Alphanumeric Symbols", 0x01d400, 0x01d7ff, false, kNoBlock},
6601- {"Mahjong Tiles", 0x01f000, 0x01f02f, false, kNoBlock},
6602- {"Domino Tiles", 0x01f030, 0x01f09f, false, kNoBlock},
6603- {"CJK Unified Ideographs Extension B", 0x020000, 0x02a6df, false, kNoBlock},
6604- {"CJK Compatibility Ideographs Supplement", 0x02f800, 0x02fa1f, false,
6605+ {"Cuneiform numbers and punctuation", 0x012400, 0x01247f, false, kNoBlock},
6606+ {"Byzantine musical symbols", 0x01d000, 0x01d0ff, false, kNoBlock},
6607+ {"Muscial symbols", 0x01d100, 0x01d1ff, false, kNoBlock},
6608+ {"Ancient Greek musical notation", 0x01d200, 0x01d24f, false, kNoBlock},
6609+ {"Tai Xuan Jing symbols", 0x01d300, 0x01d35f, false, kNoBlock},
6610+ {"Counting rod numerals", 0x01d360, 0x01d37f, false, kNoBlock},
6611+ {"Mathematical alphanumeric symbols", 0x01d400, 0x01d7ff, false, kNoBlock},
6612+ {"Mahjong tiles", 0x01f000, 0x01f02f, false, kNoBlock},
6613+ {"Domino tiles", 0x01f030, 0x01f09f, false, kNoBlock},
6614+ {"CJK unified ideographs extension B", 0x020000, 0x02a6df, false, kNoBlock},
6615+ {"CJK compatibility ideographs Supplement", 0x02f800, 0x02fa1f, false,
6616 kNoBlock},
6617 {"Tags", 0x0e0000, 0x0e007f, false, kNoBlock},
6618- {"Variation Selectors Supplement", 0x0e0100, 0x0e01ef, false, kNoBlock},
6619- {"Supplementary Private Use Area A", 0x0f0000, 0x0fffff, true, kNoBlock},
6620- {"Supplementary Private Use Area B", 0x100000, 0x10ffff, true, kNoBlock},
6621+ {"Variation selectors supplement", 0x0e0100, 0x0e01ef, false, kNoBlock},
6622+ {"Supplementary private use area A", 0x0f0000, 0x0fffff, true, kNoBlock},
6623+ {"Supplementary private use area B", 0x100000, 0x10ffff, true, kNoBlock},
6624 };
6625
6626 const uint32 kNumUnicodeBlocks
6627Index: src/apps/charactermap/CharacterView.cpp
6628===================================================================
6629--- src/apps/charactermap/CharacterView.cpp (Revision 34761)
6630+++ src/apps/charactermap/CharacterView.cpp (Arbeitskopie)
6631@@ -250,11 +250,11 @@
6632
6633 BMessage* message = new BMessage(B_COPY);
6634 message->AddInt32("character", fCurrentCharacter);
6635- menu->AddItem(new BMenuItem("Copy Character", message, 'C'));
6636+ menu->AddItem(new BMenuItem("Copy character", message, 'C'));
6637
6638 message = new BMessage(kMsgCopyAsEscapedString);
6639 message->AddInt32("character", fCurrentCharacter);
6640- menu->AddItem(new BMenuItem("Copy As Escaped Byte String",
6641+ menu->AddItem(new BMenuItem("Copy as escaped byte string",
6642 message, 'C', B_SHIFT_KEY));
6643
6644 menu->SetTargetForItems(this);
6645Index: src/apps/charactermap/CharacterMap.cpp
6646===================================================================
6647--- src/apps/charactermap/CharacterMap.cpp (Revision 34761)
6648+++ src/apps/charactermap/CharacterMap.cpp (Arbeitskopie)
6649@@ -56,7 +56,7 @@
6650 {
6651 BAlert *alert = new BAlert("about", "CharacterMap\n"
6652 "\twritten by Axel Dörfler\n"
6653- "\tCopyright 2009, Haiku Inc.\n", "Ok");
6654+ "\tCopyright 2009, Haiku Inc.\n", "OK");
6655 BTextView *view = alert->TextView();
6656 BFont font;
6657
6658Index: src/apps/installer/InstallerApp.cpp
6659===================================================================
6660--- src/apps/installer/InstallerApp.cpp (Revision 34761)
6661+++ src/apps/installer/InstallerApp.cpp (Arbeitskopie)
6662@@ -52,7 +52,7 @@
6663 "1) If you are installing Haiku onto real hardware (not inside an emulator) "
6664 "it is recommended that you have already prepared a hard disk partition. The "
6665 "Installer and the DriveSetup tool offer to initialize existing partitions "
6666-"with the Haiku native filesystem, but the options to change the actual "
6667+"with the Haiku native file system, but the options to change the actual "
6668 "partition layout may not have been tested on a sufficiently great variety of "
6669 "computer installations so we do not recommend using it.\n"
6670 "If you have not created a partition yet, simply reboot, create the partition "
6671@@ -130,7 +130,7 @@
6672 {
6673 BAlert *alert = new BAlert("about", "Installer\n"
6674 "\twritten by Jérôme Duval\n"
6675- "\tCopyright 2005, Haiku.\n\n", "Ok");
6676+ "\tCopyright 2005, Haiku.\n\n", "OK");
6677 BTextView *view = alert->TextView();
6678 BFont font;
6679
6680Index: src/apps/installer/WorkerThread.cpp
6681===================================================================
6682--- src/apps/installer/WorkerThread.cpp (Revision 34761)
6683+++ src/apps/installer/WorkerThread.cpp (Arbeitskopie)
6684@@ -392,7 +392,7 @@
6685 "merged, whereas files and links that exist on both the source "
6686 "and target volume will be overwritten with the source volume "
6687 "version.",
6688- "Install Anyway", "Cancel", 0,
6689+ "Install anyway", "Cancel", 0,
6690 B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) {
6691 // TODO: Would be cool to offer the option here to clean additional
6692 // folders at the user's choice (like /boot/common and /boot/develop).
6693Index: src/apps/installer/InstallerWindow.cpp
6694===================================================================
6695--- src/apps/installer/InstallerWindow.cpp (Revision 34761)
6696+++ src/apps/installer/InstallerWindow.cpp (Arbeitskopie)
6697@@ -173,8 +173,8 @@
6698 fDestMenuField->SetAlignment(B_ALIGN_RIGHT);
6699
6700 fPackagesSwitch = new PaneSwitch("options_button");
6701- fPackagesSwitch->SetLabels("Hide Optional Packages",
6702- "Show Optional Packages");
6703+ fPackagesSwitch->SetLabels("Hide optional packages",
6704+ "Show optional packages");
6705 fPackagesSwitch->SetMessage(new BMessage(SHOW_BOTTOM_MESSAGE));
6706 fPackagesSwitch->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
6707 B_SIZE_UNSET));
6708@@ -193,7 +193,7 @@
6709 fSizeView->SetExplicitAlignment(
6710 BAlignment(B_ALIGN_RIGHT, B_ALIGN_MIDDLE));
6711
6712- fProgressBar = new BStatusBar("progress", "Install Progress: ");
6713+ fProgressBar = new BStatusBar("progress", "Install progress: ");
6714 fProgressBar->SetMaxValue(100.0);
6715
6716 fBeginButton = new BButton("begin_button", "Begin",
6717@@ -205,7 +205,7 @@
6718 "Set up partitions" B_UTF8_ELLIPSIS, new BMessage(SETUP_MESSAGE));
6719
6720 fMakeBootableButton = new BButton("makebootable_button",
6721- "Write Boot Sector", new BMessage(MSG_WRITE_BOOT_SECTOR));
6722+ "Write boot sector", new BMessage(MSG_WRITE_BOOT_SECTOR));
6723 fMakeBootableButton->SetEnabled(false);
6724
6725 SetLayout(new BGroupLayout(B_HORIZONTAL));
6726@@ -305,7 +305,7 @@
6727 snprintf(errorMessage, sizeof(errorMessage), "An error was "
6728 "encountered and the installation was not completed:\n\n"
6729 "Error: %s", strerror(error));
6730- (new BAlert("error", errorMessage, "Ok"))->Go();
6731+ (new BAlert("error", errorMessage, "OK"))->Go();
6732 }
6733
6734 _DisableInterface(false);
6735@@ -383,8 +383,8 @@
6736 {
6737 (new BAlert("use drive setup", "No partitions have been found that "
6738 "are suitable for installation. Please set up partitions and "
6739- "initialize at least one partition with the Be File System." ,
6740- "Ok"))->Go();
6741+ "initialize at least one partition with the Be file system." ,
6742+ "OK"))->Go();
6743 }
6744 case MSG_STATUS_MESSAGE:
6745 {
6746@@ -482,7 +482,7 @@
6747 if (fDriveSetupLaunched) {
6748 (new BAlert("driveSetup",
6749 "Please close the DriveSetup window before closing the "
6750- "Installer window.", "Ok"))->Go();
6751+ "Installer window.", "OK"))->Go();
6752 return false;
6753 }
6754 _QuitCopyEngine(false);
6755@@ -522,7 +522,7 @@
6756 if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) != B_OK) {
6757 BAlert* alert = new BAlert("error", "DriveSetup, the application "
6758 "to configure disk partitions, could not be launched.",
6759- "Ok");
6760+ "OK");
6761 alert->Go();
6762 }
6763 }
6764@@ -599,7 +599,7 @@
6765 if (fDestMenu->CountItems() == 0)
6766 label = "<none>";
6767 else
6768- label = "Please Choose Target";
6769+ label = "Please choose target";
6770 }
6771 fDestMenuField->MenuItem()->SetLabel(label.String());
6772
6773@@ -624,7 +624,7 @@
6774 fBeginButton->SetEnabled(srcItem && dstItem);
6775
6776 // adjust "Write Boot Sector" button
6777- label = "Write Boot Sector";
6778+ label = "Write boot sector";
6779 if (dstItem)
6780 label << " to \'" <<dstItem->Name() << '\'';
6781 fMakeBootableButton->SetEnabled(dstItem);
6782Index: src/apps/bootman/BootManager.cpp
6783===================================================================
6784--- src/apps/bootman/BootManager.cpp (Revision 34761)
6785+++ src/apps/bootman/BootManager.cpp (Arbeitskopie)
6786@@ -1,5 +1,5 @@
6787 /*
6788- * Copyright 2008, Haiku, Inc. All rights reserved.
6789+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6790 * Distributed under the terms of the MIT License.
6791 *
6792 * Authors:
6793@@ -46,7 +46,7 @@
6794 {
6795 BAlert *alert = new BAlert("about", "Haiku Boot Manager\n\n"
6796 "\twritten by Michael Pfeiffer\n"
6797- "\tCopyright 2008, Haiku Inc.\n", "Ok");
6798+ "\tCopyright 2008, Haiku Inc.\n", "OK");
6799 BTextView *view = alert->TextView();
6800 BFont font;
6801
6802Index: src/apps/bootman/EntryPage.cpp
6803===================================================================
6804--- src/apps/bootman/EntryPage.cpp (Revision 34761)
6805+++ src/apps/bootman/EntryPage.cpp (Arbeitskopie)
6806@@ -1,5 +1,5 @@
6807 /*
6808- * Copyright 2008, Haiku, Inc. All rights reserved.
6809+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6810 * Distributed under the terms of the MIT License.
6811 *
6812 * Authors:
6813@@ -60,7 +60,7 @@
6814 textRect.left = fInstall->Frame().right + kTextDistance;
6815
6816 fInstallText = CreateDescription(textRect, "installText",
6817- "Install Boot Menu\n\n"
6818+ "Install boot menu\n\n"
6819 "Choose this option to install a boot menu, "
6820 "allowing you to select which operating "
6821 "system to boot when you turn on your "
6822@@ -75,7 +75,7 @@
6823 fUninstall->ResizeToPreferred();
6824
6825 fUninstallText = CreateDescription(textRect, "uninstallText",
6826- "Uninstall Boot Menu\n\n"
6827+ "Uninstall boot menu\n\n"
6828 "Choose this option to remove the boot menu "
6829 "previously installed by this program.\n"
6830 );
6831Index: src/apps/bootman/BootManagerController.cpp
6832===================================================================
6833--- src/apps/bootman/BootManagerController.cpp (Revision 34761)
6834+++ src/apps/bootman/BootManagerController.cpp (Arbeitskopie)
6835@@ -1,5 +1,5 @@
6836 /*
6837- * Copyright 2008, Haiku, Inc. All rights reserved.
6838+ * Copyright 2008-2009, Haiku, Inc. All rights reserved.
6839 * Distributed under the terms of the MIT License.
6840 *
6841 * Authors:
6842@@ -162,7 +162,7 @@
6843 BootManagerController::_WriteBootMenu()
6844 {
6845 BAlert* alert = new BAlert("confirm", "About to write the boot menu "
6846- "to disk. Are you sure you want to continue?", "Write Boot Menu", "Back",
6847+ "to disk. Are you sure you want to continue?", "Write boot menu", "Back",
6848 NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT);
6849
6850 if (alert->Go() == 1)
6851@@ -269,13 +269,13 @@
6852
6853 if (fReadPartitionsStatus == kErrorBootSectorTooSmall)
6854 description <<
6855- "Partition Table Not Compatible\n\n"
6856+ "Partition table not compatible\n\n"
6857 "The partition table of the first hard disk is not compatible "
6858 "with Boot Manager.\n"
6859 "Boot Manager needs 2 KB available space before the first partition.";
6860 else
6861 description <<
6862- "Error Reading Partition Table\n\n"
6863+ "Error reading partition table\n\n"
6864 "Boot Manager is unable to read the partition table!";
6865
6866 return new DescriptionPage(frame, "errorEntry", description.String(), true);
6867@@ -313,12 +313,12 @@
6868
6869 if (fSaveMBRStatus == B_OK) {
6870 description <<
6871- "Old Master Boot Record Saved\n\n"
6872+ "Old Master Boot Record saved\n\n"
6873 "The old Master Boot Record was successfully save to "
6874 << file << ".\n";
6875 } else {
6876 description <<
6877- "Old Master Boot Record Saved Failure\n\n"
6878+ "Old Master Boot Record saved failure\n\n"
6879 "The old Master Boot Record could not be saved to "
6880 << file << ".\n";
6881 }
6882@@ -364,11 +364,11 @@
6883 const char* description;
6884
6885 if (fWriteBootMenuStatus == B_OK) {
6886- description = "Installation Boot Menu Completed\n\n"
6887+ description = "Installation of boot menu completed\n\n"
6888 "The boot manager has been successfully installed "
6889 "on your system.";
6890 } else {
6891- description = "Installation Boot Menu Failed\n\n"
6892+ description = "Installation of boot menu failed\n\n"
6893 "An error occured writing the boot menu. The Master Boot Record "
6894 "might be destroyed, you should restore the MBR now!";
6895 }
6896@@ -404,13 +404,13 @@
6897
6898 if (fRestoreMBRStatus == B_OK) {
6899 description <<
6900- "Uninstallation Boot Menu Completed\n\n"
6901+ "Uninstallation of boot menu completed\n\n"
6902 "The Master Boot Record of the boot device "
6903 "(" << disk << ") has been successfully restored from "
6904 << file << ".";
6905 } else {
6906 description <<
6907- "Uninstallation Boot Menu Failed\n\n"
6908+ "Uninstallation of boot menu failed\n\n"
6909 "The Master Boot Record could not be restored!";
6910 }
6911
6912Index: src/apps/powerstatus/ExtendedInfoWindow.cpp
6913===================================================================
6914--- src/apps/powerstatus/ExtendedInfoWindow.cpp (Revision 34761)
6915+++ src/apps/powerstatus/ExtendedInfoWindow.cpp (Arbeitskopie)
6916@@ -132,7 +132,7 @@
6917 else if (fBatteryInfo.state & BATTERY_DISCHARGING)
6918 fontString->string = "Battery discharging";
6919 else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE)
6920- fontString->string = "Empty Battery Slot";
6921+ fontString->string = "Empty battery slot";
6922 else
6923 fontString->string = "Battery unused";
6924
6925@@ -143,13 +143,13 @@
6926 _AddToStringList(fontString);
6927
6928 fontString = new FontString;
6929- fontString->string = "Last full Charge: ";
6930+ fontString->string = "Last full charge: ";
6931 fontString->string << fBatteryInfo.full_capacity;
6932 fontString->string << powerUnit;
6933 _AddToStringList(fontString);
6934
6935 fontString = new FontString;
6936- fontString->string = "Current Rate: ";
6937+ fontString->string = "Current rate: ";
6938 fontString->string << fBatteryInfo.current_rate;
6939 fontString->string << rateUnit;
6940 _AddToStringList(fontString);
6941@@ -159,7 +159,7 @@
6942 _AddToStringList(fontString);
6943
6944 fontString = new FontString;
6945- fontString->string = "Design Capacity: ";
6946+ fontString->string = "Design capacity: ";
6947 fontString->string << fBatteryExtendedInfo.design_capacity;
6948 fontString->string << powerUnit;
6949 _AddToStringList(fontString);
6950@@ -175,37 +175,37 @@
6951 _AddToStringList(fontString);
6952
6953 fontString = new FontString;
6954- fontString->string = "Design Voltage: ";
6955+ fontString->string = "Design voltage: ";
6956 fontString->string << fBatteryExtendedInfo.design_voltage;
6957 fontString->string << " mV";
6958 _AddToStringList(fontString);
6959
6960 fontString = new FontString;
6961- fontString->string = "Design Capacity Warning: ";
6962+ fontString->string = "Design capacity warning: ";
6963 fontString->string << fBatteryExtendedInfo.design_capacity_warning;
6964 fontString->string << powerUnit;
6965 _AddToStringList(fontString);
6966
6967 fontString = new FontString;
6968- fontString->string = "Design Capacity low Warning: ";
6969+ fontString->string = "Design capacity low warning: ";
6970 fontString->string << fBatteryExtendedInfo.design_capacity_low;
6971 fontString->string << powerUnit;
6972 _AddToStringList(fontString);
6973
6974 fontString = new FontString;
6975- fontString->string = "Capacity Granularity 1: ";
6976+ fontString->string = "Capacity granularity 1: ";
6977 fontString->string << fBatteryExtendedInfo.capacity_granularity_1;
6978 fontString->string << powerUnit;
6979 _AddToStringList(fontString);
6980
6981 fontString = new FontString;
6982- fontString->string = "Capacity Granularity 2: ";
6983+ fontString->string = "Capacity granularity 2: ";
6984 fontString->string << fBatteryExtendedInfo.capacity_granularity_2;
6985 fontString->string << powerUnit;
6986 _AddToStringList(fontString);
6987
6988 fontString = new FontString;
6989- fontString->string = "Model Number: ";
6990+ fontString->string = "Model number: ";
6991 fontString->string << fBatteryExtendedInfo.model_number;
6992 _AddToStringList(fontString);
6993
6994@@ -220,7 +220,7 @@
6995 _AddToStringList(fontString);
6996
6997 fontString = new FontString;
6998- fontString->string = "OEM Info: ";
6999+ fontString->string = "OEM info: ";
7000 fontString->string += fBatteryExtendedInfo.oem_info;
7001 _AddToStringList(fontString);
7002
7003@@ -325,7 +325,7 @@
7004
7005 ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface)
7006 :
7007- BWindow(BRect(100, 150, 500, 500), "Extended Battery Info", B_TITLED_WINDOW,
7008+ BWindow(BRect(100, 150, 500, 500), "Extended battery info", B_TITLED_WINDOW,
7009 B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AVOID_FRONT |
7010 B_ASYNCHRONOUS_CONTROLS),
7011 fDriverInterface(interface),
7012@@ -344,8 +344,8 @@
7013
7014 BRect rect = Bounds();
7015 rect.InsetBy(5, 5);
7016- BBox *infoBox = new BBox(rect, "Power Status Box");
7017- infoBox->SetLabel("Battery Info");
7018+ BBox *infoBox = new BBox(rect, "Power status box");
7019+ infoBox->SetLabel("Battery info");
7020 BGroupLayout* infoLayout = new BGroupLayout(B_HORIZONTAL);
7021 infoLayout->SetInsets(10, infoBox->TopBorderOffset() * 2 + 10, 10, 10);
7022 infoLayout->SetSpacing(10);
7023Index: src/apps/powerstatus/PowerStatusView.cpp
7024===================================================================
7025--- src/apps/powerstatus/PowerStatusView.cpp (Revision 34761)
7026+++ src/apps/powerstatus/PowerStatusView.cpp (Arbeitskopie)
7027@@ -570,19 +570,19 @@
7028 menu->SetFont(be_plain_font);
7029
7030 BMenuItem* item;
7031- menu->AddItem(item = new BMenuItem("Show Text Label",
7032+ menu->AddItem(item = new BMenuItem("Show text label",
7033 new BMessage(kMsgToggleLabel)));
7034 if (fShowLabel)
7035 item->SetMarked(true);
7036- menu->AddItem(item = new BMenuItem("Show Status Icon",
7037+ menu->AddItem(item = new BMenuItem("Show status icon",
7038 new BMessage(kMsgToggleStatusIcon)));
7039 if (fShowStatusIcon)
7040 item->SetMarked(true);
7041- menu->AddItem(new BMenuItem(!fShowTime ? "Show Time" : "Show Percent",
7042+ menu->AddItem(new BMenuItem(!fShowTime ? "Show time" : "Show percent",
7043 new BMessage(kMsgToggleTime)));
7044
7045 menu->AddSeparatorItem();
7046- menu->AddItem(new BMenuItem("Battery Info" B_UTF8_ELLIPSIS,
7047+ menu->AddItem(new BMenuItem("Battery info" B_UTF8_ELLIPSIS,
7048 new BMessage(kMsgToggleExtInfo)));
7049
7050 menu->AddSeparatorItem();
7051@@ -601,7 +601,7 @@
7052 {
7053 BAlert* alert = new BAlert("about", "PowerStatus\n"
7054 "written by Axel Dörfler, Clemens Zeidler\n"
7055- "Copyright 2006, Haiku, Inc.\n", "Ok");
7056+ "Copyright 2006, Haiku, Inc.\n", "OK");
7057 BTextView *view = alert->TextView();
7058 BFont font;
7059
7060Index: src/apps/webwatch/WatchView.cpp
7061===================================================================
7062--- src/apps/webwatch/WatchView.cpp (Revision 34761)
7063+++ src/apps/webwatch/WatchView.cpp (Arbeitskopie)
7064@@ -1,5 +1,6 @@
7065 /*
7066- * Copyright (c) 1999-2003 Matthijs Hollemans
7067+ * Copyright (c) 1999-2003, Matthijs Hollemans
7068+ * Copyright (c) 2009, Haiku, Inc. All rights reserved.
7069 *
7070 * Permission is hereby granted, free of charge, to any person obtaining a
7071 * copy of this software and associated documentation files (the "Software"),
7072@@ -151,11 +152,11 @@
7073 (new BAlert(
7074 NULL,
7075 "WebWatch " VERSION
7076- "\nAn Internet Time clock for your Deskbar\n\n"
7077+ "\nAn internet time clock for your Deskbar\n\n"
7078 "Created by Matthijs Hollemans\n"
7079 "mahlzeit@users.sourceforge.net\n\n"
7080 "Thanks to Jason Parks for his help.\n",
7081- "Okay"))->Go(NULL);
7082+ "OK"))->Go(NULL);
7083 }
7084
7085 ////////////////////////////////////////////////////////////////////////////////
7086Index: src/apps/deskcalc/CalcView.cpp
7087===================================================================
7088--- src/apps/deskcalc/CalcView.cpp (Revision 34761)
7089+++ src/apps/deskcalc/CalcView.cpp (Arbeitskopie)
7090@@ -1,5 +1,5 @@
7091 /*
7092- * Copyright 2006 Haiku, Inc. All Rights Reserved.
7093+ * Copyright 2006-2009 Haiku, Inc. All rights reserved.
7094 * Copyright 1997, 1998 R3 Software Ltd. All Rights Reserved.
7095 * Distributed under the terms of the MIT License.
7096 *
7097@@ -687,7 +687,7 @@
7098 "written by Timothy Wayper,\nStephan Aßmus and Ingo Weinhold\n\n"
7099 B_UTF8_COPYRIGHT"1997, 1998 R3 Software Ltd.\n"
7100 B_UTF8_COPYRIGHT"2006-2009 Haiku, Inc.\n\n"
7101- "All Rights Reserved.", "Cool");
7102+ "All Rights Reserved.", "OK");
7103 alert->Go(NULL);
7104 }
7105
7106@@ -1098,13 +1098,13 @@
7107 CalcView::_CreatePopUpMenu()
7108 {
7109 // construct items
7110- fAutoNumlockItem = new BMenuItem("Enable Num Lock on start up",
7111+ fAutoNumlockItem = new BMenuItem("Enable Num Lock on startup",
7112 new BMessage(MSG_OPTIONS_AUTO_NUM_LOCK));
7113 fAudioFeedbackItem = new BMenuItem("Audio Feedback",
7114 new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK));
7115- fShowKeypadItem = new BMenuItem("Show Keypad",
7116+ fShowKeypadItem = new BMenuItem("Show keypad",
7117 new BMessage(MSG_OPTIONS_SHOW_KEYPAD));
7118- fAboutItem = new BMenuItem("About DeskCalc",
7119+ fAboutItem = new BMenuItem("About DeskCalc" B_UTF8_ELLIPSIS,
7120 new BMessage(B_ABOUT_REQUESTED));
7121
7122 // apply current settings
7123Index: src/apps/fontdemo/ControlView.cpp
7124===================================================================
7125--- src/apps/fontdemo/ControlView.cpp (Revision 34761)
7126+++ src/apps/fontdemo/ControlView.cpp (Arbeitskopie)
7127@@ -1,5 +1,5 @@
7128 /*
7129- * Copyright 2006, Haiku, Inc. All Rights Reserved.
7130+ * Copyright 2006-2009, Haiku, Inc. All rights reserved.
7131 * Distributed under the terms of the MIT License.
7132 *
7133 * Authors:
7134@@ -108,7 +108,7 @@
7135 AddChild(fOutlineSlider);
7136
7137 rect.OffsetBy(0.0, offsetX);
7138- fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Anti-aliased text",
7139+ fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Antialiased text",
7140 new BMessage(ALIASING_MSG));
7141 fAliasingCheckBox->SetValue(B_CONTROL_ON);
7142 AddChild(fAliasingCheckBox);
7143@@ -164,7 +164,7 @@
7144 AddChild(fBoundingboxesCheckBox);
7145
7146 rect.OffsetBy(0.0, 22.0);
7147- fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle Fonts",
7148+ fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle fonts",
7149 new BMessage(CYCLING_FONTS_MSG));
7150 AddChild(fCyclingFontButton);
7151
7152@@ -302,7 +302,7 @@
7153
7154 case CYCLING_FONTS_MSG:
7155 {
7156- fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle Fonts" : "Stop Cycling");
7157+ fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle fonts" : "Stop cycling");
7158 fCycleFonts = !fCycleFonts;
7159
7160 if (fCycleFonts) {
7161Index: src/apps/deskbar/BeMenu.cpp
7162===================================================================
7163--- src/apps/deskbar/BeMenu.cpp (Revision 34761)
7164+++ src/apps/deskbar/BeMenu.cpp (Arbeitskopie)
7165@@ -4,6 +4,7 @@
7166 Terms and Conditions
7167
7168 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7169+Copyright (c) 2009, Haiku, Inc. All rights reserved.
7170
7171 Permission is hereby granted, free of charge, to any person obtaining a copy of
7172 this software and associated documentation files (the "Software"), to deal in
7173@@ -149,8 +150,8 @@
7174
7175 TrackingHookData* data = fBarView->GetTrackingHookData();
7176 if (fAddState == kAddingRecents) {
7177- const char* recentTitle[] = {"Recent Documents", "Recent Folders",
7178- "Recent Applications"};
7179+ const char* recentTitle[] = {"Recent documents", "Recent folders",
7180+ "Recent applications"};
7181 const int recentType[] = {kRecentDocuments, kRecentFolders,
7182 kRecentApplications};
7183 const int recentTypes = 3;
7184@@ -225,7 +226,7 @@
7185 #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
7186 "About Haiku"
7187 #else
7188- "About This System"
7189+ "About this system"
7190 #endif
7191 B_UTF8_ELLIPSIS, new BMessage(kShowSplash));
7192 item->SetEnabled(!dragging);
7193@@ -240,7 +241,7 @@
7194 item->SetEnabled(!dragging);
7195 AddItem(item);
7196
7197- item = new BMenuItem("Show Replicants", new BMessage(kToggleDraggers));
7198+ item = new BMenuItem("Show replicants", new BMessage(kToggleDraggers));
7199 item->SetEnabled(!dragging);
7200 item->SetMarked(BDragger::AreDraggersDrawn());
7201 AddItem(item);
7202@@ -251,7 +252,7 @@
7203 AddItem(mountMenu);
7204 #endif
7205
7206- item = new BMenuItem("Deskbar Preferences" B_UTF8_ELLIPSIS,
7207+ item = new BMenuItem("Deskbar preferences" B_UTF8_ELLIPSIS,
7208 new BMessage(kConfigShow));
7209 item->SetTarget(be_app);
7210 AddItem(item);
7211@@ -260,7 +261,7 @@
7212
7213 BMenu* shutdownMenu = new BMenu("Shutdown" B_UTF8_ELLIPSIS);
7214
7215- item = new BMenuItem("Restart System", new BMessage(kRebootSystem));
7216+ item = new BMenuItem("Restart system", new BMessage(kRebootSystem));
7217 item->SetEnabled(!dragging);
7218 shutdownMenu->AddItem(item);
7219
7220@@ -272,7 +273,7 @@
7221 }
7222 #endif
7223
7224- item = new BMenuItem("Power Off", new BMessage(kShutdownSystem));
7225+ item = new BMenuItem("Power off", new BMessage(kShutdownSystem));
7226 item->SetEnabled(!dragging);
7227 shutdownMenu->AddItem(item);
7228 shutdownMenu->SetFont(be_plain_font);
7229Index: src/apps/deskbar/TimeView.cpp
7230===================================================================
7231--- src/apps/deskbar/TimeView.cpp (Revision 34761)
7232+++ src/apps/deskbar/TimeView.cpp (Arbeitskopie)
7233@@ -4,6 +4,7 @@
7234 Terms and Conditions
7235
7236 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7237+Copyright (c) 2009, Haiku, Inc. All rights reserved.
7238
7239 Permission is hereby granted, free of charge, to any person obtaining a copy of
7240 this software and associated documentation files (the "Software"), to deal in
7241@@ -558,14 +559,14 @@
7242 menu->SetFont(be_plain_font);
7243 BMenuItem* item;
7244
7245- item = new BMenuItem("Change Time" B_UTF8_ELLIPSIS,
7246+ item = new BMenuItem("Change time" B_UTF8_ELLIPSIS,
7247 new BMessage(kChangeClock));
7248 menu->AddItem(item);
7249
7250- item = new BMenuItem("Hide Time", new BMessage('time'));
7251+ item = new BMenuItem("Hide time", new BMessage('time'));
7252 menu->AddItem(item);
7253
7254- item = new BMenuItem("Show Calendar" B_UTF8_ELLIPSIS,
7255+ item = new BMenuItem("Show calendar" B_UTF8_ELLIPSIS,
7256 new BMessage(kShowCalendar));
7257 menu->AddItem(item);
7258
7259Index: src/apps/deskbar/WindowMenu.cpp
7260===================================================================
7261--- src/apps/deskbar/WindowMenu.cpp (Revision 34761)
7262+++ src/apps/deskbar/WindowMenu.cpp (Arbeitskopie)
7263@@ -4,6 +4,7 @@
7264 Terms and Conditions
7265
7266 Copyright (c) 1991-2000, Be Incorporated. All rights reserved.
7267+Copyright (c) 2009, Haiku, Inc.
7268
7269 Permission is hereby granted, free of charge, to any person obtaining a copy of
7270 this software and associated documentation files (the "Software"), to deal in
7271@@ -173,7 +174,7 @@
7272 int32 itemCount = CountItems() + parentMenuItems;
7273 if (itemCount < 1) {
7274 TWindowMenuItem* noWindowsItem =
7275- new TWindowMenuItem("No Windows", -1, false, false);
7276+ new TWindowMenuItem("No windows", -1, false, false);
7277
7278 noWindowsItem->SetEnabled(false);
7279
7280@@ -183,7 +184,7 @@
7281 // it. (but we only add this option if the application is not Tracker.)
7282 if (fApplicationSignature.ICompare(kTrackerSignature) != 0) {
7283 AddSeparatorItem();
7284- AddItem(new TShowHideMenuItem("Quit Application", fTeam,
7285+ AddItem(new TShowHideMenuItem("Quit application", fTeam,
7286 B_QUIT_REQUESTED));
7287 }
7288 } else {
7289@@ -191,11 +192,11 @@
7290 // to the menu
7291 if (!dragging) {
7292 TShowHideMenuItem* hide =
7293- new TShowHideMenuItem("Hide All", fTeam, B_MINIMIZE_WINDOW);
7294+ new TShowHideMenuItem("Hide all", fTeam, B_MINIMIZE_WINDOW);
7295 TShowHideMenuItem* show =
7296- new TShowHideMenuItem("Show All", fTeam, B_BRING_TO_FRONT);
7297+ new TShowHideMenuItem("Show all", fTeam, B_BRING_TO_FRONT);
7298 TShowHideMenuItem* close =
7299- new TShowHideMenuItem("Close All", fTeam, B_QUIT_REQUESTED);
7300+ new TShowHideMenuItem("Close all", fTeam, B_QUIT_REQUESTED);
7301
7302 if (miniCount == itemCount)
7303 hide->SetEnabled(false);
7304Index: src/apps/deskbar/PreferencesWindow.cpp
7305===================================================================
7306--- src/apps/deskbar/PreferencesWindow.cpp (Revision 34761)
7307+++ src/apps/deskbar/PreferencesWindow.cpp (Arbeitskopie)
7308@@ -24,15 +24,15 @@
7309
7310 PreferencesWindow::PreferencesWindow(BRect frame)
7311 :
7312- BWindow(frame, "Deskbar Preferences", B_TITLED_WINDOW,
7313+ BWindow(frame, "Deskbar preferences", B_TITLED_WINDOW,
7314 B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE)
7315 {
7316 // Controls
7317- fMenuRecentDocuments = new BCheckBox("Recent Documents:",
7318+ fMenuRecentDocuments = new BCheckBox("Recent documents:",
7319 new BMessage(kUpdateRecentCounts));
7320- fMenuRecentApplications = new BCheckBox("Recent Applications:",
7321+ fMenuRecentApplications = new BCheckBox("Recent applications:",
7322 new BMessage(kUpdateRecentCounts));
7323- fMenuRecentFolders = new BCheckBox("Recent Folders:",
7324+ fMenuRecentFolders = new BCheckBox("Recent folders:",
7325 new BMessage(kUpdateRecentCounts));
7326
7327 fMenuRecentDocumentCount = new BTextControl(NULL, NULL,
7328@@ -42,23 +42,23 @@
7329 fMenuRecentFolderCount = new BTextControl(NULL, NULL,
7330 new BMessage(kUpdateRecentCounts));
7331
7332- fAppsSort = new BCheckBox("Sort Running Applications",
7333+ fAppsSort = new BCheckBox("Sort running applications",
7334 new BMessage(kSortRunningApps));
7335- fAppsSortTrackerFirst = new BCheckBox("Tracker Always First",
7336+ fAppsSortTrackerFirst = new BCheckBox("Tracker always first",
7337 new BMessage(kTrackerFirst));
7338- fAppsShowExpanders = new BCheckBox("Show Application Expander",
7339+ fAppsShowExpanders = new BCheckBox("Show application expander",
7340 new BMessage(kSuperExpando));
7341- fAppsExpandNew = new BCheckBox("Expand New Applications",
7342+ fAppsExpandNew = new BCheckBox("Expand new applications",
7343 new BMessage(kExpandNewTeams));
7344
7345- fClock24Hours = new BCheckBox("24 Hour Clock", new BMessage(kMilTime));
7346- fClockSeconds = new BCheckBox("Show Seconds",
7347+ fClock24Hours = new BCheckBox("24 hour clock", new BMessage(kMilTime));
7348+ fClockSeconds = new BCheckBox("Show seconds",
7349 new BMessage(kShowSeconds));
7350- fClockEuropeanDate = new BCheckBox("European Date",
7351+ fClockEuropeanDate = new BCheckBox("European date",
7352 new BMessage(kEuroDate));
7353- fClockFullDate = new BCheckBox("Full Date", new BMessage(kFullDate));
7354+ fClockFullDate = new BCheckBox("Full date", new BMessage(kFullDate));
7355
7356- fWindowAlwaysOnTop = new BCheckBox("Always On Top",
7357+ fWindowAlwaysOnTop = new BCheckBox("Always on top",
7358 new BMessage(kAlwaysTop));
7359 fWindowAutoRaise = new BCheckBox("Auto-raise", new BMessage(kAutoRaise));
7360
7361@@ -183,7 +183,7 @@
7362 .Add(fMenuRecentApplicationCount)
7363 .End()
7364 .End()
7365- .Add(new BButton("Edit Menu" B_UTF8_ELLIPSIS,
7366+ .Add(new BButton("Edit menu" B_UTF8_ELLIPSIS,
7367 new BMessage(kEditMenuInTracker)))
7368 .SetInsets(10, 10, 10, 10)
7369 .End()
7370Index: src/apps/poorman/PoorManWindow.cpp
7371===================================================================
7372--- src/apps/poorman/PoorManWindow.cpp (Revision 34761)
7373+++ src/apps/poorman/PoorManWindow.cpp (Arbeitskopie)
7374@@ -229,14 +229,14 @@
7375 saveConsoleFilePanel->Show();
7376 break;
7377 case MSG_FILE_PANEL_SAVE_CONSOLE:
7378- printf("FilePanel: Save Console\n");
7379+ printf("FilePanel: Save console\n");
7380 SaveConsole(message, false);
7381 break;
7382 case MSG_MENU_FILE_SAVE_SELECTION:
7383 saveConsoleSelectionFilePanel->Show();
7384 break;
7385 case MSG_FILE_PANEL_SAVE_CONSOLE_SELECTION:
7386- printf("FilePanel: Save Console Selection\n");
7387+ printf("FilePanel: Save console selection\n");
7388 SaveConsole(message, true);
7389 break;
7390 case MSG_FILE_PANEL_SELECT_WEB_DIR:
7391Index: src/apps/poorman/constants.cpp
7392===================================================================
7393--- src/apps/poorman/constants.cpp (Revision 34761)
7394+++ src/apps/poorman/constants.cpp (Arbeitskopie)
7395@@ -6,27 +6,24 @@
7396 // PoorMan Window
7397 extern const char* STR_APP_SIG
7398 = "application/x-vnd.Haiku.PoorMan";
7399- char* STR_APP_NAME
7400+char* STR_APP_NAME
7401 = "PoorMan";
7402 extern const char* STR_ERR_WEB_DIR
7403- = "You have not yet selected the folder you want PoorMan "
7404- "to publish on the Web. PoorMan can create a "
7405- "\"public_html\" folder in your home folder or you can select "
7406- "one of your own folders to publish.\n\n"
7407- "Do you wish to select a folder to publish on the Web?";
7408+ = "Please choose the folder to publish on the web.\n\n"
7409+ "You can have PoorMan create a default \"public_html\" in your home folder.\n"
7410+ "Or you select one of your own folders instead.";
7411 extern const char* STR_ERR_CANT_START
7412- = "Can't Start the Server";
7413+ = "Can't start the server";
7414 extern const char* STR_DIR_CREATED
7415- = "A default Web folder has been created for you "
7416- "at \"/boot/home/public_html.\"\nMake sure an HTML "
7417- "document named \"index.html\" is in that folder.";
7418-
7419+ = "A default web folder has been created "
7420+ "at \"/boot/home/public_html.\"\nMake sure there is a HTML "
7421+ "file named \"index.html\" in that folder.";
7422 extern const char* STR_MNU_FILE
7423 = "File";
7424 extern const char* STR_MNU_FILE_SAVE_AS
7425- = "Save Console As" B_UTF8_ELLIPSIS;
7426+ = "Save console as" B_UTF8_ELLIPSIS;
7427 extern const char* STR_MNU_FILE_SAVE_SELECTION
7428- = "Save Console Selections As" B_UTF8_ELLIPSIS;
7429+ = "Save console selections as" B_UTF8_ELLIPSIS;
7430 extern const char* STR_MNU_FILE_ABOUT
7431 = "About PoorMan" B_UTF8_ELLIPSIS;
7432 extern const char* STR_MNU_FILE_QUIT
7433@@ -36,80 +33,80 @@
7434 extern const char* STR_MNU_EDIT_COPY
7435 = "Copy";
7436 extern const char* STR_MNU_EDIT_SELECT_ALL
7437- = "Select All";
7438+ = "Select all";
7439 extern const char* STR_MNU_EDIT_PREF
7440 = "Settings" B_UTF8_ELLIPSIS;
7441 extern const char* STR_MNU_CTRL
7442 = "Controls";
7443 extern const char* STR_MNU_CTRL_RUN_SERVER
7444- = "Run Server";
7445+ = "Run server";
7446 extern const char* STR_MNU_CTRL_CLEAR_HIT_COUNTER
7447- = "Clear Hit Counter";
7448+ = "Clear hit counter";
7449 extern const char* STR_MNU_CTRL_CLEAR_CONSOLE
7450- = "Clear Console Log";
7451+ = "Clear console log";
7452 extern const char* STR_MNU_CTRL_CLEAR_LOG_FILE
7453- = "Clear Log File";
7454+ = "Clear log file";
7455
7456 extern const char* STR_FILEPANEL_SAVE_CONSOLE
7457- = "Save Log Console";
7458+ = "Save log console";
7459 extern const char* STR_FILEPANEL_SAVE_CONSOLE_SELECTION
7460- = "Save Log Console Selection";
7461+ = "Save log console selection";
7462 extern const char* STR_TXT_VIEW
7463- = "Logging View";
7464+ = "Logging view";
7465
7466 // ------------------------------------------------------
7467 // Preferences Window
7468 char* STR_WIN_NAME_PREF
7469- = "PoorMan Settings";
7470+ = "PoorMan settings";
7471
7472 extern const char* STR_SETTINGS_FILE_NAME
7473- = "PoorMan Settings";
7474+ = "PoorMan settings";
7475 extern const char* STR_SETTINGS_NEW_FILE_NAME
7476- = "OBOS PoorMan Settings";
7477+ = "OBOS PoorMan settings";
7478 extern const char* STR_DEFAULT_WEB_DIRECTORY
7479 = "/boot/home/public_html";
7480 extern const char* STR_TAB_SITE
7481 = "Site";
7482 extern const char* STR_BBX_LOCATION
7483- = "Web Site Location";
7484+ = "Website location";
7485 extern const char* STR_TXT_DIRECTORY
7486- = "Web Folder:";
7487+ = "Web folder:";
7488 extern const char* STR_BTN_DIRECTORY
7489- = "Select Web Folder";
7490+ = "Select web folder";
7491 extern const char* STR_TXT_INDEX
7492- = "Start Page:";
7493+ = "Start page:";
7494 extern const char* STR_BBX_OPTIONS
7495- = "Web Site Options";
7496+ = "Website options";
7497 extern const char* STR_CBX_DIR_LIST
7498 = "Send file listing if there's no start page";
7499 extern const char* STR_CBX_DIR_LIST_LABEL
7500 = "Send file listing if there's no start page";
7501 extern const char* STR_FILEPANEL_SELECT_WEB_DIR
7502- = "Select Web Folder";
7503+ = "Select web folder";
7504
7505 extern const char* STR_TAB_LOGGING
7506 = "Logging";
7507 extern const char* STR_BBX_CONSOLE_LOGGING
7508- = "Console Logging";
7509+ = "Console logging";
7510 extern const char* STR_CBX_LOG_CONSOLE
7511- = "Log to Console";
7512+ = "Log to console";
7513 extern const char* STR_BBX_FILE_LOGGING
7514- = "File Logging";
7515+ = "File logging";
7516 extern const char* STR_CBX_LOG_FILE
7517- = "Log to File";
7518+ = "Log to file";
7519 extern const char* STR_TXT_LOG_FILE_NAME
7520- = "Log File Name:";
7521+ = "Log file name:";
7522 extern const char* STR_BTN_CREATE_LOG_FILE
7523- = "Create Log File";
7524+ = "Create log file";
7525 extern const char* STR_FILEPANEL_CREATE_LOG_FILE
7526- = "Create Poor Man Log";
7527+ = "Create PoorMan log";
7528
7529 extern const char* STR_TAB_ADVANCED
7530 = "Advanced";
7531 extern const char* STR_BBX_CONNECTION
7532- = "Connections Options";
7533+ = "Connections";
7534 extern const char* STR_SLD_LABEL
7535- = "Max. Simultaneous Connections:";
7536+ = "Max. simultaneous connections:";
7537 char* STR_SLD_STATUS_LABEL
7538 = "connections";
7539
7540@@ -127,7 +124,7 @@
7541 extern const char* STR_ABOUT_BUTTON
7542 = "OK";
7543 extern const char* STR_ABOUT_DESC
7544- = "Poor Man's Web Server\n"
7545+ = "Poor Man's web server\n"
7546 "Copyright " B_UTF8_COPYRIGHT " 2004-2009 Haiku\n"
7547 "All rights reserved.\n\n"
7548 "Written by: Philip Harrison, Ma Jie";
7549Index: src/apps/poorman/PoorManAdvancedView.cpp
7550===================================================================
7551--- src/apps/poorman/PoorManAdvancedView.cpp (Revision 34761)
7552+++ src/apps/poorman/PoorManAdvancedView.cpp (Arbeitskopie)
7553@@ -28,7 +28,7 @@
7554 maxRect.right -= 7.0;
7555 maxRect.bottom -= 118.0;
7556
7557- BBox * connectionOptions = new BBox(maxRect, "Connection Options");
7558+ BBox * connectionOptions = new BBox(maxRect, "Connections");
7559 connectionOptions->SetLabel(STR_BBX_CONNECTION);
7560 AddChild(connectionOptions);
7561
7562Index: src/apps/screenshot/ScreenshotWindow.cpp
7563===================================================================
7564--- src/apps/screenshot/ScreenshotWindow.cpp (Revision 34761)
7565+++ src/apps/screenshot/ScreenshotWindow.cpp (Arbeitskopie)
7566@@ -1,5 +1,5 @@
7567 /*
7568- * Copyright Karsten Heimrich, host.haiku@gmx.de. All rights reserved.
7569+ * Copyright 2009 Karsten Heimrich, host.haiku@gmx.de. All rights reserved.
7570 * Distributed under the terms of the MIT License.
7571 *
7572 * Authors:
7573@@ -89,7 +89,7 @@
7574 bool includeMouse, bool grabActiveWindow, bool showConfigWindow,
7575 bool saveScreenshotSilent, int32 imageFileType, int32 translator)
7576 :
7577- BWindow(BRect(0, 0, 200.0, 100.0), "Take Screenshot", B_TITLED_WINDOW,
7578+ BWindow(BRect(0, 0, 200.0, 100.0), "Retake screenshot", B_TITLED_WINDOW,
7579 B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_QUIT_ON_WINDOW_CLOSE |
7580 B_AVOID_FRONT | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
7581 fDelayControl(NULL),
7582@@ -155,7 +155,7 @@
7583 BCardLayout* layout = dynamic_cast<BCardLayout*> (GetLayout());
7584 if (layout)
7585 layout->SetVisibleItem(1L);
7586- SetTitle("Save Screenshot");
7587+ SetTitle("Save screenshot");
7588 break;
7589 }
7590
7591@@ -314,10 +314,10 @@
7592 BBox* divider = new BBox(B_FANCY_BORDER, NULL);
7593 divider->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1));
7594
7595- fBackToSave = new BButton("", "Back to save", new BMessage(kBackToSave));
7596+ fBackToSave = new BButton("", "Back to saving", new BMessage(kBackToSave));
7597 fBackToSave->SetEnabled(false);
7598
7599- fTakeScreenshot = new BButton("", "Take Screenshot",
7600+ fTakeScreenshot = new BButton("", "Take screenshot",
7601 new BMessage(kTakeScreenshot));
7602
7603 layout->AddView(0, BGroupLayoutBuilder(B_VERTICAL)
7604@@ -553,7 +553,7 @@
7605 if (layout)
7606 layout->SetVisibleItem(1L);
7607
7608- SetTitle("Save Screenshot");
7609+ SetTitle("Save screenshot");
7610 }
7611
7612
7613Index: src/apps/pairs/PairsView.cpp
7614===================================================================
7615--- src/apps/pairs/PairsView.cpp (Revision 34761)
7616+++ src/apps/pairs/PairsView.cpp (Arbeitskopie)
7617@@ -1,5 +1,5 @@
7618 /*
7619- * Copyright 2008, Ralf Schülke, teammaui@web.de. All rights reserved.
7620+ * Copyright 2008-2009, Ralf Schülke, teammaui@web.de. All rights reserved.
7621 * Distributed under the terms of the MIT License.
7622 */
7623
7624@@ -158,7 +158,7 @@
7625 if (fCard[i] == NULL) {
7626 BAlert* alert = new BAlert("fatal", "Pairs did not find enough "
7627 "vector icons in the system, it needs at least eight.",
7628- "Oh!", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
7629+ "OK", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT);
7630 alert->Go();
7631 exit(1);
7632 }