[haiku-commits] r37724 - in haiku/branches/developer/zooey/posix-locale: . build/jam data/bin data/catalogs/add-ons/tracker/zipomatic data/catalogs/apps ...
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 23 Jul 2010 22:52:27 +0200 (CEST)
Author: zooey
Date: 2010-07-23 22:52:26 +0200 (Fri, 23 Jul 2010)
New Revision: 37724
Changeset: http://dev.haiku-os.org/changeset/37724
Added:
haiku/branches/developer/zooey/posix-locale/build/jam/LocaleRules
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/eo.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/sv.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/codycam/sv.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/eo.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/expander/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/midiplayer/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/pairs/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/pulse/
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/pulse/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/showimage/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/tv/
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/tv/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/workspaces/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/kits/locale/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/kits/tracker/
haiku/branches/developer/zooey/posix-locale/data/catalogs/kits/tracker/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/appearance/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/backgrounds/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/filetypes/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/fonts/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/locale/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/network/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/print/zh-hans.catkeys
haiku/branches/developer/zooey/posix-locale/headers/os/locale/TimeZone.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/icmp.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/icmp6/
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/icmp6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/icmp6/icmp6.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv4/ipv4.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_address.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_address.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_utils.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_utils.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/jenkins.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/multicast.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/multicast.h
haiku/branches/developer/zooey/posix-locale/src/bin/network/ping6/
haiku/branches/developer/zooey/posix-locale/src/bin/network/ping6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/bin/network/ping6/ping6.c
haiku/branches/developer/zooey/posix-locale/src/kits/locale/TimeZone.cpp
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/time/wcsftime.c
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/Jamfile
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/big_datagram.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/icmp_dumper.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/tcp_unreachable.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/udp_unreachable.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/system/kernel/file_corruption/fs/Block.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/system/kernel/file_corruption/fs/Notifications.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/system/kernel/file_corruption/fs/Notifications.h
Removed:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/expander/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/midiplayer/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/pairs/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/pulse/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/showimage/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/tv/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/kits/locale/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/kits/tracker/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/appearance/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/backgrounds/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/filetypes/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/fonts/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/locale/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/network/zh.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/print/zh.catkeys
haiku/branches/developer/zooey/posix-locale/docs/userguide/de/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/en/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/es/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/fr/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/it/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/jp/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/ru/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/sv_SE/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/uk/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/images/apps-images/screenshot-options.png
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/icmp6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/icmp6/icmp6.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_address.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_address.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_utils.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/ipv6_utils.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/jenkins.h
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/multicast.cpp
haiku/branches/developer/zooey/posix-locale/src/add-ons/kernel/network/protocols/ipv6/multicast.h
haiku/branches/developer/zooey/posix-locale/src/bin/network/ping6/Jamfile
haiku/branches/developer/zooey/posix-locale/src/bin/network/ping6/ping6.c
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/Jamfile
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/big_datagram.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/icmp_dumper.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/tcp_unreachable.cpp
haiku/branches/developer/zooey/posix-locale/src/tests/kits/net/icmp/udp_unreachable.cpp
haiku/branches/developer/zooey/posix-locale/src/tools/locale/genprops_beos/
Modified:
haiku/branches/developer/zooey/posix-locale/
haiku/branches/developer/zooey/posix-locale/Jamrules
haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackages
haiku/branches/developer/zooey/posix-locale/data/bin/install-wifi-firmwares.sh
haiku/branches/developer/zooey/posix-locale/data/bin/installoptionalpackage
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/nl.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/lt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/lt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/mail/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/networkstatus/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/screenshot/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/stylededit/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/terminal/pt.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/terminal/ru.catkeys
haiku/branches/developer/zooey/posix-locale/data/catalogs/preferences/backgrounds/eo.catkeys
haiku/branches/developer/zooey/posix-locale/data/common/boot/post_install/mime_update.sh
haiku/branches/developer/zooey/posix-locale/data/system/boot/Bootscript
haiku/branches/developer/zooey/posix-locale/docs/userguide/de/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/de/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/de/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/en/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/en/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/en/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/es/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/es/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/es/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/fr/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/fr/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/it/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/it/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/it/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/jp/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/jp/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/jp/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/codycam.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/installer.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/mail.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/mediaplayer.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/midiplayer.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/packageinstaller.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/showimage.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/soundrecorder.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/stylededit.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/textsearch.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/applications/tv.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/contents.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/desktop-applets/networkstatus.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/desktop-applets/processcontroller.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/preferences/locale.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/preferences/media.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/preferences/network.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/pt_PT/preferences/printers.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/ru/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/ru/applications/terminal.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/ru/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/ru/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/sv_SE/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/sv_SE/attributes.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/sv_SE/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/sv_SE/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/uk/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/uk/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/uk/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/activitymonitor.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/cli-apps.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/diskprobe.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/diskusage.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/drivesetup.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/applications/screenshot.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/desktop-applets.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/images/apps-images/screenshot.png
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/keyboard-shortcuts.html
haiku/branches/developer/zooey/posix-locale/docs/userguide/zh_CN/preferences/appearance.html
haiku/branches/developer/zooey/posix-locale/headers/compatibility/gnu/
haiku/branches/developer/zooey/posix-locale/headers/libs/termcap/termcap.h
haiku/branches/developer/zooey/posix-locale/headers/os/drivers/config_manager.h
haiku/branches/developer/zooey/posix-locale/headers/os/drivers/io_requests.h
haiku/branches/developer/zooey/posix-locale/headers/os/interface/CardLayout.h
haiku/branches/developer/zooey/posix-locale/headers/os/interface/SplitView.h
haiku/branches/developer/zooey/posix-locale/headers/os/locale/Catalog.h
haiku/branches/developer/zooey/posix-locale/headers/os/locale/Country.h
haiku/branches/developer/zooey/posix-locale/headers/os/locale/LocaleRoster.h
haiku/branches/developer/zooey/posix-locale/headers/posix/wchar.h
haiku/branches/developer/zooey/posix-locale/headers/private/graphics/matrox/DriverInterface.h
haiku/branches/developer/zooey/posix-locale/headers/private/graphics/neomagic/DriverInterface.h
haiku/branches/developer/zooey/posix-locale/headers/private/interface/PrivateScreen.h
haiku/branches/developer/zooey/posix-locale/headers/private/kernel/lock.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/NetBufferUtilities.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/ProtocolUtilities.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/net_buffer.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/net_datalink.h
haiku/branches/developer/zooey/posix-locale/headers/private/net/net_datalink_protocol.h
[... truncated: 241 changed files follow ...]
Log:
* merged changes from trunk
Property changes on: haiku/branches/developer/zooey/posix-locale
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/trunk:35646-37599
+ /haiku/trunk:35646-37723
Modified: haiku/branches/developer/zooey/posix-locale/Jamrules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/Jamrules 2010-07-23
19:56:24 UTC (rev 37723)
+++ haiku/branches/developer/zooey/posix-locale/Jamrules 2010-07-23
20:52:26 UTC (rev 37724)
@@ -34,6 +34,7 @@
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HelperRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) MathRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) BeOSRules ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) LocaleRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CommandLineArguments ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) ConfigRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) DocumentationRules ] ;
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
2010-07-23 19:56:24 UTC (rev 37723)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/BeOSRules
2010-07-23 20:52:26 UTC (rev 37724)
@@ -268,140 +268,3 @@
fi
$(2[1]) -O -o "$(1)" "$(2[2-])"
}
-
-# Localization rules
-
-# Extract catalog entries from the sourcefile and put the output textfile in
-# target. This output file is then used to create the binary catalog with
-# linkcatkeys.
-rule ExtractCatalogEntries target : source : signature : regexp
-{
- # get compiler and defines for the platform
- local headers ;
- local sysHeaders ;
- local cc ;
- local defines ;
- local localIncludesOption ;
- local systemIncludesOption ;
-
- on $(target) { # use on $(target) variable values
- headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
- $(HDRS) ;
- sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
- defines = $(DEFINES) ;
-
- if $(PLATFORM) = host {
- sysHeaders += $(HOST_HDRS) ;
- defines += $(HOST_DEFINES) ;
-
- if $(USES_BE_API) {
- sysHeaders += $(HOST_BE_API_HEADERS) ;
- }
-
- defines += $(HOST_DEFINES) ;
- cc = $(HOST_CC) ;
- localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
- systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
- } else {
- sysHeaders += $(TARGET_HDRS) ;
- defines += $(TARGET_DEFINES) ;
- defines += $(TARGET_DEFINES) ;
- cc = $(TARGET_CC) ;
- localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
- systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION)
;
- }
- }
-
- DEFINES on $(target) = $(defines) ;
- CCDEFS on $(target) = [ FDefines $(defines) ] ;
- HDRS on $(target) = [ FIncludes $(headers) : $(localIncludesOption) ]
- $(includesSeparator)
- [ FSysIncludes $(sysHeaders) : $(systemIncludesOption) ] ;
- CC on $(target) = $(cc) ;
-
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
- if $(regexp) = "" {
- HAIKU_CATALOG_REGEXP on $(target) = ;
- } else {
- HAIKU_CATALOG_REGEXP on $(target) = -r $(regexp) ;
- }
-
- SEARCH on $(source) += $(SEARCH_SOURCE) ;
-
- MakeLocatePlatform $(target) ;
- Depends $(target) : $(source) <build>collectcatkeys ;
- LocalClean clean : $(target).pre ;
- ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(source) ;
-}
-
-actions ExtractCatalogEntries1
-{
- $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
- cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - > "$(1)".pre
- $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE)
-w -o "$(1)" "$(1)".pre
-}
-
-rule LinkApplicationCatalog target : sources : signature : language
-{
- # Link catalog entries from given catkey file into output compiled
catalog
- # file. Compiled catalog file will then be copied into the image, but
only
- # if the fingerprint matches the one from the untranslated catalog for
the
- # same file.
-
- MakeLocateArch $(target) ;
- Depends $(target) : $(sources) <build>linkcatkeys ;
- LocalClean clean : $(target) ;
-
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
- HAIKU_CATALOG_LANGUAGE on $(target) = $(language) ;
- LinkApplicationCatalog1 $(target) : <build>linkcatkeys $(sources) ;
-}
-
-actions LinkApplicationCatalog1
-{
- $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
- $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) -v \
- -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
-}
-
-rule DoCatalogs target : signature : sources : sourceLanguage : regexp
-{
- # DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
- # [ : <regexp> ]
- #
- # Extracts the catkeys from a target's source files, generates the
- # default catalog from them, and also generates catalogs for all
- # translations.
- #
- # target: The target.
- # signature: Application MIME signature (must match the one
- # declared in the sourcecode).
- # sources: List of cpp files where to search keys.
- # sourceLanguage Short name of the language of used for the
strings in
- # the sources. Optional: default
is "en".
- # regexp The regular expression used to parse the files.
- # Optional: default is matching be_catalog->GetString
-
- local generatedCatalog = [ FGristFiles
$(sourceLanguage:E=en:S=.catalog) ] ;
-
- # generate catkeys file from sources
- ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
- : [ FGristFiles $(sources) ] : $(signature) : $(regexp) ;
-
- # find translations
- local translationsDir
- = [ FDirName $(HAIKU_TOP) data catalogs $(SUBDIR_TOKENS[2-]) ] ;
- local translations = [ Glob $(translationsDir) : *.catkeys ] ;
- translations = [ FGristFiles $(translations:BS) ] ;
- SEARCH on $(translations) += $(translationsDir) ;
-
- # generate catalogs from all catkeys files
- local catkeysFiles = $(generatedCatalog:S=.catkeys) $(translations) ;
- for catkeysFile in $(catkeysFiles) {
- LinkApplicationCatalog $(catkeysFile:S=.catalog) :
$(catkeysFile)
- : $(signature) : $(catkeysFile:B) ;
- }
-
- HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
- HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
-}
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
2010-07-23 19:56:24 UTC (rev 37723)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/BuildSetup
2010-07-23 20:52:26 UTC (rev 37724)
@@ -1170,25 +1170,237 @@
}
if $(HAIKU_NO_WERROR) != 1 {
+ EnableWerror src add-ons accelerants 3dfx ;
+ EnableWerror src add-ons accelerants ati ;
+ EnableWerror src add-ons accelerants common ;
+ EnableWerror src add-ons accelerants et6x00 ;
+# EnableWerror src add-ons accelerants intel_extreme ;
+# EnableWerror src add-ons accelerants matrox ;
+ EnableWerror src add-ons accelerants neomagic ;
+# EnableWerror src add-ons accelerants nvidia ;
+ EnableWerror src add-ons accelerants nvidia_gpgpu ;
+# EnableWerror src add-ons accelerants radeon ;
+ EnableWerror src add-ons accelerants radeon_hd ;
+ EnableWerror src add-ons accelerants s3 ;
+ EnableWerror src add-ons accelerants skeleton ;
+ EnableWerror src add-ons accelerants vesa ;
+ EnableWerror src add-ons accelerants via ;
+ EnableWerror src add-ons accelerants vmware ;
+ EnableWerror src add-ons bluetooth ;
+ EnableWerror src add-ons decorators ;
+ EnableWerror src add-ons disk_systems ;
+ EnableWerror src add-ons input_server devices ;
+# EnableWerror src add-ons input_server filters ;
+# EnableWerror src add-ons input_server methods ;
+# EnableWerror src add-ons kernel bus_managers acpi ;
+ EnableWerror src add-ons kernel bus_managers agp_gart ;
+ EnableWerror src add-ons kernel bus_managers ata ;
+ EnableWerror src add-ons kernel bus_managers config_manager ;
+ EnableWerror src add-ons kernel bus_managers firewire ;
+ EnableWerror src add-ons kernel bus_managers isa ;
+ EnableWerror src add-ons kernel bus_managers pci ;
+# EnableWerror src add-ons kernel bus_managers ps2 ; # gcc2
+ EnableWerror src add-ons kernel bus_managers scsi ;
+ EnableWerror src add-ons kernel bus_managers usb ;
+ EnableWerror src add-ons kernel busses agp_gart ;
+ EnableWerror src add-ons kernel busses ata ;
+ EnableWerror src add-ons kernel busses scsi ;
+ EnableWerror src add-ons kernel busses usb ;
+ EnableWerror src add-ons kernel console ;
+ EnableWerror src add-ons kernel cpu ;
+# EnableWerror src add-ons kernel debugger ; # gcc2
+# EnableWerror src add-ons kernel drivers audio ;
+ EnableWerror src add-ons kernel drivers bluetooth ;
+ EnableWerror src add-ons kernel drivers bus ;
+ EnableWerror src add-ons kernel drivers common ;
+ EnableWerror src add-ons kernel drivers disk ;
+ EnableWerror src add-ons kernel drivers dvb ;
+# EnableWerror src add-ons kernel drivers graphics ;
+# EnableWerror src add-ons kernel drivers input ;
+ EnableWerror src add-ons kernel drivers joystick ;
+ EnableWerror src add-ons kernel drivers midi ;
+ EnableWerror src add-ons kernel drivers misc ;
+# EnableWerror src add-ons kernel drivers network ;
+ EnableWerror src add-ons kernel drivers ports ;
+# EnableWerror src add-ons kernel drivers power ;
+ EnableWerror src add-ons kernel drivers printer ;
+ EnableWerror src add-ons kernel drivers random ;
+ EnableWerror src add-ons kernel drivers tty ;
+ EnableWerror src add-ons kernel drivers video ;
EnableWerror src add-ons kernel file_systems bfs ;
+ EnableWerror src add-ons kernel file_systems cdda ;
+# EnableWerror src add-ons kernel file_systems ext2 ;
+# EnableWerror src add-ons kernel file_systems fat ;
+# EnableWerror src add-ons kernel file_systems googlefs ;
+ EnableWerror src add-ons kernel file_systems iso9660 ;
+ EnableWerror src add-ons kernel file_systems layers ;
+ EnableWerror src add-ons kernel file_systems netfs ;
+ EnableWerror src add-ons kernel file_systems nfs ;
+# EnableWerror src add-ons kernel file_systems ntfs ;
EnableWerror src add-ons kernel file_systems packagefs ;
+ EnableWerror src add-ons kernel file_systems ramfs ;
+# EnableWerror src add-ons kernel file_systems reiserfs ;
+ EnableWerror src add-ons kernel file_systems udf ;
EnableWerror src add-ons kernel file_systems userlandfs ;
+ EnableWerror src add-ons kernel generic ;
+ EnableWerror src add-ons kernel network atalink_protocols ;
+ EnableWerror src add-ons kernel network devices ;
+ EnableWerror src add-ons kernel network notifications ;
+ EnableWerror src add-ons kernel network ppp ;
+# EnableWerror src add-ons kernel network protocols ;
+# EnableWerror src add-ons kernel network stack ;
+ EnableWerror src add-ons kernel partitioning_systems ;
+ EnableWerror src add-ons locale ;
+ EnableWerror src add-ons mail_daemon ;
+ EnableWerror src add-ons media media-add-ons demultiplexer ;
+ EnableWerror src add-ons media media-add-ons dvb ;
+ EnableWerror src add-ons media media-add-ons esound_sink ;
+ EnableWerror src add-ons media media-add-ons finepix_webcam ;
+ EnableWerror src add-ons media media-add-ons firewire_dv ;
+ EnableWerror src add-ons media media-add-ons legacy ;
+ EnableWerror src add-ons media media-add-ons mixer ;
+ EnableWerror src add-ons media media-add-ons multi_audio ;
+ EnableWerror src add-ons media media-add-ons opensound ;
+ EnableWerror src add-ons media media-add-ons radeon ;
+ EnableWerror src add-ons media media-add-ons reader ;
+ EnableWerror src add-ons media media-add-ons tone_producer_demo ;
+ EnableWerror src add-ons media media-add-ons usb_vision ;
+# EnableWerror src add-ons media media-add-ons usb_webcam ;
+ EnableWerror src add-ons media media-add-ons video_mixer ;
+# EnableWerror src add-ons media media-add-ons video_producer_demo ;
+ EnableWerror src add-ons media media-add-ons videowindow ;
+ EnableWerror src add-ons media media-add-ons writer ;
+ EnableWerror src add-ons media plugins ac3_decoder ;
+ EnableWerror src add-ons media plugins aiff_reader ;
+ EnableWerror src add-ons media plugins ape_reader ;
+# EnableWerror src add-ons media plugins asf_reader ;
+ EnableWerror src add-ons media plugins au_reader ;
+# EnableWerror src add-ons media plugins avi_reader ;
+# EnableWerror src add-ons media plugins ffmpeg ;
+# EnableWerror src add-ons media plugins matroska ;
+# EnableWerror src add-ons media plugins mov_reader ;
+ EnableWerror src add-ons media plugins mp3_decoder ;
+# EnableWerror src add-ons media plugins mp3_reader ;
+ EnableWerror src add-ons media plugins mp4_reader ;
+ EnableWerror src add-ons media plugins musepack ;
+# EnableWerror src add-ons media plugins ogg ;
+# EnableWerror src add-ons media plugins raw_decoder ;
+# EnableWerror src add-ons media plugins speex ;
+ EnableWerror src add-ons media plugins theora ;
+ EnableWerror src add-ons media plugins vorbis ;
+# EnableWerror src add-ons media plugins wav_reader ;
+ EnableWerror src add-ons media plugins xvid_decoder ;
+ EnableWerror src add-ons opengl ;
+ EnableWerror src add-ons print ;
+ EnableWerror src add-ons screen_savers ;
+ EnableWerror src add-ons tracker ;
+ EnableWerror src add-ons translators bmp ;
+# EnableWerror src add-ons translators exr ;
+ EnableWerror src add-ons translators gif ;
+ EnableWerror src add-ons translators hpgs ;
+ EnableWerror src add-ons translators hvif ;
+ EnableWerror src add-ons translators ico ;
+# EnableWerror src add-ons translators jpeg ; # gcc2
+ EnableWerror src add-ons translators jpeg2000 ;
+ EnableWerror src add-ons translators pcx ;
+# EnableWerror src add-ons translators png ; # gcc2
+ EnableWerror src add-ons translators ppm ;
+ EnableWerror src add-ons translators raw ;
+ EnableWerror src add-ons translators rtf ;
+ EnableWerror src add-ons translators sgi ;
+ EnableWerror src add-ons translators shared ;
+ EnableWerror src add-ons translators stxt ;
+ EnableWerror src add-ons translators tga ;
+ EnableWerror src add-ons translators tiff ;
+# EnableWerror src add-ons translators wonderbrush ;
+# EnableWerror src add-ons print ;
EnableWerror src bin package ;
+ EnableWerror src apps aboutsystem ;
+ EnableWerror src apps activitymonitor ;
+ EnableWerror src apps bootman ;
+ EnableWerror src apps bsnow ;
+ EnableWerror src apps cdplayer ;
+# EnableWerror src apps charactermap ;
+ EnableWerror src apps clock ;
+ EnableWerror src apps codycam ;
+ EnableWerror src apps cortex ;
+ EnableWerror src apps deskbar ;
+ EnableWerror src apps deskcalc ;
+ EnableWerror src apps devices ;
+ EnableWerror src apps diskprobe ;
+# EnableWerror src apps diskusage ;
+ EnableWerror src apps drivesetup ;
+ EnableWerror src apps expander ;
+ EnableWerror src apps fontdemo ;
+ EnableWerror src apps glteapot ;
+ EnableWerror src apps haiku3d ;
+# EnableWerror src apps icon-o-matic ;
+ EnableWerror src apps installer ;
+ EnableWerror src apps launchbox ;
+ EnableWerror src apps magnify ;
+# EnableWerror src apps mail ;
+ EnableWerror src apps mandelbrot ;
+ EnableWerror src apps mediaconverter ;
+# EnableWerror src apps mediaplayer ;
+ EnableWerror src apps midiplayer ;
+ EnableWerror src apps networkstatus ;
+ EnableWerror src apps packageinstaller ;
+ EnableWerror src apps pairs ;
+ EnableWerror src apps people ;
+# EnableWerror src apps poorman ;
+ EnableWerror src apps powerstatus ;
+ EnableWerror src apps processcontroller ;
+ EnableWerror src apps pulse ;
+ EnableWerror src apps readonlybootprompt ;
+ EnableWerror src apps screenshot ;
+ EnableWerror src apps showimage ;
+ EnableWerror src apps soundrecorder ;
+ EnableWerror src apps stylededit ;
+ EnableWerror src apps sudoku ;
+ EnableWerror src apps terminal ;
+ EnableWerror src apps text_search ;
+ EnableWerror src apps tracker ;
+ EnableWerror src apps tv ;
+ EnableWerror src apps workspaces ;
EnableWerror src kits app ;
+ EnableWerror src kits bluetooth ;
+ EnableWerror src kits debug ;
EnableWerror src kits device ;
+ EnableWerror src kits game ;
EnableWerror src kits interface ;
+# EnableWerror src kits locale ;
+ EnableWerror src kits mail ;
+# EnableWerror src kits media ; # gcc2
EnableWerror src kits midi ;
EnableWerror src kits midi2 ;
+ EnableWerror src kits network ;
+ EnableWerror src kits notification ;
+ EnableWerror src kits opengl ;
EnableWerror src kits print ;
+ EnableWerror src kits screensaver ;
+ EnableWerror src kits shared ;
EnableWerror src kits storage ;
EnableWerror src kits support ;
+ EnableWerror src kits textencoding ;
+# EnableWerror src kits tracker ;
EnableWerror src kits translation ;
- EnableWerror src servers cddb_daemon ;
- EnableWerror src servers debug ;
+ EnableWerror src servers app ;
+# EnableWerror src servers bluetooth ;
+ EnableWerror src servers cddb_daemon ;
+ EnableWerror src servers debug ;
EnableWerror src servers input ;
+ EnableWerror src servers mail ;
+ EnableWerror src servers media ;
+ EnableWerror src servers media_addon ;
EnableWerror src servers midi ;
+ EnableWerror src servers mount ;
+ EnableWerror src servers net ;
+ EnableWerror src servers notification ;
+ EnableWerror src servers power ;
EnableWerror src servers print ;
EnableWerror src servers registrar ;
+ EnableWerror src servers services_daemon ;
+ EnableWerror src servers syslog_daemon ;
EnableWerror src system kernel ;
EnableWerror src system runtime_loader ;
}
Copied: haiku/branches/developer/zooey/posix-locale/build/jam/LocaleRules (from
rev 37723, haiku/trunk/build/jam/LocaleRules)
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/LocaleRules
(rev 0)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/LocaleRules
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,137 @@
+# Localization rules
+
+# Extract catalog entries from the sourcefile and put the output textfile in
+# target. This output file is then used to create the binary catalog with
+# linkcatkeys.
+rule ExtractCatalogEntries target : source : signature : regexp
+{
+ # get compiler and defines for the platform
+ local headers ;
+ local sysHeaders ;
+ local cc ;
+ local defines ;
+ local localIncludesOption ;
+ local systemIncludesOption ;
+
+ on $(target) { # use on $(target) variable values
+ headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
+ $(HDRS) ;
+ sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
+ defines = $(DEFINES) ;
+
+ if $(PLATFORM) = host {
+ sysHeaders += $(HOST_HDRS) ;
+ defines += $(HOST_DEFINES) ;
+
+ if $(USES_BE_API) {
+ sysHeaders += $(HOST_BE_API_HEADERS) ;
+ }
+
+ defines += $(HOST_DEFINES) ;
+ cc = $(HOST_CC) ;
+ localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
+ systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
+ } else {
+ sysHeaders += $(TARGET_HDRS) ;
+ defines += $(TARGET_DEFINES) ;
+ defines += $(TARGET_DEFINES) ;
+ cc = $(TARGET_CC) ;
+ localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
+ systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION)
;
+ }
+ }
+
+ DEFINES on $(target) = $(defines) ;
+ CCDEFS on $(target) = [ FDefines $(defines) ] ;
+ HDRS on $(target) = [ FIncludes $(headers) : $(localIncludesOption) ]
+ $(includesSeparator)
+ [ FSysIncludes $(sysHeaders) : $(systemIncludesOption) ] ;
+ CC on $(target) = $(cc) ;
+
+ HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
+ if $(regexp) = "" {
+ HAIKU_CATALOG_REGEXP on $(target) = ;
+ } else {
+ HAIKU_CATALOG_REGEXP on $(target) = -r $(regexp) ;
+ }
+
+ SEARCH on $(source) += $(SEARCH_SOURCE) ;
+
+ MakeLocatePlatform $(target) ;
+ Depends $(target) : $(source) <build>collectcatkeys ;
+ LocalClean clean : $(target).pre ;
+ ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(source) ;
+}
+
+actions ExtractCatalogEntries1
+{
+ $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
+ cat "$(2[2-])" | $(CC) -E $(CCDEFS) $(HDRS) - > "$(1)".pre
+ $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
+ -w -o "$(1)" "$(1)".pre
+}
+
+rule LinkApplicationCatalog target : sources : signature : language
+{
+ # Link catalog entries from given catkey file into output compiled
catalog
+ # file. Compiled catalog file will then be copied into the image, but
only
+ # if the fingerprint matches the one from the untranslated catalog for
the
+ # same file.
+
+ MakeLocateArch $(target) ;
+ Depends $(target) : $(sources) <build>linkcatkeys ;
+ LocalClean clean : $(target) ;
+
+ HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
+ HAIKU_CATALOG_LANGUAGE on $(target) = $(language) ;
+ LinkApplicationCatalog1 $(target) : <build>linkcatkeys $(sources) ;
+}
+
+actions LinkApplicationCatalog1
+{
+ $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
+ $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \
+ -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
+}
+
+rule DoCatalogs target : signature : sources : sourceLanguage : regexp
+{
+ # DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
+ # [ : <regexp> ]
+ #
+ # Extracts the catkeys from a target's source files, generates the
+ # default catalog from them, and also generates catalogs for all
+ # translations.
+ #
+ # target: The target.
+ # signature: Application MIME signature (must match the one
+ # declared in the sourcecode).
+ # sources: List of cpp files where to search keys.
+ # sourceLanguage Short name of the language of used for the
strings in
+ # the sources. Optional: default
is "en".
+ # regexp The regular expression used to parse the files.
+ # Optional: default is matching be_catalog->GetString
+
+ local generatedCatalog = [ FGristFiles
$(sourceLanguage:E=en:S=.catalog) ] ;
+
+ # generate catkeys file from sources
+ ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
+ : [ FGristFiles $(sources) ] : $(signature) : $(regexp) ;
+
+ # find translations
+ local translationsDir
+ = [ FDirName $(HAIKU_TOP) data catalogs $(SUBDIR_TOKENS[2-]) ] ;
+ local translations = [ Glob $(translationsDir) : *.catkeys ] ;
+ translations = [ FGristFiles $(translations:BS) ] ;
+ SEARCH on $(translations) += $(translationsDir) ;
+
+ # generate catalogs from all catkeys files
+ local catkeysFiles = $(generatedCatalog:S=.catkeys) $(translations) ;
+ for catkeysFile in $(catkeysFiles) {
+ LinkApplicationCatalog $(catkeysFile:S=.catalog) :
$(catkeysFile)
+ : $(signature) : $(catkeysFile:B) ;
+ }
+
+ HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
+ HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
+}
Modified: haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackages
===================================================================
--- haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackages
2010-07-23 19:56:24 UTC (rev 37723)
+++ haiku/branches/developer/zooey/posix-locale/build/jam/OptionalPackages
2010-07-23 20:52:26 UTC (rev 37724)
@@ -763,8 +763,8 @@
# ICU-devel
if [ IsOptionalHaikuImagePackageAdded ICU-devel ] {
- InstallOptionalHaikuImagePackage icu-devel-4.4.1-2010-07-15.zip
- : $(baseURL)/icu-devel-4.4.1-2010-07-15.zip
+ InstallOptionalHaikuImagePackage $(HAIKU_ICU_DEVEL_PACKAGE)
+ : $(baseURL)/$(HAIKU_ICU_DEVEL_PACKAGE)
;
local arch = $(TARGET_ARCH) ;
Modified:
haiku/branches/developer/zooey/posix-locale/data/bin/install-wifi-firmwares.sh
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/bin/install-wifi-firmwares.sh
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/bin/install-wifi-firmwares.sh
2010-07-23 20:52:26 UTC (rev 37724)
@@ -158,6 +158,7 @@
function PreFirmwareInstallation()
{
+ echo "Installing firmware for ${driver} ..."
mkdir -p "${firmwareDir}/${driver}"
UnlinkDriver
}
@@ -168,6 +169,7 @@
SetFirmwarePermissions
SymlinkDriver
CleanTemporaryFiles
+ echo "... firmware for ${driver} has been installed."
}
@@ -308,6 +310,12 @@
# Build b43-fwcutter.
echo "Compiling b43-fwcutter for installing Broadcom's firmware ..."
make PREFIX=/boot/common CFLAGS="-I. -Wall -D_BSD_SOURCE" > /dev/null
2>&1
+ result=$?
+ if [ $result -gt 0 ]; then
+ echo "... failed to compile b43-fwcutter."
+ else
+ echo "... successfully compiled b43-fwcutter."
+ fi
if [ ! -e b43-fwcutter ] ; then
return 1
fi
Modified:
haiku/branches/developer/zooey/posix-locale/data/bin/installoptionalpackage
===================================================================
--- haiku/branches/developer/zooey/posix-locale/data/bin/installoptionalpackage
2010-07-23 19:56:24 UTC (rev 37723)
+++ haiku/branches/developer/zooey/posix-locale/data/bin/installoptionalpackage
2010-07-23 20:52:26 UTC (rev 37724)
@@ -42,7 +42,8 @@
# Some Packages cannot be installed,
# as they require either the source code or compiled binaries
declare packageIgnoreList="Bluetooth Development DevelopmentMin \
-DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData "
+DevelopmentBase MandatoryPackages UserlandFS Welcome WifiFirmwareScriptData \
+ICU-devel ICU "
function CreateInstallerScript()
@@ -144,6 +145,17 @@
archiveFile=\`echo \$3 | sed -s "s/http.*\///"\`
if ! [ -f \$archiveFile ] ; then
echo "Downloading \$3 ..."
+ # TODO : add some error handling for downloads
+ # local attempt=1
+ # while [ `wget -nv \$3 2>&1 > /dev/null ; echo \$?` -ne 0 -a
$attempt -lt 5 ]; do
+ # echo "Download attempt #\$attempt failed. Retrying ..."
+ # rm \$archiveFile
+ # (( attempt++ ))
+ # done
+ # if [ $attempt -ge 5 ]; then
+ # echo "Max download retries exceeded. Halting
installation."
+ # exit 1
+ # fi
wget -nv \$3
fi
@@ -633,6 +645,23 @@
countGenBashLine=0
# Parse out some variable declarations
+
+ # TODO : add these following variables to the CreateInstallerScript
+ # TODO : parse HAIKU_ICU_GCC_2_PACKAGE
+ #local regExp='/^HAIKU_ICU_GCC_2_PACKAGE/p'
+ #icuGcc2PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+ #ConvertVariableDeclarationLines "$regExp" 'icuGcc2PkgLine'
+
+ # TODO : parse HAIKU_ICU_GCC_4_PACKAGE
+ #local regExp='/^HAIKU_ICU_GCC_4_PACKAGE/p'
+ #icuGcc4PkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+ #ConvertVariableDeclarationLines "$regExp" 'icuGcc4PkgLine'
+
+ # TODO : parse HAIKU_ICU_DEVEL_PACKAGE
+ #local regExp='/^HAIKU_ICU_DEVEL_PACKAGE/p'
+ #icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+ #ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'
+
local regExp='/^HAIKU_OPENSSL_PACKAGE/p'
sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
@@ -650,6 +679,8 @@
while read line ; do
line=${line/'Echo'/'echo'}
+ # TODO: add support for converting for loops.
+ # will need to introduce curly brace counting
ConvertIfStatements "$line"
ConvertVariables "$line"
#ReplaceComparators "$line"
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
(from rev 37723,
haiku/trunk/data/catalogs/add-ons/tracker/zipomatic/da.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/da.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,18 @@
+1 danish x-vnd.haiku.zip-o-matic 274748138
+1 file added. file:ZipOMaticWindow.cpp 1 fil tilføjet.
+Stop file:ZipOMaticWindow.cpp Stop
+Creating archive: %s file:ZipOMaticWindow.cpp Opretter arkiv:
%s
+Continue file:ZipOMaticWindow.cpp Fortsæt
+Preparing to archive file:ZipperThread.cpp Forbereder arkivering
+Filename: %s file:ZipOMaticWindow.cpp Filnavn: %s
+Let them continue file:ZipOMatic.cpp Lad dem fortsætte
+Do you want to stop them? file:ZipOMatic.cpp Ønsker du at
stoppe dem?
+Are you sure you want to stop creating this archive?
file:ZipOMaticWindow.cpp Er du sikker på, at du ønsker at
afbryde arkiveringen?
+%ld files added. file:ZipOMaticWindow.cpp %ld filer
tilføjet.
+Stopped file:ZipOMaticWindow.cpp Stoppet
+Archive file:ZipperThread.cpp Arkiv
+Drop files to zip. file:ZipOMaticWindow.cpp Slip filer her
for at arkivere dem.
+Error creating archive file:ZipOMaticWindow.cpp Fejl i
forbindelse med oprettelsen af arkiv
+You have %ld Zip-O-Matic running.\n\n file:ZipOMatic.cpp Du har
%ld Zip-O-Matic kørende.\n\n
+Archive created OK file:ZipOMaticWindow.cpp Arkiv oprettet
uden fejl
+Stop them file:ZipOMatic.cpp Stop dem
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
(from rev 37723,
haiku/trunk/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/ko.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,18 @@
+1 korean x-vnd.haiku.zip-o-matic 274748138
+1 file added. file:ZipOMaticWindow.cpp 1 파일 추가됨.
+Stop file:ZipOMaticWindow.cpp 정지
+Creating archive: %s file:ZipOMaticWindow.cpp 압축파일 만드는 중: %s
+Continue file:ZipOMaticWindow.cpp 계속
+Preparing to archive file:ZipperThread.cpp 압축하기 위해 준비중
+Filename: %s file:ZipOMaticWindow.cpp 파일이름: %s
+Let them continue file:ZipOMatic.cpp 작업 계속
+Do you want to stop them? file:ZipOMatic.cpp 당신은 작업을
중단하시겠습니까?
+Are you sure you want to stop creating this archive?
file:ZipOMaticWindow.cpp 압축파일 만드는 것을 중단하시겠습니까?
+%ld files added. file:ZipOMaticWindow.cpp %ld 파일 더해짐.
+Stopped file:ZipOMaticWindow.cpp 정지됨
+Archive file:ZipperThread.cpp 압축파일
+Drop files to zip. file:ZipOMaticWindow.cpp 압축할 파일을 떨어트려
주세요.
+Error creating archive file:ZipOMaticWindow.cpp 압축파일 만드는 중에 에러
발생
+You have %ld Zip-O-Matic running.\n\n file:ZipOMatic.cpp
Zip-O-Matic %ld개가 실행중입니다.\n\n
+Archive created OK file:ZipOMaticWindow.cpp 압축파일 만들기 성공
+Stop them file:ZipOMatic.cpp 작업 정지
Modified:
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/nl.catkeys
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/nl.catkeys
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/add-ons/tracker/zipomatic/nl.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -6,13 +6,13 @@
Preparing to archive file:ZipperThread.cpp Archivering voorbereiden
Filename: %s file:ZipOMaticWindow.cpp Bestandsnaam: %s
Let them continue file:ZipOMatic.cpp Laat ze doorgaan
-Do you want to stop them? file:ZipOMatic.cpp Wilt u hen
stoppen?
-Are you sure you want to stop creating this archive?
file:ZipOMaticWindow.cpp Weet u zeker dat u de creatie van dit
archief wilt stoppen?
+Do you want to stop them? file:ZipOMatic.cpp Wilt u ze
stoppen?
+Are you sure you want to stop creating this archive?
file:ZipOMaticWindow.cpp Bent u zeker dat u de creatie van dit
archief wilt stoppen?
%ld files added. file:ZipOMaticWindow.cpp %ld bestanden
toegevoegd.
Stopped file:ZipOMaticWindow.cpp Gestopt
Archive file:ZipperThread.cpp Archief
Drop files to zip. file:ZipOMaticWindow.cpp Sleep bestanden
hierheen om te archiveren.
-Error creating archive file:ZipOMaticWindow.cpp Fout bij
creëren van archief
+Error creating archive file:ZipOMaticWindow.cpp Fout bij
creatie van archief
You have %ld Zip-O-Matic running.\n\n file:ZipOMatic.cpp Uw %ld
Zip-O-Matic zijn actief.\n\n
Archive created OK file:ZipOMaticWindow.cpp Creatie van
archief gelukt
-Stop them file:ZipOMatic.cpp Hen stoppen
+Stop them file:ZipOMatic.cpp Stoppen
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/eo.catkeys
(from rev 37723, haiku/trunk/data/catalogs/apps/aboutsystem/eo.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/eo.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/eo.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,3 @@
+1 esperanto x-vnd.Haiku-About 1121052845
+Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis
Geiselbrecht (kaj lia NewOS kerno)\n
+%ld Processors: AboutView %ld Procesoroj:
Modified:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/lt.catkeys
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/lt.catkeys
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/lt.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -1,4 +1,4 @@
-1 lithuanian x-vnd.Haiku-About 1634947051
+1 lithuanian x-vnd.Haiku-About 1829924476
Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis
Geiselbrecht'as (bei jo NewOS branduolys)\n
%ld Processors: AboutView %ld Procesoriai:
Michael Phipps (project founder)\n\n AboutView Michael'is
Phipps'as (porojekto įkūrėjas)\n\n
@@ -34,3 +34,6 @@
The BeGeistert team\n AboutView „BeGeistert“ komandai\n
The copyright to the Haiku code is property of Haiku, Inc. or of the
respective authors where expressly noted in the source. Haiku and the Haiku
logo are trademarks of Haiku, Inc.\n\n AboutView Haiku
pirminių tekstų autorinės teisės priklauso Haiku, Inc. arba autoriams,
nurodytiems tuose pirminiuose tekstuose. Haiku bei Haiku ženklas yra Haiku,
Inc. prekių ženklai.\n\n
GCC %d Hybrid AboutView GCC %d hibridas
+%d MiB total AboutView %d MiB viso
+%d MiB used (%d%%) AboutView %d MiB išnaudota (%d%%)
+%d MiB total, %d MiB inaccessible AboutView %d MiB viso, %d
MiB nepasiekiama
Modified:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/ru.catkeys
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/ru.catkeys
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/ru.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -1,4 +1,4 @@
-1 russian x-vnd.Haiku-About 3743087590
+1 russian x-vnd.Haiku-About 1829924476
Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis
Geiselbrecht (за его ядро NewOS)\n
%ld Processors: AboutView %ld Процессоры:
Michael Phipps (project founder)\n\n AboutView Michael Phipps
(основателю проекта)\n\n
@@ -34,5 +34,6 @@
The BeGeistert team\n AboutView команде BeGeistert\n
The copyright to the Haiku code is property of Haiku, Inc. or of the
respective authors where expressly noted in the source. Haiku and the Haiku
logo are trademarks of Haiku, Inc.\n\n AboutView Права на
код Haiku принадлежат Haiku, Inc. или конкретным авторам, указанным в исходном
коде. Haiku и логотип Haiku являются торговыми марками Haiku, Inc.\n\n
GCC %d Hybrid AboutView GCC %d Гибрид
+%d MiB total AboutView Всего %d МиБ
%d MiB used (%d%%) AboutView Использовано %d МиБ (%d%%)
%d MiB total, %d MiB inaccessible AboutView %d МиБ всего,
%d МиБ недоступно
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/sv.catkeys
(from rev 37723, haiku/trunk/data/catalogs/apps/aboutsystem/sv.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/sv.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/aboutsystem/sv.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,39 @@
+1 swedish x-vnd.Haiku-About 1829924476
+Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis
Geiselbrecht (och hans NewOS-kärna)\n
+%ld Processors: AboutView %ld Processorer:
+Michael Phipps (project founder)\n\n AboutView Michael Phipps
(projektgrundare)\n\n
+The Haiku-Ports team\n AboutView Haiku Ports-teamet\n
+Website, marketing & documentation:\n AboutView Webbplats,
marknadsföring och dokumentation:\n
+Revision AboutView Utgåva
+Source Code: AboutView Källkod:
+Processor: AboutView Processor:
+Kernel: AboutView Kärna:
+Contributors:\n AboutView Medarbetare:\n
+Unknown AboutView Okänd
+\n… and probably some more we forgot to mention (sorry!)\n\n AboutView
\n… och troligtvis fler. Förlåt om vi glömt någon!\n\n
+%.2f GHz AboutView %.2f GHz
+Memory: AboutView Minne:
+Past maintainers:\n AboutView Tidigare projektledare:\n
+The code that is unique to Haiku, especially the kernel and all code that
applications may link against, is distributed under the terms of the
AboutView Haikus egen kod, främst den för kärnan och för de
bibliotek som applikationer kan länkas med, görs tillgänglig under
förutsättningarna som anges i
+\n\nSpecial thanks to:\n AboutView \n\nSärskilt tack
till:\n
+Licenses: AboutView Licenser:
+. Some system libraries contain third party code distributed under the LGPL
license. You can find the copyrights to third party code below.\n\n
AboutView . Några av systemets kodbibliotek är skapade av tredje
part och distributeras med LGPL-licens. Copyright anges nedan.\n\n
+\nCopyrights\n\n AboutView \nCopyrights\n\n
+Current maintainers:\n AboutView Nuvarande projektledare:\n
+Time running: AboutView Tid sedan uppstart:
+MIT license AboutView MIT-licens
+The Haikuware team and their bounty program\n AboutView
Haikuware-teamet och deras bounty-program\n
+About this system AboutWindow Om det här systemet
+Version: AboutView Version:
+%ld MHz AboutView %ld MHz
+[Click a license name to read the respective license.]\n\n AboutView
[Klicka på ett licensnamn för att läsa respektive licens.]\n\n
+License: AboutView Licens:
+Translations:\n AboutView Översättningar:\n
+... and the many people making donations!\n\n AboutView ... och
alla de som donerat pengar!\n\n
+Google & their Google Summer of Code program\n\n AboutView
Google och deras program Google Summer of Code\n\n
+The BeGeistert team\n AboutView BeGeistert-teamet\n
+The copyright to the Haiku code is property of Haiku, Inc. or of the
respective authors where expressly noted in the source. Haiku and the Haiku
logo are trademarks of Haiku, Inc.\n\n AboutView Copyright
för Haikus olika delar ägs av Haiku, Inc och de upphovsmän som anges i
källkoden. Namnet Haiku och dess logotyp är varumärken som ägs av Haiku,
Inc.\n\n
+GCC %d Hybrid AboutView GCC %d-hybrid
+%d MiB total AboutView %d MiB totalt
+%d MiB used (%d%%) AboutView %d MiB använt (%d%%)
+%d MiB total, %d MiB inaccessible AboutView %d MiB totalt,
%d MiB oåtkomligt
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/zh-hans.catkeys
(from rev 37723, haiku/trunk/data/catalogs/apps/bootman/zh-hans.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/zh-hans.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/bootman/zh-hans.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,55 @@
+1 simplified_chinese x-vnd.Haiku-bootman 705138509
+The boot manager has been successfully installed on your system.
BootManagerController 启动管理器已经成功安装到您的系统。
+At least one partition must be selected! BootManagerController
至少选择一个分区！
+The old Master Boot Record could not be saved to %s BootManagerController
原始主引导记录（MBR）不能够保存到 %s
+The Master Boot Record (MBR) of the boot device:\n\t%s\nwill now be saved to
disk. Please select a file to save the MBR into.\n\nIf something goes wrong
with the installation or if you later wish to remove the boot menu, simply run
the bootman program and choose the 'Uninstall' option. BootManagerController
启动设置的主引导记录(MBR):\n\t%s\将被保存到磁盘。选择文件以保存 MBR \n\如果安装出错，或者之后需要删除启动菜单，只要运行
bootman 程序，然后选择“卸载”即可。
+About to restore the Master Boot Record (MBR) of %disk from %file. Do you wish
to continue? BootManagerController Don't translate the place holders:
%disk and %file 将要恢复%磁盘的主引导记录，记录文件为%。是否继续？
+An error occurred writing the boot menu. The Master Boot Record might be
destroyed, you should restore the MBR now! BootManagerController
引导菜单写入错误！主引导记录可能已被破坏， 请恢复MBR！
+Uninstall boot menu EntryPage Title 卸载启动菜单
+Write boot menu BootManagerController Button 写入启动菜单
+File: FileSelectionPage Text control label 文件:
+Uninstallation of boot menu completed BootManagerController Title 启动菜单卸载完成
+Back BootManagerController Button 返回
+Install boot menu EntryPage Title 安装启动菜单
+Choose this option to install a boot menu, allowing you to select which
operating system to boot when you turn on your computer. EntryPage
选择该选项以安装启动菜单，这将允许您在启动计算机时选择希望启动的操作系统。
+Please locate the Master Boot Record (MBR) save file to restore from. This is
the file that was created when the boot manager was first installed.
BootManagerController 选择主引导记录（MBR）的保存位置以备恢复。该文件在启动管理器首次安装时将被创建。
+Unnamed %d LegacyBootDrive Default name of a partition whose name could
not be read from disk; characters in codepage 437 are allowed only 未命名 %d
+The partition table of the first hard disk is not compatible with Boot
Manager.\nBoot Manager needs 2 KB available space before the first partition.
BootManagerController 第一块硬盘的分区表与启动管理器不兼容.\n启动管理器在第一分区前需要 2 KB 的可用空间
+Partition table not compatible BootManagerController Title 分区表不兼容
+The following partitions were detected. Please check the box next to the
partitions to be included in the boot menu. You can also set the names of the
partitions as you would like them to appear in the boot menu. PartitionsPage
系统侦测到了下面的分区。选中分区旁的选择框，将该分区包含在启动菜单中。你也可以在启动菜单中设置自定义的分区名。
+The Master Boot Record of the boot device (%s) has been successfully restored
from %s. BootManagerController 启动设备的主引导记录 (%s) 已从 %s 中恢复成功。
+Restore MBR BootManagerController Button 恢复 MBR
+Choose this option to remove the boot menu previously installed by this
program.\n EntryPage 选中该选项以删除由本程序安装的启动菜单。\n
+Summary BootManagerController Title 摘要
+Installation of boot menu failed BootManagerController Title 启动菜单安装失败
+The Master Boot Record could not be restored! BootManagerController
主引导记录无法恢复！
+Partitions PartitionsPage Title 分区
+Partitions DefaultPartitionPage Pop up menu title 分区
+Uninstallation of boot menu failed BootManagerController Title 启动菜单卸载失败
+About to write the following boot menu to the boot disk (%s). Please verify
the information below before continuing. BootManagerController
将要把下面的启动菜单写入启动磁盘 (%s)。继续之前，请检核下面的信息。
+Installation of boot menu completed BootManagerController Title 启动菜单安装完成
+Please locate the Master Boot Record (MBR) save file to restore from. This is
the file that was created when the boot manager was first installed.
UninstallPage 选择主引导记录（MBR）文件保存位置以备恢复。该文件在启动管理器首次安装时被创建。
+Uninstall boot manager BootManagerController Title 卸载启动管理器
+Uninstall Boot Manager UninstallPage Title 卸载启动管理器
+Old Master Boot Record saved BootManagerController Title 原始主引导记录保存完成
+Boot Manager BootManagerWindow Window Title 启动管理器
+Old Master Boot Record Saved failure BootManagerController Title
原始主引导记录保存失败
+Boot Manager is unable to read the partition table! BootManagerController
启动管理器无法读入分区表
+Default Partition: DefaultPartitionPage Menu field label 默认分区:
+Default Partition DefaultPartitionPage Title 默认分区
+Error reading partition table BootManagerController Title 分区表读取错误
+About to write the boot menu to disk. Are you sure you want to continue?
BootManagerController 启动菜单将被写入磁盘。是否继续？
+Backup Master Boot Record BootManagerController Title 备份主引导记录
+Haiku Boot Manager BootManager About text title Haiku 启动管理器
+written by BootManager 编写者
+Copyright %year, Haiku Inc.\n BootManager Leave %year untranslated
Copyright %年, Haiku Inc.\n
+After two seconds DefaultPartitionPage 两秒之后
+Timeout: %s DefaultPartitionPage 超时: %s
+After four seconds DefaultPartitionPage 四秒之后
+Please specify a default partition and a timeout.\nThe boot menu will load the
default partition after the timeout unless you select another partition. You
can also have the boot menu wait indefinitely for you to select a
partition.\nKeep the 'ALT' key pressed to disable the timeout at boot time.
DefaultPartitionPage
选择一个默认的分区和时间.\n如果在限定时间内，您没有选择其他分区，启动菜单将会引导默认分区。您也可以控制启动菜单直到选定一个分区。\n
在超出限定时间之前，按下‘Alt’键以延长选择时间。
+After one second DefaultPartitionPage 一秒之后
+After one minute DefaultPartitionPage 一分钟后
+After five seconds DefaultPartitionPage 五秒之后
+Never DefaultPartitionPage 从不
+Immediately DefaultPartitionPage 立即
+After three seconds DefaultPartitionPage 三秒之后
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/codycam/sv.catkeys
(from rev 37723, haiku/trunk/data/catalogs/apps/codycam/sv.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/codycam/sv.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/codycam/sv.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,4 @@
+1 swedish x-vnd.Haiku.CodyCam 3178836775
+Capturing Image… VideoConsumer.cpp Fångar bild…
+Every 30 seconds CodyCam Var 30:e sekund
+Capture Rate Menu CodyCam **** THIS SHOULD NOT BE A TRANSLATION
STRING ***
Copied:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/eo.catkeys
(from rev 37723, haiku/trunk/data/catalogs/apps/deskbar/eo.catkeys)
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/eo.catkeys
(rev 0)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/eo.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -0,0 +1,11 @@
+1 esperanto x-vnd.Be-TSKB 2834616797
+Applications PreferencesWindow Aplikaĵoj
+Recent applications BeMenu Ĵusaj aplikaĵoj
+Edit menu… PreferencesWindow Menuo Redakti…
+Recent documents: PreferencesWindow Ĵusaj dokumentoj:
+Recent folders BeMenu Ĵusaj dosierujoj
+Sort running applications PreferencesWindow Ordigi aktivajn
aplikaĵojn
+Change time… TimeView Regli la horloĝon…
+<Be folder is empty> BeMenu <La dosierujo Be estas malplena>
+Window PreferencesWindow Fenestro
+Menu PreferencesWindow Menuo
Modified:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/lt.catkeys
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/lt.catkeys
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/lt.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -1,3 +1,42 @@
-1 lithuanian x-vnd.Be-TSKB 1884644663
+1 lithuanian x-vnd.Be-TSKB 3810030877
Applications PreferencesWindow Programos
Recent applications BeMenu Naudotos programos
+Edit menu… PreferencesWindow Taisyti meniu…
+Recent documents: PreferencesWindow Paskiausi dokumentai:
+Recent folders BeMenu Paskiausiai lankyti aplankai
+Sort running applications PreferencesWindow Rikiuoti
paleistas programas
+Change time… TimeView Keisti laiką…
+<Be folder is empty> BeMenu <Meniu aplankas tuščias>
+Window PreferencesWindow Langas
+Menu PreferencesWindow Meniu
+Show seconds PreferencesWindow Rodyti sekundes
+Always on top PreferencesWindow Visuomet viršuje
+Show all WindowMenu Rodyti visus
+No windows WindowMenu Langų nėra
+Power off BeMenu Išjungti
+Auto-raise PreferencesWindow Automatiškai iškilti
+Full date PreferencesWindow Ilgasis datos formatas
+Hide time TimeView Nerodyti laikrodžio
+Recent folders: PreferencesWindow Paskiausi aplankai:
+Deskbar preferences… BeMenu Užduočių juostos parinktys…
+Show application expander PreferencesWindow Rodyti programų
skleistuką
+Close all WindowMenu Užverti visus
+Deskbar preferences PreferencesWindow Užduočių juostos
parinktys
+Mount BeMenu Prijungti diską
+Recent applications: PreferencesWindow Paskiausios programos:
+Tracker always first PreferencesWindow „Tracker“ rikiuoti
pradžioje
+About Haiku… BeMenu Apie „Haiku“…
+Show calendar… TimeView Rodyti kalendorių…
+Restart system BeMenu Perleisti kompiuterį
+Find… BeMenu Ieškoti…
+Restart Tracker BeMenu Perleisti „Tracker“
+Show Time Tray Rodyti laikrodį
+Expand new applications PreferencesWindow Išskleisti
paleidžiamas programas
+Clock PreferencesWindow Laikrodis
+Recent documents BeMenu Paskiausiai atverti dokumentai
+Hide all WindowMenu Slėpti visus
+Shutdown… BeMenu Kompiuterio išjungimas…
+Suspend BeMenu Pristabdyti
+Quit application WindowMenu Užbaigti programos darbą
+About this system… BeMenu Apie šią sistemą…
+Show replicants BeMenu Rodyti integravimo rankenėles
Modified:
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt.catkeys
===================================================================
---
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt.catkeys
2010-07-23 19:56:24 UTC (rev 37723)
+++
haiku/branches/developer/zooey/posix-locale/data/catalogs/apps/deskbar/pt.catkeys
2010-07-23 20:52:26 UTC (rev 37724)
@@ -1,3 +1,42 @@
-1 portuguese x-vnd.Be-TSKB 1884644663
+1 portuguese x-vnd.Be-TSKB 3810030877
Applications PreferencesWindow Aplicações
Recent applications BeMenu Aplicações recentes
+Edit menu… PreferencesWindow Editar menu...
+Recent documents: PreferencesWindow Documentos recentes:
+Recent folders BeMenu Pastas recentes:
+Sort running applications PreferencesWindow Ordenar
aplicações em execução
+Change time… TimeView Mudar hora...
+<Be folder is empty> BeMenu <Pasta Be vazia>
+Window PreferencesWindow Janela
+Menu PreferencesWindow Menu
+Show seconds PreferencesWindow Mostrar segundos
+Always on top PreferencesWindow Sempre visível
+Show all WindowMenu Mostrar todas
+No windows WindowMenu Não mostrar janelas
+Power off BeMenu Desligar
+Auto-raise PreferencesWindow Elevar automaticamente
+Full date PreferencesWindow Data completa
+Hide time TimeView Ocultar hora
+Recent folders: PreferencesWindow Pastas recentes:
+Deskbar preferences… BeMenu Preferências da Deskbar...
+Show application expander PreferencesWindow Mostrar
expansor de aplicação
+Close all WindowMenu Fechar todas
+Deskbar preferences PreferencesWindow Preferências da Deskbar
+Mount BeMenu Montar
+Recent applications: PreferencesWindow Aplicações recentes:
Other related posts:
- » [haiku-commits] r37724 - in haiku/branches/developer/zooey/posix-locale: . build/jam data/bin data/catalogs/add-ons/tracker/zipomatic data/catalogs/apps ... - zooey
