[haiku-commits] haiku: hrev43323 - in src/apps: workspaces aboutsystem charactermap
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 25 Nov 2011 22:26:59 +0100 (CET)
hrev43323 adds 3 changesets to branch 'master'
old head: 692e9b11e41277d5d5f75e1ab282468f8e7d2cdd
new head: fedd3119866abc980b2a2e070386d0b5698a43ab
----------------------------------------------------------------------------
1f92d74: Removed duplicate license for GLU. Thanks Rimas.
9ea3ffe: Corrected typo. Thanks Rimas.
fedd311: Corrected some typos and stuff pointed out by Rimas.
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 9 insertions(+), 9 deletions(-)
src/apps/aboutsystem/AboutSystem.cpp | 6 +++---
src/apps/charactermap/UnicodeBlocks.cpp | 2 +-
src/apps/workspaces/Workspaces.cpp | 10 +++++-----
############################################################################
Commit: 1f92d747ef5cf73a75661413b06529f9c5570da9
URL: http://cgit.haiku-os.org/haiku/commit/?id=1f92d74
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Fri Nov 25 14:34:28 2011 UTC
Removed duplicate license for GLU. Thanks Rimas.
----------------------------------------------------------------------------
diff --git a/src/apps/aboutsystem/AboutSystem.cpp
b/src/apps/aboutsystem/AboutSystem.cpp
index 869cf5a..6e5d151 100644
--- a/src/apps/aboutsystem/AboutSystem.cpp
+++ b/src/apps/aboutsystem/AboutSystem.cpp
@@ -1336,7 +1336,8 @@ AboutView::_CreateCreditsView()
// FreeType copyrights
_AddPackageCredit(PackageCredit("FreeType2")
- .SetCopyright(B_TRANSLATE("Portions of this software are
copyright. "
+ .SetCopyright(B_TRANSLATE("Portions of this software are under "
+ "copyright.\n"
COPYRIGHT_STRING "1996-2006 "
"The FreeType Project. All rights reserved."))
.SetLicense("FTL")
@@ -1352,8 +1353,7 @@ AboutView::_CreateCreditsView()
// SGI's GLU implementation copyrights
_AddPackageCredit(PackageCredit("GLU")
.SetCopyright(B_TRANSLATE(COPYRIGHT_STRING "1991-2000 "
- "Silicon Graphics, Inc. SGI's Software FreeB license. "
- "All rights reserved."))
+ "Silicon Graphics, Inc. All rights reserved."))
.SetLicense("SGI Free B")
.SetURL("http://www.sgi.com/products/software/opengl";));
############################################################################
Commit: 9ea3ffe65c858ff9dfd8639a07aafb2c982c99ff
URL: http://cgit.haiku-os.org/haiku/commit/?id=9ea3ffe
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Fri Nov 25 14:35:13 2011 UTC
Corrected typo. Thanks Rimas.
----------------------------------------------------------------------------
diff --git a/src/apps/charactermap/UnicodeBlocks.cpp
b/src/apps/charactermap/UnicodeBlocks.cpp
index f7ac69e..79336be 100644
--- a/src/apps/charactermap/UnicodeBlocks.cpp
+++ b/src/apps/charactermap/UnicodeBlocks.cpp
@@ -207,7 +207,7 @@ const struct unicode_block_entry kUnicodeBlocks[] = {
0x012400, 0x01247f, false, kNoBlock},
{B_TRANSLATE("Byzantine musical symbols"),
0x01d000, 0x01d0ff, false, kNoBlock},
- {B_TRANSLATE("Muscial symbols"), 0x01d100, 0x01d1ff, false, kNoBlock},
+ {B_TRANSLATE("Musical symbols"), 0x01d100, 0x01d1ff, false, kNoBlock},
{B_TRANSLATE("Ancient Greek musical notation"),
0x01d200, 0x01d24f, false, kNoBlock},
{B_TRANSLATE("Tai Xuan Jing symbols"),
############################################################################
Revision: hrev43323
Commit: fedd3119866abc980b2a2e070386d0b5698a43ab
URL: http://cgit.haiku-os.org/haiku/commit/?id=fedd311
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Fri Nov 25 21:25:01 2011 UTC
Corrected some typos and stuff pointed out by Rimas.
----------------------------------------------------------------------------
diff --git a/src/apps/workspaces/Workspaces.cpp
b/src/apps/workspaces/Workspaces.cpp
index 064ab71..e3415d0 100644
--- a/src/apps/workspaces/Workspaces.cpp
+++ b/src/apps/workspaces/Workspaces.cpp
@@ -830,15 +830,15 @@ void
WorkspacesApp::Usage(const char *programName)
{
printf(B_TRANSLATE("Usage: %s [options] [workspace]\n"
- "where \"options\" is one of:\n"
- " --notitle\t\ttitle bar removed. border and resize kept.\n"
- " --noborder\t\ttitle, border, and resize removed.\n"
+ "where \"options\" are:\n"
+ " --notitle\t\ttitle bar removed, border and resize kept\n"
+ " --noborder\t\ttitle, border, and resize removed\n"
" --avoidfocus\t\tprevents the window from being the target of
"
- "keyboard events.\n"
+ "keyboard events\n"
" --alwaysontop\t\tkeeps window on top\n"
" --notmovable\t\twindow can't be moved around\n"
" --autoraise\t\tauto-raise the workspace window when it's at
the "
- "screen corner\n"
+ "screen edge\n"
" --help\t\tdisplay this help and exit\n"
"and \"workspace\" is the number of the Workspace to which to
switch "
"(0-31)\n"),
Other related posts:
- » [haiku-commits] haiku: hrev43323 - in src/apps: workspaces aboutsystem charactermap - humdingerb
