[haiku-commits] haiku: hrev45183 - in src: preferences/shortcuts tests/servers/app/playground
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 20 Jan 2013 10:08:39 +0100 (CET)
hrev45183 adds 2 changesets to branch 'master'
old head: 3528f5bb69184d6b3da7201c51c56068fe907f04
new head: 76f3378cd07390fcaaa15346c24405fab16f74ea
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=76f3378+%5E3528f5b
----------------------------------------------------------------------------
ab73d6a: Make Playground find its catalog (#9388).
Small error in the jamfile put the catalog in subfolder
so it wasn't found. As reported by mt and investigated
by diver. Thanks!
76f3378: Renamed "Windows" to "Option" in Shortcuts GUI (#9391)
Correctly named it "Option" key as everwhere else in Haiku.
Thanks mks for pointing it out.
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 2 deletions(-)
src/preferences/shortcuts/ShortcutsSpec.cpp | 2 +-
src/tests/servers/app/playground/Jamfile | 2 +-
############################################################################
Commit: ab73d6ac07d8248a2865ccbfe6b708eac3306e33
URL: http://cgit.haiku-os.org/haiku/commit/?id=ab73d6a
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Sun Jan 20 08:53:23 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/9388
Make Playground find its catalog (#9388).
Small error in the jamfile put the catalog in subfolder
so it wasn't found. As reported by mt and investigated
by diver. Thanks!
----------------------------------------------------------------------------
diff --git a/src/tests/servers/app/playground/Jamfile
b/src/tests/servers/app/playground/Jamfile
index 327085d..552acbd 100644
--- a/src/tests/servers/app/playground/Jamfile
+++ b/src/tests/servers/app/playground/Jamfile
@@ -21,7 +21,7 @@ if ( $(TARGET_PLATFORM) = libbe_test ) {
}
DoCatalogs Playground :
- application/x-vnd.Haiku-Playground
+ x-vnd.Haiku-Playground
:
main.cpp
ObjectView.cpp
############################################################################
Revision: hrev45183
Commit: 76f3378cd07390fcaaa15346c24405fab16f74ea
URL: http://cgit.haiku-os.org/haiku/commit/?id=76f3378
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Sun Jan 20 09:05:16 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/9391
Renamed "Windows" to "Option" in Shortcuts GUI (#9391)
Correctly named it "Option" key as everwhere else in Haiku.
Thanks mks for pointing it out.
----------------------------------------------------------------------------
diff --git a/src/preferences/shortcuts/ShortcutsSpec.cpp
b/src/preferences/shortcuts/ShortcutsSpec.cpp
index 8992de3..2fbb513 100644
--- a/src/preferences/shortcuts/ShortcutsSpec.cpp
+++ b/src/preferences/shortcuts/ShortcutsSpec.cpp
@@ -862,7 +862,7 @@ ShortcutsSpec::_InitModifierNames()
"Name for modifier on keyboard");
// TODO: Wrapping in __INTEL__ define probably won't work to extract catkeys?
#if __INTEL__
- sOptionName = B_TRANSLATE_COMMENT("Window",
+ sOptionName = B_TRANSLATE_COMMENT("Option",
"Name for modifier on keyboard");
sCommandName = B_TRANSLATE_COMMENT("Alt",
"Name for modifier on keyboard");
Other related posts:
- » [haiku-commits] haiku: hrev45183 - in src: preferences/shortcuts tests/servers/app/playground - humdingerb
