diff --git a/3rdparty/mmu_man/scripts/HardwareChecker.sh b/3rdparty/mmu_man/scripts/HardwareChecker.sh new file mode 100755 index 0000000000..a80b3425fc --- /dev/null +++ b/3rdparty/mmu_man/scripts/HardwareChecker.sh @@ -0,0 +1,366 @@ +#!/bin/sh +# HardwareChecker.sh for Haiku +# +# Copyright 2011, François Revol . +# +# Distributed under the MIT License +# +# Created: 2011-10-25 +# + + +netcat=netcat +report_site=fake.haikuware.com +report_cgi=http://haikuware.com/hwreport.php + +do_notify () +{ + p="$1" + m="$2" + shift + shift + notify --type progress \ + --messageID hwck_$$ \ + --icon /system/apps/Devices \ + --app HardwareChecker \ + --title "progress:" --progress "$p" "$m" "$@" + + +} + +start_fake_httpd () +{ + report_port=8989 + report_file="$(finddir B_DESKTOP_DIRECTORY)/hwchecker_report_$$.txt" + report_ack="

Done! You can close this window now.

" + report_cgi=http://127.0.0.1:$report_port/hwreport + ( + # force a previous isntance to close + $netcat 127.0.0.1 8989 < /dev/null > /dev/null + echo "listening on port $report_port" + # + (echo -e "HTTP/1.1 100 Continue\r\n\r\n"; echo -e "HTTP/1.1 200 OK\r\nDate: $(date)\r\nContent-Type: text/html\r\nContent-Length: ${#report_ack}\r\n\r\n$report_ack") | $netcat -q 1 -l -p $report_port > "$report_file" + + # make sure we have something + if [ -s "$report_file" ]; then + open "$report_file" + sleep 1 + alert "A file named $(basename $report_file) has been created on your desktop. You can copy this file to an external drive to submit it with another operating system." "Ok" + else + rm "$report_file" + fi + ) & +} + +detect_network () +{ + ping -c 1 "$report_site" + if [ "$?" -gt 0 ]; then + alert --stop "Cannot contact the hardware report site ($report_site). +You can continue anyway and generate a local file to submit later on, or try to configure networking." "Cancel" "Configure Network" "Continue" + case "$?" in + 0) + exit 0 + ;; + 1) + /system/preferences/Network + detect_network + ;; + 2) + start_fake_httpd + ;; + *) + exit 1 + ;; + esac + fi +} + +check_pci () +{ + echo "

PCI devices

" + echo "
List of detected PCI devices. This does not indicate that every probed device is supported by a driver.

" + devn=0 + bus="pci" + vendor='' + device='' + true; + listdev | while read line; do + + case "$line" in + device*) + case "$vendor" in + "") + desc="${line/device /}" + echo "
$desc
" + ;; + *) + devicestr=${line#*:} + device="${line%:*}" + device="${device#device }" + echo "
" + echo "
$vendor:$device $vendorstr:$devicestr
" + descline="$vendor:$device \"$vendorstr\" \"$devicestr\" $desc" + echo "
Identification:
" + + echo "
" + echo "" + echo "" + echo "
" + echo "Status: " + echo "" + echo "" + echo "
" + #echo "
" + echo "" + echo "
" + #echo "
" + echo "" + echo "
" + echo "
" + + echo "
" + echo "Is it an add-in card (not part of the motherboard) ? " + echo "" + echo "
" + + echo "
" + echo "Comment: " + echo "" + echo "
" + + echo "
" + + echo "
" + + vendor='' + devn=$(($devn+1)) + ;; + esac + ;; + vendor*) + vendorstr=${line#*:} + vendor="${line%:*}" + vendor="${vendor#vendor }" + ;; + *) + ;; + esac + done +} + +check_usb () +{ + echo "

USB devices

" + echo "
List ot detected USB devices. This does not indicate that every probed device is supported by a driver.

" + devn=0 + bus="usb" + listusb | while read vpid dev desc; do + echo "
$desc
" + echo "
" + echo "
Identification:
" + if [ "$vpid" != "0000:0000" ]; then + enabled=1 + id="" + + echo "
" + echo "" + echo "" + echo "
" + echo "Status: " + echo "" + echo "" + echo "
" + #echo "
" + echo "" + echo "
" + #echo "
" + echo "" + echo "
" + echo "
" + + echo "
" + echo "Is it an external device (not part of the motherboard) ? " + echo "" + echo "
" + + echo "
" + echo "Comment: " + echo "" + echo "
" + else + echo "
(virtual device)
" + fi + + echo "
" + echo "
" + devn=$(($devn+1)) + done + echo "
" +} + +check_dmidecode () { + which dmidecode >/dev/null 2>&1 || return + + # make sure /dev/mem is published + ls -l /dev/misc/mem > /dev/null + + echo "

DMIdecode output

" + echo "The output of dmidecode gives exact vendor and device identification." + + echo "

dmidecode

" + echo "(full output, stripped from the machine UUID)
" + echo "" + + dmidecode_bios_vendor="$(dmidecode -s bios-vendor)" + dmidecode_bios_version="$(dmidecode -s bios-version)" + dmidecode_bios_release_date="$(dmidecode -s bios-release-date)" + dmidecode_system_manufacturer="$(dmidecode -s system-manufacturer)" + dmidecode_system_product_name="$(dmidecode -s system-product-name)" + dmidecode_system_version="$(dmidecode -s system-version)" +} + +check_machine () +{ + echo "

Machine

" + echo "Vendor: " + echo "
" + echo "Model: " + echo "
" + echo "Specification page: " + echo "
" + echo "Comments:
" + echo "" + echo "
" +} + +check_haiku () +{ + echo "

Haiku

" + uname_r="$(uname -r)" + uname_v="$(uname -v)" + echo "Release: " + echo "
" + echo "Version: " + echo "
" + echo "Comments:
" + echo "" + echo "
" +} + +check_utils () +{ + echo "

Utilities output

" + echo "The output of some system utilities gives precious informations on the processor model and other stuff..." + + echo "

sysinfo

" + echo "(system info)
" + echo "" + + echo "

listimage 1

" + echo "(list of loaded kernel drivers)
" + echo "" + + echo "

ifconfig

" + echo "(list of network interfaces)
" + echo "" + + echo "

installoptionalpackage -l

" + echo "(list of installed packaged)
" + echo "" + + echo "
" +} + +check_syslog () +{ + echo "

System log

" + echo "
Part of the system boot log that could help developer understand why some devices are not recognized...
" + echo "" + +} + +check_sender () +{ + echo "

Sender info (optional)

" + echo "Name: " + echo "
" + echo "Mail: " + echo "
" + echo "Other comments:
" + echo "" + echo "
" +} + +check_all () +{ + echo "" + echo "" + echo '' + echo "Hardware report" + #echo '' + + echo "" + echo "" + echo "" + echo "
" + echo "
" + + do_notify 0.1 "Checking for PCI hardware..." + check_pci + + do_notify 0.2 "Checking for USB hardware..." + check_usb + + do_notify 0.3 "Checking for utility outputs..." + check_utils + + do_notify 0.7 "Dumping syslog output..." + check_syslog + + do_notify 0.8 "Checking machine infos..." + check_dmidecode + check_machine + + do_notify 0.9 "Checking for Haiku version..." + check_haiku + + check_sender + + do_notify 1.0 "Done!" --timeout 3 + + echo "
Note: this form will only send data that is visible on this page.
" + + echo "" + + echo "
" + echo "
" + echo "" + echo "" +} + +tf=/tmp/hw_checker_$$.html + +do_notify 0.0 "Checking for network..." +detect_network + +check_all > "$tf" + +open "$tf" + diff --git a/3rdparty/pulkomandy/catmerge.sh b/3rdparty/pulkomandy/catmerge.sh new file mode 100755 index 0000000000..1a0b729329 --- /dev/null +++ b/3rdparty/pulkomandy/catmerge.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +if [ $# -eq 2 ] + then + OLD=$1 + NEW=$2 + + # We need a tab character as a field separator + TAB=`echo -e "\t"` + + #Temporary storage + TEMPFILE=`mktemp /tmp/catmerge.XXXXX` + + # Extract the list of keys to remove + # Compare (diff) the keys only (cut) ; keep only 'removed' lines (grep -), + # Ignore diff header and headlines from both files (tail), remove diff's + # prepended stuff (cut) + # Put the result in our tempfile. + diff -u <(cut -f 1,2 $OLD) <(cut -f 1,2 $NEW) |grep ^-|\ + tail -n +3|cut -b2- > $TEMPFILE + + # Reuse the headline from the new file (including fingerprint). This gets + # the language wrong, but it isn't actually used anywhere + head -1 $NEW + # Sort-merge old and new, inserting lines from NEW into OLD (sort); + # Exclude the headline from that (tail -n +2) + # Then, filter out the removed strings (fgrep) + sort -u -t"$TAB" -k 1,2 <(tail -n +2 $OLD) <(tail -n +2 $NEW)|\ + fgrep -v -f $TEMPFILE + + rm $TEMPFILE + + else + echo "$0 OLD NEW" + echo "merges OLD and NEW catalogs, such that all the keys in NEW that are" + echo "not yet in OLD are added to it, and the one in OLD but not in NEW are" + echo "removed. The fingerprint is also updated." +fi diff --git a/ReadMe b/ReadMe index 5bf4fa894f..9ddc712bc2 100644 --- a/ReadMe +++ b/ReadMe @@ -1,35 +1,115 @@ -Building on BeOS -================ +Building Haiku from source +========================== -For building on BeOS you need the development tools from: +This is a overview into the process of building HAIKU from source. +An online version is available at http://www.haiku-os.org/guides/building/ - http://haiku-os.org/downloads +Official releases of Haiku are at http://www.haiku-os.org/get-haiku +The (unstable) nightly builds are available at http://www.haiku-files.org -Please always use the most recent versions. They are required to build Haiku. +To build Haiku, you will need to + * ensure pre-requisite software is installed + * download sources + * configure your build + * run jam to initiate the build process + +We currently support these platforms: + * Haiku + * Linux + * FreeBSD + * Mac OS X Intel + +Pre-requisite software +====================== + +Tools provided within Haiku's repositories + + * Jam (Jam 2.5-haiku-20090626) + * Haiku's cross-compiler (needed only for non-Haiku platforms) + +The tools to compile Haiku will vary, depending on the platform that you are +using to build Haiku. When building from Haiku, all of the necessary +development tools are included in official releases (e.g. R1 alpha 1) and in the +(unstable) nightly builds. + + * Subversion client + * SSH client (for developers with commit access) + * gcc and the binutils (as, ld, etc., required by gcc) + * make (GNU make) + * bison + * flex and lex (usually a mini shell script invoking flex) + * makeinfo (part of texinfo, needed for building gcc 4 only) + * autoheader (part of autoconf, needed for building gcc) + * automake + * gawk + * yasm (http://www.tortall.net/projects/yasm/wiki/Download) + * wget + * (un)zip + * cdrtools (not genisoimage!) + * case-sensitive file system + +Whether they are installed can be tested for instance by running them in the +shell with the "--version" parameter. + +Specific: Haiku for the ARM platform +------------------------------------ + +The following tools are needed to compile Haiku for the ARM platform + + * mkimage (http://www.denx.de/wiki/UBoot) + * Mtools (http://www.gnu.org/software/mtools/intro.html) + * sfdisk + +Specific: Mac OS X +------------------ + +Disk Utility can create a case-sensitive disk image of at least 3 GiB in size. +The following darwin ports need to be installed: + * expat + * gawk + * gettext + * libiconv + * gnuregex + * gsed + +More information about individual distributions of Linux and BSD can be found +at http://haiku-os.org/guides/building/pre-reqs -Building on a non-BeOS platform -=============================== +Download Haiku's sources +======================== -Please read the file 'ReadMe.cross-compile' before continuing. It describes -how to build the cross-compilation tools and configure the build system for -building Haiku. After following the instructions you can directly continue -with the section Building. +There are two parts to Haiku's sources -- the code for Haiku itself and a set +of build tools for compiling Haiku on an operating system other than Haiku. +The buildtools are needed only for non-Haiku platform. + +Anonymous checkout: + svn co http://svn.haiku-os.org/haiku/haiku/trunk haiku + svn co http://svn.haiku-os.org/haiku/buildtools/trunk buildtools + +Developer with commit access: + svn co svn+ssh://@svn.haiku-os.org/srv/svn/repos/haiku/haiku/trunk haiku + svn co svn+ssh://@svn.haiku-os.org/srv/svn/repos/haiku/buildtools/trunk buildtools -Configuring on BeOS -=================== +Building the Jam executable +=========================== -Open a Terminal and change to your Haiku trunk folder. To configure the build -you can run configure like this: +This step applies only to non-Haiku platforms. - ./configure --target=TARGET +Change to the buildtools folder and we will start to build 'jam' which is a +requirement for building Haiku. Run the following commands to generate and +install the tool: -Where "TARGET" is the target platform that the compiled code should run on: - * haiku (default) - * r5 - * bone - * dano (also for Zeta) + cd buildtools/jam + make + sudo ./jam0 install + -- or -- + ./jam0 -sBINDIR=$HOME/bin install + + +Configuring your build +====================== The configure script generates a file named "BuildConfig" in the "generated/build" directory. As long as configure is not modified (!), there @@ -37,23 +117,84 @@ is no need to call it again. That is for re-building you only need to invoke jam (see below). If you don't update the source tree very frequently, you may want to execute 'configure' after each update just to be on the safe side. +Depending on your goal, there are several different ways to configure Haiku. +You can either call configure from within your Haiku trunk folder. That will +prepare a folder named 'generated', which will contain the compiled objects. +Another option is to manually created one or more 'generated.*' folders and run +configure from within them. For example imagine the following directory setup -Building -======== + buildtools-trunk/ + haiku-trunk/ + haiku-trunk/generated.x86gcc2 + haiku-trunk/generated.x86gcc4 + +Configure a GCC 2.95 Hybrid, from non-Haiku platform +---------------------------------------------------- + + cd haiku-trunk/generated.x86gcc4 + ../configure --use-gcc-pipe --use-xattr \ + --build-cross-tools-gcc4 x86 ../../buildtools/ \ + --alternative-gcc-output-dir ../generated.x86gcc2 + cd ../generated.x86gcc2 + ../configure --use-gcc-pipe --use-xattr \ + --build-cross-tools ../../buildtools/ \ + --alternative-gcc-output-dir ../generated.x86gcc4 + +Configure a GCC 2.95 Hybrid, from within Haiku +---------------------------------------------- + + cd haiku-trunk/generated.x86gcc4 + ../configure --use-gcc-pipe \ + --alternative-gcc-output-dir ../generated.x86gcc2 \ + --cross-tools-prefix /boot/develop/abi/x86/gcc4/tools/current/bin/ + cd ../generated.x86gcc2 + ../configure --use-gcc-pipe \ + --alternative-gcc-output-dir ../generated.x86gcc4 \ + --cross-tools-prefix /boot/develop/abi/x86/gcc2/tools/current/bin/ + +Additional information about GCC Hybrids can be found on the website, +http://www.haiku-os.org/guides/building/gcc-hybrid + +Configure options +----------------- + +The various runtime options for configure are documented in it's onscreen help + + ./configure --help + + +Building via Jam +================ Haiku can be built in either of two ways, as disk image file (e.g. for use -with emulators) or as installation in a directory. +with emulators, to be written directly to a usb stick, burned as a compact +disc) or as installation in a directory. -Image File ----------- +Running Jam +----------- - jam -q haiku-image +There are various ways in which you can run jam. -This generates an image file named 'haiku.image' in your output directory -under 'generated/'. + * If you have a single generated folder, + you can run 'jam' from the top level of Haiku's trunk. + * If you have one or more generated folders, + (e.g. generated.x86gcc2), you can cd into that directory and run 'jam' + * In either case, you can cd into a certain folder in the source tree (e.g. + src/apps/debugger) and run jam -sHAIKU_OUTPUT_DIR= -VMware Image File ------------------ +Be sure to read build/jam/UserBuildConfig.ReadMe and UserBuildConfig.sample, +as they contain information on customizing your build of Haiku. + +Building a Haiku anyboot file +--------------------------- + + jam -q haiku-anyboot-image + +This generates an image file named 'haiku-anyboot.image' in your output +directory under 'generated/'. + +Building a VMware image file +---------------------------- jam -q haiku-vmware-image @@ -69,56 +210,40 @@ Installs all Haiku components into the volume mounted at "/Haiku" and automatically marks it as bootable. To create a partition in the first place use DriveSetup and initialize it to BFS. -Note that installing Haiku in a directory only works as expected under BeOS, -but it is not yet supported under Linux and other non-BeOS platforms. +Note that installing Haiku in a directory only works as expected under Haiku, +but it is not yet supported under Linux and other non-Haiku platforms. -Bootable CD-ROM Image ---------------------- - -This _requires_ having the mkisofs tool installed. -On Debian GNU/Linux for example you can install it with: - apt-get install mkisofs -On BeOS you can get it from http://bebits.com/app/3964 along with cdrecord. - -This creates a bootable 'haiku-cd.iso' in your 'generated/' folder: - - jam -q haiku-cd - -Under Unix/Linux, and BeOS you can use cdrecord to create a CD with: - - cdrecord dev=x,y,z -v -eject -dao -data generated/haiku-cd.iso - -Here x,y,z is the device number as found with cdrecord -scanbus, it can also -be a device path on Linux. - -Building Components -------------------- +Building individual components +------------------------------ If you don't want to build the complete Haiku, but only a certain app/driver/etc. you can specify it as argument to jam, e.g.: - jam Pulse + jam Debugger Alternatively, you can 'cd' to the directory of the component you want to -build and run 'jam' from there. +build and run 'jam' from there. Note: if your generated directory named +something other than "generated/", you will need to tell jam where it is. + + jam -sHAIKU_OUTPUT_DIR= You can also force rebuilding of a component by using the "-a" parameter: - jam -a Pulse + jam -a Debugger Running ======= Generally there are two ways of running Haiku. On real hardware using a -partition and on emulated hardware using an emulator like Bochs or QEmu. +partition and on emulated hardware using an emulator like Bochs or QEMU. On Real Hardware ---------------- If you have installed Haiku to its own partition you can include this partition in your bootmanager and try to boot Haiku like any other OS you -have installed. To include a new partition in the BeOS bootmanager run this +have installed. To include a new partition in the Haiku bootmanager run this in a Terminal: bootman @@ -127,34 +252,9 @@ On Emulated Hardware -------------------- For emulated hardware you should build disk image (see above). How to setup -this image depends on your emulater. A tutorial for Bochs on BeOS is below. -If you use QEmu, you can usually just provide the path to the image as -command line argument to the "qemu" executable. - -Bochs ------ - -Version 2.2 of Bochs for BeOS (BeBochs) can be downloaded from BeBits: - - http://www.bebits.com/app/3324 - -The package installs to: /boot/apps/BeBochs2.2 - -You have to set up a configuration for Bochs. You should edit the ".bochsrc" to -include the following: - -ata0-master: type=disk, path="/path/to/haiku.image", cylinders=122, heads=16, spt=63 -boot: disk - -Now you can start Bochs: - - $ cd /boot/apps/BeBochs2.2 - $ ./bochs - -Answer with RETURN and with some patience you will see Haiku booting. -If booting into the graphical evironment fails you can try to hit "space" at the -very beginning of the boot process. The Haiku bootloader should then come up and -you can select some safe mode options. +this image depends on your emulater. If you use QEMU, you can usually just +provide the path to the image as command line argument to the "qemu" +executable. Docbook documentation diff --git a/ReadMe.IntroductionToHaiku b/ReadMe.IntroductionToHaiku new file mode 100644 index 0000000000..fafa0e43b5 --- /dev/null +++ b/ReadMe.IntroductionToHaiku @@ -0,0 +1,119 @@ +Greetings. + +This document is intended to serve as an introduction to the Haiku project. +As such, this is only the tip of the iceberg. + +Haiku project website +--------------------- +http://www.haiku-os.org + +This is the main website for the Haiku project. It contains news posts from +the project, blog posts (from developers, Google Summer of Code participants, +and other frequent contributors), forums, and a vast collection of information. + + +Development tracker +------------------- +http://dev.haiku-os.org/ + +This is the Haiku project's development tracker. + * Bug reports + * Browse the source + * Review changesets + * Development related wiki (limited write access) + + +{OpenGrok +--------- +http://haiku.it.su.se:8180/source + +Graciously provided by . +This allows you to quickly and easily search Haiku's source code. + + +Coding Guidelines +------------------ +http://www.haiku-os.org/development/coding-guidelines + +The Haiku project takes pride in code quality. Both in terms of implementing +the correct code, as well as ensuring the code is written in a consistent +style. Learning and utilizing the coding guidelines is essential to +contributing code to Haiku. + + +Haiku API documentation +----------------------- +http://api.haiku-os.org +Old BeBook API: http://www.haiku-os.org/legacy-docs/bebook + +This is the current (and in-progress) documentation for Haiku's API. As Haiku +was formed on the idea of implementing binary compatibility with BeOS R5, the +BeBook is fairly accurate. Contributions to Haiku's API book are encouraged. + + +Learning to Program with Haiku +------------------------------ +http://www.haiku-os.org/development/learning_to_program_with_haiku + +A developer, DarkWyrm has published a book that is " aimed at people who want +to be able to write simple programs to get stuff done, but never had anyone +around teach them". He has chosen to distribute the PDF versions of the book +under a Creative Commons license for noncommercial purposes. + + +Programming with Haiku +---------------------- +http://www.haiku-os.org/tags/programmingwithhaiku + +Another series from Darkwyrm. It is "aimed at current codemonkeys who want to +break into development for Haiku. Here begins a new series of programming +lessons aimed at people who already have a basic grasp on C++: Programming with +Haiku." + + +ohloh +----- +http://www.ohloh.net/p/haiku + +"Ohloh is a free public directory of open source software and people." On +there, you can view detailed reports and analysis of Haiku (and other open +source software projects). + + +Haiku Translation Assistant (HTA) +--------------------------------- +http://hta.polytect.org/ + +This is the current solution to assisting people in translating Haiku's +on screen text to other languages. Consult the [haiku-i18n] mailing list +for additional information: http://www.freelists.org/list/haiku-i18n + + +Haiku User Guide Translation +---------------------------- +http://i18n.haiku-os.org/userguide/ + +Similar to HTA, this site is for coordinating the efforts of translating Haiku's +User Guide and Welcome page to other spoken languages. Subscribe to the +[haiku-doc] mailing list: http://www.freelists.org/list/haiku-doc + + +HaikuPorts +---------- +http://ports.haiku-files.org +http://ports-space.haiku-files.org + +"HaikuPorts is a centralized collection of software ported to the Haiku +platform." If you are interested in porting software to Haiku, then this +is the site for you! + + +Haikuware +--------- +http://www.haikuware.com + +Haikuware is a website, which provides direct downloads for Haiku software. +In addition to comments on application pages there are blogs and forums. +Haikuware also holds a recurring Thank You Award and helps fund development +through bounty programs. + diff --git a/ReadMe.cross-compile b/ReadMe.cross-compile deleted file mode 100644 index 512468eaed..0000000000 --- a/ReadMe.cross-compile +++ /dev/null @@ -1,84 +0,0 @@ -Building on a non-BeOS platform -=============================== - -We currently support these non-BeOS platforms: - * Linux - * FreeBSD - * Mac OS X Intel (gcc 4 builds only) - -To build Haiku on a non-BeOS platform you must first check out and build the -cross-compiler. The easiest method for doing so is to check it out in the -parent directory of your Haiku repository: - - svn checkout svn://svn.berlios.de/haiku/buildtools/trunk buildtools - -You should now have a 'buildtools' folder that contains folders named -'binutils', 'gcc', and 'jam' among others. - -Several other tools are required to build these build tools or are used by -Haiku's build system itself: - * gcc and the binutils (as, ld, etc., required by gcc) - * make (GNU make) - * bison - * flex and lex (usually a mini shell script invoking flex) - * makeinfo (part of texinfo, needed for building gcc 4 only) - * autoheader (part of autoconf, needed for building gcc) - * gawk - * yasm (http://www.tortall.net/projects/yasm/wiki/Download) - -Whether they are installed can be tested for instance by running them in the -shell with the "--version" parameter. - -On Mac OS X a case-sensitive file system is required for the Haiku tree -(Disk Utility can be used to create a case-sensitive disk image of at least -3GB size), and the following darwin ports need to be installed: - * expat - * gawk - * gettext - * libiconv - * gnuregex - * cdrtools (for mkisofs used to create the bootable CD-ROM image) - -Building Jam -============ - -Change to the buildtools folder and we will start to build 'jam' which is a -requirement for building Haiku. Run the following commands to generate and -install the tool: - - cd buildtools/jam - make - sudo ./jam0 install - - -Building binutils -================= - -The binutils used by Haiku will be automatically generated according to the -initial configuration of the Haiku source and placed in the -'generated/cross-tools' directory of Haiku. Before generating the tools you -must consider the version required, there are essentially two choices: - - * 2.95: Creates BeOS compatible binaries - * 4.x: Incompatible with BeOS, but theoretically more efficient binaries - -Unless there is a pressing need, choose 2.95 as the latter option can cause -frequent build issues. The commands for configuration are, - -GCC 2.95 --------- - - cd haiku - ./configure --build-cross-tools ../buildtools/ - -GCC 4.x -------- - - cd haiku - ./configure --build-cross-tools-gcc4 x86 ../buildtools/ - -The process can take quite some time, but when it finishes the build system is -fully configured and you are ready to compile your first Haiku image. - -Instructions on how to build Haiku can be found in the section Building in the -'ReadMe' document. diff --git a/build/config_headers/kernel_debug_config.h b/build/config_headers/kernel_debug_config.h index 26add874c4..d8370bbc61 100644 --- a/build/config_headers/kernel_debug_config.h +++ b/build/config_headers/kernel_debug_config.h @@ -42,7 +42,7 @@ #define DEBUG_FILE_MAP KDEBUG_LEVEL_1 -// heap +// heap / slab // Initialize newly allocated memory with something non zero. #define PARANOID_KERNEL_MALLOC KDEBUG_LEVEL_2 @@ -57,6 +57,9 @@ // Enables the "allocations*" debugger commands. #define KERNEL_HEAP_LEAK_CHECK 0 +// Enables the "allocations*" debugger commands for the slab. +#define SLAB_ALLOCATION_TRACKING 0 + // interrupts diff --git a/build/config_headers/tracing_config.h b/build/config_headers/tracing_config.h index 926b69e1d5..85717d7f4a 100644 --- a/build/config_headers/tracing_config.h +++ b/build/config_headers/tracing_config.h @@ -47,7 +47,9 @@ #define SCHEDULING_ANALYSIS_TRACING 0 #define SIGNAL_TRACING 0 #define SLAB_MEMORY_MANAGER_TRACING 0 +#define SLAB_MEMORY_MANAGER_TRACING_STACK_TRACE 0 /* stack trace depth */ #define SLAB_OBJECT_CACHE_TRACING 0 +#define SLAB_OBJECT_CACHE_TRACING_STACK_TRACE 0 /* stack trace depth */ #define SWAP_TRACING 0 #define SYSCALL_TRACING 0 #define SYSCALL_TRACING_IGNORE_KTRACE_OUTPUT 1 diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 7a9506c143..3b9a7adf3b 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -66,7 +66,7 @@ HAIKU_DEFAULT_IMAGE_NAME = haiku.image ; HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ; HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ; HAIKU_DEFAULT_INSTALL_DIR = /Haiku ; -HAIKU_DEFAULT_IMAGE_SIZE ?= 230 ; # 230 MB +HAIKU_DEFAULT_IMAGE_SIZE ?= 300 ; # 300 MB HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ; # Haiku CD defaults @@ -155,10 +155,14 @@ HAIKU_LINK = $(HAIKU_CC) ; HAIKU_LINKFLAGS = $(HAIKU_GCC_BASE_FLAGS) ; HAIKU_HDRS = [ FStandardHeaders ] ; -HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ; -HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) -nostdinc ; -HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) ; -HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) ; + +HAIKU_CUSTOM_CCFLAGS = $(HAIKU_CCFLAGS) ; +HAIKU_CUSTOM_C++FLAGS = $(HAIKU_C++FLAGS) ; + +HAIKU_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) -nostdinc ; +HAIKU_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) -nostdinc ; +HAIKU_KERNEL_CCFLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_CCFLAGS) ; +HAIKU_KERNEL_C++FLAGS = $(HAIKU_GCC_BASE_FLAGS) $(HAIKU_CUSTOM_C++FLAGS) ; HAIKU_DEFINES = __HAIKU__ ; HAIKU_NO_WERROR ?= 0 ; @@ -270,7 +274,7 @@ switch $(HAIKU_CPU) { } } # offset in floppy image (>= sizeof(haiku_loader)) - HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB + HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 260 ; # in kB HAIKU_NO_WERROR = 1 ; # we use #warning as placeholders for things to write... } @@ -352,10 +356,15 @@ switch $(HAIKU_ARCH) { } case x86 : { - HAIKU_CCFLAGS += -march=pentium ; - HAIKU_C++FLAGS += -march=pentium ; - HAIKU_KERNEL_CCFLAGS += -march=pentium ; - HAIKU_KERNEL_C++FLAGS += -march=pentium ; + if $(HAIKU_CUSTOM_CCFLAGS) = '' { + HAIKU_CCFLAGS += -march=pentium ; + HAIKU_KERNEL_CCFLAGS += -march=pentium ; + } + + if $(HAIKU_CUSTOM_C++FLAGS) = '' { + HAIKU_C++FLAGS += -march=pentium ; + HAIKU_KERNEL_C++FLAGS += -march=pentium ; + } # Enable use of the gcc built-in atomic functions instead of atomic_*(). # The former are inlined and have thus less overhead. They are not diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index b3c53aa720..ba7a81d788 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -105,7 +105,7 @@ PRIVATE_SYSTEM_LIBS = ; SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon media_addon_server media_server midi_server mount_server net_server - notification_server print_server print_addon_server registrar syslog_daemon + notification_server power_daemon print_server print_addon_server registrar syslog_daemon ; SYSTEM_NETWORK_DEVICES = ethernet loopback ; @@ -120,7 +120,7 @@ SYSTEM_ADD_ONS_ACCELERANTS = $(X86_ONLY)radeon.accelerant $(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant $(X86_ONLY)ati.accelerant $(X86_ONLY)3dfx.accelerant - #$(X86_ONLY)radeon_hd.accelerant + $(X86_ONLY)radeon_hd.accelerant #$(X86_ONLY)via.accelerant #$(X86_ONLY)vmware.accelerant ; @@ -166,7 +166,7 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ; SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia $(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme $(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware - $(X86_ONLY)ati $(X86_ONLY)3dfx #$(X86_ONLY)radeon_hd + $(X86_ONLY)ati $(X86_ONLY)3dfx $(X86_ONLY)radeon_hd ; SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ; SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x @@ -175,7 +175,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x $(X86_ONLY)ipro100 $(X86_ONLY)ipro1000 $(X86_ONLY)jmicron2x0 $(X86_ONLY)marvell_yukon $(X86_ONLY)nforce $(X86_ONLY)pcnet pegasus $(X86_ONLY)rtl8139 $(X86_ONLY)rtl81xx sis900 - $(X86_ONLY)syskonnect usb_asix usb_ecm $(X86_ONLY)via_rhine + $(X86_ONLY)syskonnect usb_davicom usb_asix usb_ecm $(X86_ONLY)via_rhine $(X86_ONLY)vt612x wb840 # WLAN drivers @@ -184,10 +184,10 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x $(X86_ONLY)iprowifi4965 $(X86_ONLY)marvell88w8363 $(X86_ONLY)marvell88w8335 $(X86_ONLY)ralink2860 $(X86_ONLY)ralinkwifi $(X86_ONLY)wavelanwifi - # WiMAX drivers - $(GPL_ONLY)usb_beceemwmx + # WWAN drivers + #$(GPL_ONLY)usb_beceemwmx ; -#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ; +SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ; SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa $(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi ; @@ -307,8 +307,7 @@ AddFilesToHaikuImage system : haiku_loader ; # decorators AddDirectoryToHaikuImage home config add-ons decorators ; -AddFilesToHaikuImage home config add-ons decorators : - MacDecorator WinDecorator ClassicBe SATDecorator ; +#AddFilesToHaikuImage home config add-ons decorators : ; # create directories that will remain empty AddDirectoryToHaikuImage common cache tmp ; @@ -413,7 +412,7 @@ UserBuildConfigRulePreImage ; HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ; HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ; HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ; -HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 230 MB +HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 300 MB HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ; MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ; diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages index b97c704bf9..cda49ffdeb 100644 --- a/build/jam/HaikuPackages +++ b/build/jam/HaikuPackages @@ -42,7 +42,7 @@ AddFilesToPackage add-ons kernel busses scsi : ahci ; AddFilesToPackage add-ons kernel busses usb : uhci ohci ehci ; AddFilesToPackage add-ons kernel console : vga_text ; AddFilesToPackage add-ons kernel debugger - : demangle $(X86_ONLY)disasm + : demangle $(X86_ONLY)disasm hangman invalidate_on_exit usb_keyboard run_on_exit ; AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; AddFilesToPackage add-ons kernel generic @@ -79,7 +79,7 @@ AddDriversToPackage input : ps2_hid usb_hid wacom ; AddDriversToPackage misc : poke mem ; AddDriversToPackage net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; AddDriversToPackage ports : usb_serial ; -#AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ; +AddDriversToPackage power : $(SYSTEM_ADD_ONS_DRIVERS_POWER) ; # kernel AddFilesToPackage : kernel_$(TARGET_ARCH) ; @@ -215,10 +215,54 @@ AddSymlinkToPackage data Keymaps : Swedish : Finnish ; AddSymlinkToPackage data Keymaps : Slovene : Croatian ; AddSymlinkToPackage data Keymaps : US-International : Brazilian ; +# Copy keyboard layout files to the image one-by-one. local keyboardLayoutsDir = [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ; -local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ; -AddFilesToPackage data KeyboardLayouts : $(keyboardLayouts) ; +local keyboardLayoutFiles = + "Generic 104-key" + "Generic 105-key International" + "Kinesis Advantage" + "Kinesis Ergo Elan International" + "TypeMatrix 2030" ; +keyboardLayoutFiles = $(keyboardLayoutFiles:G=keyboard-layout) ; +SEARCH on $(keyboardLayoutFiles) = $(keyboardLayoutsDir) ; +AddFilesToPackage data KeyboardLayouts + : $(keyboardLayoutFiles) ; + +# Add Apple Aluminum keyboard layout files to the image in an Apple Aluminum +# subdirectory. The subdirectory is turned into a submenu in the Layout menu +# of the Keymap preference app. +local appleAluminumDir + = [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts + Apple\ Aluminum ] ; +local appleAluminumFiles = + "Apple Aluminium Extended International" + "Apple Aluminium International" + "Apple Aluminum (US)" + "Apple Aluminum Extended (US)" ; +appleAluminumFiles = $(appleAluminumFiles:G=keyboard-layout) ; +SEARCH on $(appleAluminumFiles) = $(appleAluminumDir) ; +AddFilesToPackage data KeyboardLayouts Apple\ Aluminum + : $(appleAluminumFiles) ; + +# Add ThinkPad keyboard layout files to the image in a ThinkPad +# subdirectory. The subdirectory is turned into a submenu in the Layout menu +# of the Keymap preference app. +local thinkpadDir + = [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ThinkPad ] ; +local thinkPadFiles = + "ThinkPad (US)" + "ThinkPad International" + "ThinkPad T400s (US)" + "ThinkPad T400s International" + "ThinkPad X1 (US)" + "ThinkPad X1 International" + "ThinkPad X100e (US)" + "ThinkPad X100e International" ; +thinkPadFiles = $(thinkPadFiles:G=keyboard-layout) ; +SEARCH on $(thinkPadFiles) = $(thinkpadDir) ; +AddFilesToPackage data KeyboardLayouts ThinkPad + : $(thinkPadFiles) ; # boot loader AddFilesToPackage : haiku_loader ; @@ -402,6 +446,8 @@ HaikuPackage $(haikuUserGuidePackage) ; CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs userguide ] : userguide : -x .svn ; +SEARCH on userguide = [ FDirName $(HAIKU_TOP) data bin ] ; +AddFilesToPackage bin : userguide ; BuildHaikuPackage $(haikuUserGuidePackage) : haiku-userguide ; @@ -414,6 +460,8 @@ HaikuPackage $(haikuWelcomePackage) ; CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ] : welcome : -x .svn ; +SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ; +AddFilesToPackage bin : welcome ; BuildHaikuPackage $(haikuWelcomePackage) : haiku-welcome ; diff --git a/build/jam/ImageRules b/build/jam/ImageRules index f267dea633..0b0a34746e 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1414,7 +1414,11 @@ actions BuildCDBootPPCImage1 bind MAPS # -hfs -hfs-bless . mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \ -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot \ - ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd + ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \ + || \ + genisoimage -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \ + -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot \ + ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd #$(RM) -R $(HAIKU_OUTPUT_DIR)/cd } diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures index 8b838e5e37..232169caa3 100644 --- a/build/jam/OptionalBuildFeatures +++ b/build/jam/OptionalBuildFeatures @@ -12,7 +12,7 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSL ] { } if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0e-x86-gcc4-2011-09-08.zip ; } else { HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-1-x86_gcc2.hpkg ; } @@ -56,40 +56,17 @@ if $(HAIKU_BUILD_FEATURE_SSL) { # ICU # Note ICU isn't actually optional, but is still an external package -HAIKU_ICU_GCC_2_PACKAGE = icu-4.4.1-r1a3-x86-gcc2-2011-05-29.hpkg ; -HAIKU_ICU_GCC_4_PACKAGE = icu-4.4.1-r1a3-x86-gcc4-2011-05-29.zip ; +HAIKU_ICU_GCC_2_PACKAGE = icu-4.8.1.1-1-x86_gcc2.hpkg ; +HAIKU_ICU_GCC_4_PACKAGE = icu-4.8.1-x86-gcc4-2011-11-02.zip ; # TODO: Make hpkg! -HAIKU_ICU_PPC_PACKAGE = icu-4.4.1-ppc-2010-08-17.zip ; -HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.4.1-1-any.hpkg ; +HAIKU_ICU_PPC_PACKAGE = icu-4.8.1-ppc-2011-08-20.zip ; +HAIKU_ICU_DEVEL_PACKAGE = icu-devel-4.8.1-1-any.hpkg ; -if $(TARGET_ARCH) = ppc { - local icu_package = $(HAIKU_ICU_PPC_PACKAGE) ; - local zipFile = [ DownloadFile $(icu_package) - : $(baseURL)/$(icu_package) ] ; - - # zip file and output directory - HAIKU_ICU_ZIP_FILE = $(zipFile) ; - HAIKU_ICU_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR) - $(icu_package:B) ] ; - - # extract libraries - HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) - : - libicudata.so.44.1 - libicui18n.so.44.1 - libicuio.so.44.1 - libicule.so.44.1 - libiculx.so.44.1 - libicutu.so.44.1 - libicuuc.so.44.1 - : $(zipFile) - : extracted-icu - ] ; -} else if $(TARGET_ARCH) != x86 { - Echo "ICU not available for $(TARGET_ARCH)" ; -} else { +if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 { local icu_package ; - if $(HAIKU_GCC_VERSION[1]) = 2 { + if $(TARGET_ARCH) = ppc { + icu_package = $(HAIKU_ICU_PPC_PACKAGE) ; + } else if $(HAIKU_GCC_VERSION[1]) = 2 { icu_package = $(HAIKU_ICU_GCC_2_PACKAGE) ; } else { icu_package = $(HAIKU_ICU_GCC_4_PACKAGE) ; @@ -104,18 +81,35 @@ if $(TARGET_ARCH) = ppc { $(icu_package:B) ] ; # extract libraries - HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) - : - lib/libicudata.so.44 - lib/libicui18n.so.44 - lib/libicuio.so.44 - lib/libicule.so.44 - lib/libiculx.so.44 - lib/libicutu.so.44 - lib/libicuuc.so.44 - : $(packageFile) - : extracted-icu - ] ; + if $(TARGET_ARCH) = ppc { + HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) + : + libicudata.so.48.1 + libicui18n.so.48.1 + libicuio.so.48.1 + libicule.so.48.1 + libiculx.so.48.1 + libicutu.so.48.1 + libicuuc.so.48.1 + : $(packageFile) + : extracted-icu + ] ; + } else { + HAIKU_ICU_LIBS = [ ExtractArchive $(HAIKU_ICU_DIR) + : + lib/libicudata.so.48.1.1 + lib/libicui18n.so.48.1.1 + lib/libicuio.so.48.1.1 + lib/libicule.so.48.1.1 + lib/libiculx.so.48.1.1 + lib/libicutu.so.48.1.1 + lib/libicuuc.so.48.1.1 + : $(packageFile) + : extracted-icu + ] ; + } +} else { + Echo "ICU not available for $(TARGET_ARCH)" ; } diff --git a/build/jam/OptionalLibPackages b/build/jam/OptionalLibPackages index a5d063a78b..1a568121aa 100644 --- a/build/jam/OptionalLibPackages +++ b/build/jam/OptionalLibPackages @@ -45,8 +45,8 @@ if [ IsOptionalHaikuImagePackageAdded AllegroLibs ] { dumb-0.9.3-x86-r1a3-x86-gcc2-2011-05-19.zip : $(baseURL)/lib/dumb-0.9.3-r1a3-x86-gcc2-2011-05-19.zip ; InstallOptionalHaikuImagePackage - jgmod-0.99-r1a3-x86-gcc2-2011-05-26.zip - : $(baseURL)/lib/jgmod-0.99-r1a3-x86-gcc2-2011-05-26.zip ; + jgmod-0.99-x86-gcc2-2011-08-02.zip + : $(baseURL)/lib/jgmod-0.99-x86-gcc2-2011-08-02.zip ; } } @@ -224,8 +224,8 @@ if [ IsOptionalHaikuImagePackageAdded SDLLibs ] { guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip : $(baseURL)/lib/guilib-1.2.1-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage - sdl-gfx-2.0.20-r1a3-x86-gcc4-2011-05-26.zip - : $(baseURL)/lib/sdl-gfx-r1a3-x86-gcc4-2011-05-26.zip ; + sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip + : $(baseURL)/lib/sdl-gfx-2.0.22-r1a3-x86-gcc4-2011-05-26.zip ; InstallOptionalHaikuImagePackage sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip : $(baseURL)/lib/sdl-image-1.2.10-r1a3-x86-gcc4-2011-05-26.zip ; diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies index dd5be4f91e..6604f39430 100644 --- a/build/jam/OptionalPackageDependencies +++ b/build/jam/OptionalPackageDependencies @@ -33,6 +33,7 @@ OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ; OptionalPackageDependencies Vim : GetText LibIconv ; OptionalPackageDependencies WebPositive : Curl LibXML2 SQLite ; +OptionalPackageDependencies wpa_supplicant : OpenSSL ; OptionalPackageDependencies XZ-Utils : Tar ; OptionalPackageDependencies MandatoryPackages : ICU Sed Tar ; diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index b48ff1f732..4734f0f917 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -81,7 +81,8 @@ # Welcome - introductory documentation to Haiku # WifiFirmwareScriptData - data files needed by install-wifi-firmwares.sh # WonderBrush - native graphics application -# WQY-MicroHei - Chinese font +# wpa_supplicant - a WPA Supplicant with support for WPA and WPA2 +# WQY-MicroHei - Chinese font # XZ-Utils - file archiving utility # Yasm - the assembler utility @@ -618,6 +619,22 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { } +# DMIDecode +if [ IsOptionalHaikuImagePackageAdded DMIDecode ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package DMIDecode available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + dmidecode-2.11-x86-gcc4-2011-11-02.zip + : http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc4-2011-11-02.zip ; + } else { + InstallOptionalHaikuImagePackage + dmidecode-2.11-x86-gcc2-2011-11-02.zip + : http://revolf.free.fr/beos/dmidecode-2.11-x86-gcc2-2011-11-02.zip ; + } +} + + # Doxygen if [ IsOptionalHaikuImagePackageAdded Doxygen ] { if $(TARGET_ARCH) != x86 { @@ -678,10 +695,6 @@ if [ IsOptionalHaikuImagePackageAdded Fastdep ] { if [ IsOptionalHaikuImagePackageAdded friss ] { if $(TARGET_ARCH) != x86 { Echo "No optional package friss available for $(TARGET_ARCH)" ; - } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage friss-0.5pre7-x86-gcc4.zip - : $(baseURL)/friss-0.5pre7-x86-gcc4.zip - : : true ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage @@ -807,7 +820,7 @@ if [ IsOptionalHaikuImagePackageAdded ICU-devel ] { local arch = $(TARGET_ARCH) ; local abi = gcc$(HAIKU_GCC_VERSION[1]) ; for abiVersionedLib in $(HAIKU_ICU_LIBS) { - abiVersionedLib = $(abiVersionedLib:G=) ; + abiVersionedLib = $(abiVersionedLib:B:G=) ; local lib = $(abiVersionedLib:B) ; AddSymlinkToHaikuImage develop abi $(arch) $(abi) lib : /system/lib $(abiVersionedLib) ; @@ -1144,8 +1157,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip ; + openssh-5.9p1-x86-gcc4-2011-09-08.zip + : $(baseURL)/openssh-5.9p1-x86-gcc4-2011-09-08.zip ; } else { InstallOptionalHaikuImagePackage openssh-5.8p2-1-x86_gcc2.hpkg @@ -1382,8 +1395,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip - : $(baseURL)/subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip + subversion-1.6.17-x86-gcc4-2011-08-03.zip + : $(baseURL)/subversion-1.6.17-x86-gcc4-2011-08-03.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1582,11 +1595,9 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] { AddFilesToHaikuImage system packages : haiku-userguide.hpkg ; AddFilesToHaikuImage system packages : haiku-welcome.hpkg ; - AddSymlinkToHaikuImage home Desktop - : /boot/system/documentation/welcome/welcome_en.html + AddSymlinkToHaikuImage home Desktop : /boot/system/bin/welcome : Welcome ; - AddSymlinkToHaikuImage home Desktop - : /boot/system/documentation/userguide/en/contents.html + AddSymlinkToHaikuImage home Desktop : /boot/system/bin/userguide : User\ Guide ; } @@ -1659,6 +1670,22 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] { } +# wpa_supplicant +if [ IsOptionalHaikuImagePackageAdded wpa_supplicant ] { + if $(TARGET_ARCH) != x86 { + Echo "No optional package wpa_supplicant available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip + : $(baseURL)/wpa_supplicant-0.7.3-x86-gcc4-2011-10-05.zip ; + } else { + InstallOptionalHaikuImagePackage + wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip + : $(baseURL)/wpa_supplicant-0.7.3-x86-gcc2-2011-10-05.zip ; + } +} + + # WQY-MicroHei if [ IsOptionalHaikuImagePackageAdded WQY-MicroHei ] { InstallOptionalHaikuImagePackage diff --git a/build/jam/ReleaseBuildProfiles b/build/jam/ReleaseBuildProfiles index 5e6472e0dc..2958c676ad 100644 --- a/build/jam/ReleaseBuildProfiles +++ b/build/jam/ReleaseBuildProfiles @@ -16,7 +16,7 @@ switch $(HAIKU_BUILD_PROFILE) { HAIKU_ROOT_USER_REAL_NAME = "Yourself" ; AddGroupToHaikuImage party : 101 : user sshd ; HAIKU_IMAGE_HOST_NAME = shredder ; - HAIKU_IMAGE_SIZE = 690 ; + HAIKU_IMAGE_SIZE = 750 ; HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ; AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates diff --git a/build/jam/UserBuildConfig.sample b/build/jam/UserBuildConfig.sample index 4a164b149c..8a5160f0df 100644 --- a/build/jam/UserBuildConfig.sample +++ b/build/jam/UserBuildConfig.sample @@ -27,3 +27,8 @@ # Add the optional package WonderBrush to the image. #AddOptionalHaikuImagePackages WonderBrush ; + +# Add an example optional gfx driver and its accelerant. +# (Drivers just have a special rule because of the need for the symlink in dev/) +#AddDriversToHaikuImage graphics : optional_driver ; +#AddFilesToHaikuImage system add-ons accelerants : optional_driver.accelerant ; diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools index f4f01ade0f..9f7f9cce44 100755 --- a/build/scripts/build_cross_tools +++ b/build/scripts/build_cross_tools @@ -1,6 +1,9 @@ #!/bin/sh -# parameters +# Parameters +# Influential environmental variable: +# * haikuRequiredLegacyGCCVersion: The requrired version of the gcc. Will be +# checked against the version in the buildtools directory. # get and check the parameters if [ $# -lt 3 ]; then @@ -19,21 +22,37 @@ additionalMakeArgs=$* if [ ! -d $haikuSourceDir ]; then - echo "No such directory: \"$haikuSourceDir\"" >&2 + echo "ERROR: No such directory: \"$haikuSourceDir\"" >&2 exit 1 fi if [ ! -d $buildToolsDir ]; then - echo "No such directory: \"$buildToolsDir\"" >&2 + echo "ERROR: No such directory: \"$buildToolsDir\"" >&2 exit 1 fi -if ! grep "$haikuRequiredLegacyGCCVersion" \ - $buildToolsDir/gcc/gcc/version.c >/dev/null 2>&1 ; then - echo "*** Mismatching compiler versions between configure script and" >&2 - echo "*** $buildToolsDir/gcc/gcc/version.c" >&2 - echo "*** Did you perhaps update only one of haiku & buildtools?" >&2 - exit 1 +# verify or extract the gcc version +gccVersionDotC="$buildToolsDir/gcc/gcc/version.c" +if [ -n "$haikuRequiredLegacyGCCVersion" ]; then + # haikuRequiredLegacyGCCVersion has been specified. Check whether the + # version of the gcc in the given build tools directory matches. + if ! grep "$haikuRequiredLegacyGCCVersion" \ + "$gccVersionDotC" >/dev/null 2>&1 ; then + echo "*** Mismatching compiler versions between configure script and" \ + >&2 + echo "*** $gccVersionDotC" >&2 + echo "*** Did you perhaps update only one of haiku & buildtools?" >&2 + exit 1 + fi +else + # haikuRequiredLegacyGCCVersion wasn't specified. Extract the version string + # from the gcc's version.c. + haikuRequiredLegacyGCCVersion=`grep "2.95.3-haiku-" "$gccVersionDotC" \ + | sed 's@.*\"\(.*\)\".*@\1@'` + if [ -z "$haikuRequiredLegacyGCCVersion" ]; then + echo "ERROR: Failed to extract version string from $gccVersionDotC" >&2 + exit 1 + fi fi diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 9eb0c8257c..fa20f7c601 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -86,6 +86,12 @@ if [ -z "$gccVersion" ]; then exit 1 fi +# touch all info files in order to avoid the dependency on makeinfo +# (which apparently doesn't work reliably on all the different host +# configurations and changes files which in turn appear as local changes +# to the VCS). +find $binutilsSourceDir -name \*.info -print0 | xargs -0 touch +find $gccSourceDir -name \*.info -print0 | xargs -0 touch # create the object and installation directories for the cross compilation tools installDir=$haikuOutputDir/cross-tools diff --git a/configure b/configure index 13fbdbccee..33ea08fa7b 100755 --- a/configure +++ b/configure @@ -440,30 +440,6 @@ case "${platform}" in exit 1 ;; esac -# check yasm version -if [ $targetArch = "x86" ]; then - $HAIKU_YASM --version > /dev/null || { - echo "The yasm assembler version 0.7.0 or later must be installed." - echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download" - exit 1 - } - - set -- $($HAIKU_YASM --version | head -n 1) - versionOK=0 - case $2 in - 0.[0-6].*) ;; - *) versionOK=1 ;; - esac -versionOK=1 - - if [ $versionOK = 0 ]; then - echo "The yasm assembler version 0.7.0 or later must be installed." - echo "The installed version is $2." - echo "Download from: http://www.tortall.net/projects/yasm/wiki/Download" - exit 1 - fi -fi - # check common locations for sfdisk for sfdiskDir in /sbin /usr/sbin /usr/local/sbin ; do if [ -e ${sfdiskDir}/${SFDISK_BINARY} ]; then diff --git a/data/artwork/icons/App_NetSurf_Original b/data/artwork/icons/App_NetSurf_Original new file mode 100644 index 0000000000..ca81f55ec0 Binary files /dev/null and b/data/artwork/icons/App_NetSurf_Original differ diff --git a/data/artwork/icons/App_VirtualBox b/data/artwork/icons/App_VirtualBox new file mode 100644 index 0000000000..edaf954808 Binary files /dev/null and b/data/artwork/icons/App_VirtualBox differ diff --git a/data/bin/install-wifi-firmwares.sh b/data/bin/install-wifi-firmwares.sh index e02de1bc1c..db40e771d1 100755 --- a/data/bin/install-wifi-firmwares.sh +++ b/data/bin/install-wifi-firmwares.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2010 Haiku Inc. All rights reserved. +# Copyright (c) 2010 Haiku, Inc. # Distributed under the terms of the MIT License. # # Authors: diff --git a/data/bin/userguide b/data/bin/userguide new file mode 100755 index 0000000000..a0ef1d2977 --- /dev/null +++ b/data/bin/userguide @@ -0,0 +1,16 @@ +#!/bin/bash + +userGuideURL="\ + http://svn.haiku-os.org/haiku/haiku/trunk/docs/userguide/en/contents.html" +userGuideDir=/boot/system/documentation/userguide/ +userGuide=$userGuideDir/en/contents.html +localizedUserGuide=$userGuideDir/"$LANG"/contents.html + +if [ -f $localizedUserGuide ]; then + open file://$localizedUserGuide +elif [ -f $userGuide ]; then + open $userGuide +else + open $userGuideURL +fi + diff --git a/data/bin/welcome b/data/bin/welcome new file mode 100755 index 0000000000..e259f089cb --- /dev/null +++ b/data/bin/welcome @@ -0,0 +1,16 @@ +#!/bin/bash + +welcomeURL="\ + http://svn.haiku-os.org/haiku/haiku/trunk/docs/welcome/welcome_en.html" +welcomeDir=/boot/system/documentation/welcome/ +welcomeFile=$welcomeDir/welcome_en.html +localizedWelcomeFile=$welcomeDir/welcome_"$LANG".html + +if [ -f $localizedWelcomeFile ]; then + open file://$localizedWelcomeFile +elif [ -f $welcomeFile ]; then + open $welcomeFile +else + open $welcomeURL +fi + diff --git a/data/catalogs/add-ons/disk_systems/bfs/uk.catkeys b/data/catalogs/add-ons/disk_systems/bfs/uk.catkeys index f6fc5a7298..1328c198d0 100644 --- a/data/catalogs/add-ons/disk_systems/bfs/uk.catkeys +++ b/data/catalogs/add-ons/disk_systems/bfs/uk.catkeys @@ -1 +1,8 @@ -1 ukrainian application/x-vnd.Haiku-BFSAddOn 0 +1 ukrainian application/x-vnd.Haiku-BFSAddOn 1074880496 +1024 (Mostly small files) BFS_Initialize_Parameter 1024 (Найменші файли) +2048 (Recommended) BFS_Initialize_Parameter 2048 (Рекомендовано) +8192 (Mostly large files) BFS_Initialize_Parameter 8192 (Найбільші файли) +Blocksize: BFS_Initialize_Parameter Розмір блоків: +Disabling query support may speed up certain file system operations, but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. BFS_Initialize_Parameter Заборона підтримки , but should only be used if one is absolutely certain that one will not need queries.\nAny volume that is intended for booting Haiku must have query support enabled. +Enable query support BFS_Initialize_Parameter Дозвіл підтримку запитів +Name: BFS_Initialize_Parameter Ім'я: diff --git a/data/catalogs/add-ons/disk_systems/intel/uk.catkeys b/data/catalogs/add-ons/disk_systems/intel/uk.catkeys index c27baea2da..e7ddf7a60d 100644 --- a/data/catalogs/add-ons/disk_systems/intel/uk.catkeys +++ b/data/catalogs/add-ons/disk_systems/intel/uk.catkeys @@ -1 +1,2 @@ -1 ukrainian application/x-vnd.Haiku-IntelDiskAddOn 0 +1 ukrainian application/x-vnd.Haiku-IntelDiskAddOn 4191422532 +Active partition BFS_Creation_Parameter Активний розділ diff --git a/data/catalogs/add-ons/input_server/devices/keyboard/uk.catkeys b/data/catalogs/add-ons/input_server/devices/keyboard/uk.catkeys new file mode 100644 index 0000000000..883beeeb3a --- /dev/null +++ b/data/catalogs/add-ons/input_server/devices/keyboard/uk.catkeys @@ -0,0 +1,10 @@ +1 ukrainian x-vnd.Haiku-KeyboardInputServerDevice 2536418998 +(This team is a system component) Team monitor (Ця команда є системним компонентом) +Cancel Team monitor Відмінити +Force reboot Team monitor Примусове перезавантаження +If the application will not quit you may have to kill it. Team monitor If the application will not quit you may have to kill it. +Kill application Team monitor Вбити додаток +Quit application Team monitor Закрити додаток +Restart the desktop Team monitor Перезавантажити робочий стіл +Select an application from the list above and click one of the buttons 'Kill application' and 'Quit application' in order to close it.\n\nHold CONTROL+ALT+DELETE for %ld seconds to reboot. Team monitor Виберіть додаток зі списку нижче і клікніть на кнопки 'Вбити додаток' і 'Закрити додаток' у випадку закриття її.\n\nУтримуйте CONTROL+ALT+DELETE для перезавантаження через %ld секунд. +Team monitor Team monitor Монітор команд diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/be.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/be.catkeys new file mode 100644 index 0000000000..ae4eadb623 --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/be.catkeys @@ -0,0 +1,15 @@ +1 belarusian x-vnd.Haiku-MatchHeader 1205906732 + ConfigView <абярыце рахунак> + ConfigView <абярыце аперацыю> +Delete message ConfigView Выдаліць паведамленне +If ConfigView If +Move to ConfigView Перасунуць у +Reply with ConfigView Адказаць з +Rule filter RuleFilter Правіла фільтра +Set as read ConfigView Пазначыць як прагледжанае +Set flags to ConfigView Меткі паведамлення ў +Then ConfigView Then +has ConfigView меў +header (e.g. Subject) ConfigView загаловак (Subject) +this field is based on the action ConfigView гэты параметр грунтуецца на аперацыі +value (use REGEX: in from of regular expressions like *spam*) ConfigView параметр (выкарыстайце REGEX: у выглядзе regular expressions, напрыклад *spam*) diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/sv.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/sv.catkeys index ba66e04cf3..ce985dbcff 100644 --- a/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/sv.catkeys +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/sv.catkeys @@ -1,14 +1,15 @@ -1 swedish x-vnd.Haiku-MatchHeader 934971625 +1 swedish x-vnd.Haiku-MatchHeader 1205906732 ConfigView ConfigView Delete message ConfigView Radera meddelande If ConfigView Om Move to ConfigView Flytta till Reply with ConfigView Svara med +Rule filter RuleFilter Filterregel Set as read ConfigView Markera som läst Set flags to ConfigView Markera som -Then ConfigView Då +Then ConfigView Åtgärd has ConfigView har header (e.g. Subject) ConfigView huvud (ex Rubrik) this field is based on the action ConfigView detta fält är baserat på åtgärden -value (use REGEX: in from of regular expressions like *spam*) ConfigView värde (använd reguljära uttryck i format som *skräppost*) +value (use REGEX: in from of regular expressions like *spam*) ConfigView värde (använd reguljära uttryck i format som *spam*) diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/uk.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/uk.catkeys new file mode 100644 index 0000000000..4137ea93db --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/match_header/uk.catkeys @@ -0,0 +1,15 @@ +1 ukrainian x-vnd.Haiku-MatchHeader 1205906732 + ConfigView <Вибір акаунта> + ConfigView <Вибір дії> +Delete message ConfigView Видалити повідомлення +If ConfigView Якщо +Move to ConfigView Перемістити до +Reply with ConfigView Відповісти з +Rule filter RuleFilter Фільтр правил +Set as read ConfigView Встановити як прочитані +Set flags to ConfigView Встановити флаги для +Then ConfigView Тоді +has ConfigView має +header (e.g. Subject) ConfigView заголовок (e.g. Subject) +this field is based on the action ConfigView це поле засноване на дії +value (use REGEX: in from of regular expressions like *spam*) ConfigView величина (використовуйте REGEX: в широкому розумінні *spam*) diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/notifier/be.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/notifier/be.catkeys new file mode 100644 index 0000000000..839008bf3f --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/notifier/be.catkeys @@ -0,0 +1,16 @@ +1 belarusian x-vnd.Haiku-NewMailNotification 3624191291 +%num new message filter %num новae паведамленнe +%num new messages filter %num новых паведамленняў +Alert ConfigView Папярэджанне +Beep ConfigView Біп +Central alert ConfigView Цэнтральная папярэджанне +Central beep ConfigView Цэнтральны гук +Keyboard LEDs ConfigView Клавіятурныя LED +Log window ConfigView Вакно пратаколу +Method: ConfigView Метад: +New mails notification ConfigView Інфа пра новыя паведамленні +New messages filter Новыя паведамленні +OK filter ОК +You have %num new message for %name. filter Вы маеце %num новae паведамленнe для %name +You have %num new messages for %name. filter Вы маеце %num новых паведамленняў для %name +none ConfigView няма diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/be.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/be.catkeys new file mode 100644 index 0000000000..2d5da31456 --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/be.catkeys @@ -0,0 +1,9 @@ +1 belarusian x-vnd.Haiku-SpamFilter 1975155212 +Add spam rating to start of subject SpamFilterConfig Дадаць спам-рэйтынг ў пачатак тэмы +Close SpamFilterConfig Закрыць +Genuine below and uncertain above: SpamFilterConfig Сапраўдныя ніжэй і нявызначаныя вышэй: +Learn from all incoming e-mail SpamFilterConfig Навучаць з ўсіх уваходных паведамленняў +Sorry, unable to launch the spamdbm program to let you edit the server settings. SpamFilterConfig Прабачце, немагчыма запусціць праграму spamdbm каб даць вам магчымасць рэдагаваць наладкі. +Spam Filter (AGMS Bayesian) SpamFilter Фільтар спаму (AGMS Bayesian) +Spam above: SpamFilterConfig Спам вышэй: +or empty e-mail SpamFilterConfig ці пустыя паведамленні diff --git a/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/sv.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/sv.catkeys index 994b9aa448..073152453e 100644 --- a/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/sv.catkeys +++ b/data/catalogs/add-ons/mail_daemon/inbound_filters/spam_filter/sv.catkeys @@ -1,5 +1,9 @@ -1 swedish x-vnd.Haiku-SpamFilter 3701267948 +1 swedish x-vnd.Haiku-SpamFilter 1975155212 +Add spam rating to start of subject SpamFilterConfig Lägg till skräpranking före rubriken Close SpamFilterConfig Stäng +Genuine below and uncertain above: SpamFilterConfig Säkert under eller osäkert över: Learn from all incoming e-mail SpamFilterConfig Lär från all inkommande e-post +Sorry, unable to launch the spamdbm program to let you edit the server settings. SpamFilterConfig Kunde inte starta spamdb-programmet för redigering av serverinställningarna. Spam Filter (AGMS Bayesian) SpamFilter Skräppostfilter (AGMS Bayesian) Spam above: SpamFilterConfig Skräppost över: +or empty e-mail SpamFilterConfig eller tomt e-post diff --git a/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/be.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/be.catkeys new file mode 100644 index 0000000000..cb8065d1d2 --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/be.catkeys @@ -0,0 +1,9 @@ +1 belarusian x-vnd.Haiku-IMAP 3892875357 +Apply IMAPFolderConfig Прымяніць +Destination: imap_config Прызначэнне: +Failed to fetch available storage. IMAPFolderConfig Памылка падчас атрымання дадзеных +Fetching IMAP folders, have patience... IMAPFolderConfig Атрыманне IMAP папак, пачакайце... +IMAP Folders IMAPFolderConfig IMAP папкі +IMAP Folders imap_config Папкі IMAP +Subcribe / Unsuscribe IMAP folders, have patience... IMAPFolderConfig Апрацоўка IMAP папак, пачакайце... +status IMAPFolderConfig статус diff --git a/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/uk.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/uk.catkeys new file mode 100644 index 0000000000..72be3fe457 --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_protocols/imap/uk.catkeys @@ -0,0 +1,9 @@ +1 ukrainian x-vnd.Haiku-IMAP 3892875357 +Apply IMAPFolderConfig Застосувати +Destination: imap_config Позамовчуванню: +Failed to fetch available storage. IMAPFolderConfig Призупинено отримання доступних масивів. +Fetching IMAP folders, have patience... IMAPFolderConfig Отримання папок IMAP, зачекайте ... +IMAP Folders IMAPFolderConfig Папки IMAP +IMAP Folders imap_config Папки IMAP +Subcribe / Unsuscribe IMAP folders, have patience... IMAPFolderConfig Підписка/відписка для папок IMAP , зачекайте... +status IMAPFolderConfig стан diff --git a/data/catalogs/add-ons/mail_daemon/inbound_protocols/pop3/be.catkeys b/data/catalogs/add-ons/mail_daemon/inbound_protocols/pop3/be.catkeys new file mode 100644 index 0000000000..63bbe496ae --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/inbound_protocols/pop3/be.catkeys @@ -0,0 +1,18 @@ +1 belarusian x-vnd.Haiku-POP3 1324485597 +. The server said:\n pop3 . Паведамленне сервера:\n +: Connection refused or host not found pop3 : Адмова ў далучэнні альбо хост не знойдзены +: Could not allocate socket. pop3 : Немагчыма вылучыць сокет. +: No reply.\n pop3 : Няма адказу.\n +: The server does not support APOP. pop3 : Сервер не падтрымлівае пратакол APOP. +APOP ConfigView APOP +Connect to server… pop3 Далучэнне да сервера… +Connecting to POP3 server… pop3 Далучэнне да POP3 сервера… +Destination: ConfigView Прызначэнне: +Error while authenticating user %user pop3 Памылка падчас аўтэнтыфікацыі %user +Error while connecting to server %serv pop3 Памылка падчас далучэння %user да сервера +Getting UniqueIDs… pop3 Атрыманне ідэнтыфікатараў… +Getting mailbox size… pop3 Вылічэнне памеру паштовай скрыні… +Plain text ConfigView Просты тэкст +Sending APOP authentication… pop3 Дасыланне APOP аўтэнтыфікацыі… +Sending password… pop3 Дасыланне пароля… +Sending username… pop3 Дасыланне імя карыстальніка… diff --git a/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/be.catkeys b/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/be.catkeys index 4f24b81d77..8559e45848 100644 --- a/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/be.catkeys +++ b/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/be.catkeys @@ -1,3 +1,4 @@ -1 belarusian x-vnd.Haiku-Fortune 3616007799 +1 belarusian x-vnd.Haiku-Fortune 1292458430 +Fortune cookie says:\n\n ConfigView Пажаданне:\n\n Fortune file: ConfigView Файл цытатаў: Tag line: ConfigView Радок: diff --git a/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/uk.catkeys b/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/uk.catkeys new file mode 100644 index 0000000000..d16ce52916 --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/outbound_filters/fortune/uk.catkeys @@ -0,0 +1,4 @@ +1 ukrainian x-vnd.Haiku-Fortune 1292458430 +Fortune cookie says:\n\n ConfigView Куки Fortune кажуть:\n\n +Fortune file: ConfigView Файл Fortune: +Tag line: ConfigView Tag line: diff --git a/data/catalogs/add-ons/mail_daemon/outbound_protocols/smtp/be.catkeys b/data/catalogs/add-ons/mail_daemon/outbound_protocols/smtp/be.catkeys new file mode 100644 index 0000000000..14f96ca2df --- /dev/null +++ b/data/catalogs/add-ons/mail_daemon/outbound_protocols/smtp/be.catkeys @@ -0,0 +1,13 @@ +1 belarusian x-vnd.Haiku-SMTP 1052586247 +. The server said:\n smtp . Паведамленне сервера:\n +. The server says:\n smtp . Паведамленне сервера:\n +: Connection refused or host not found. smtp : Адмоўлена ў злучэнні ці сервер не знойдзены. +Connecting to server… smtp Далучэнне да сервера… +Destination: ConfigView Прызначэнне: +ESMTP ConfigView ESMTP +Error while logging in to %serv smtp Памылка падчас лагіну ў %serv +Error while opening connection to %serv smtp Памылка падчас далучэння да %serv +None ConfigView Няма +POP3 authentication failed. The server said:\n smtp Аўтэнтыфікацыя не ўдалася. Паведамленне сервера:\n +POP3 before SMTP ConfigView POP3 перад SMTP +SMTP server: ConfigView Сервер SMTP: diff --git a/data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys b/data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys index d255845f7c..e6753a8bae 100644 --- a/data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/butterfly/uk.catkeys @@ -1 +1,2 @@ -1 ukrainian x-vnd.Haiku-ButterflyScreensaver 0 +1 ukrainian x-vnd.Haiku-ButterflyScreensaver 3604552753 +by Geoffry Song Screensaver Butterfly автор Geoffry Song diff --git a/data/catalogs/add-ons/screen_savers/debugnow/uk.catkeys b/data/catalogs/add-ons/screen_savers/debugnow/uk.catkeys index e1d7e8029b..2fa9ad7d73 100644 --- a/data/catalogs/add-ons/screen_savers/debugnow/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/debugnow/uk.catkeys @@ -1 +1,2 @@ -1 ukrainian x-vnd.Haiku-DebugNowScreensaver 0 +1 ukrainian x-vnd.Haiku-DebugNowScreensaver 822203648 +by Ryan Leavengood Screensaver DebugNow автор Ryan Leavengood diff --git a/data/catalogs/add-ons/screen_savers/flurry/uk.catkeys b/data/catalogs/add-ons/screen_savers/flurry/uk.catkeys new file mode 100644 index 0000000000..42d48aacd2 --- /dev/null +++ b/data/catalogs/add-ons/screen_savers/flurry/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.Haiku-Flurry 3686556109 +Flurry System name Flurry diff --git a/data/catalogs/add-ons/screen_savers/haiku/uk.catkeys b/data/catalogs/add-ons/screen_savers/haiku/uk.catkeys index cead9914bc..6aa474dc9f 100644 --- a/data/catalogs/add-ons/screen_savers/haiku/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/haiku/uk.catkeys @@ -1 +1,2 @@ -1 ukrainian x-vnd.Haiku-HaikuScreensaver 0 +1 ukrainian x-vnd.Haiku-HaikuScreensaver 1031480431 +by Marcus Overhagen Screensaver Haiku автор Marcus Overhagen diff --git a/data/catalogs/add-ons/screen_savers/icons/uk.catkeys b/data/catalogs/add-ons/screen_savers/icons/uk.catkeys index ec0d6c90e0..0f0f590384 100644 --- a/data/catalogs/add-ons/screen_savers/icons/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/icons/uk.catkeys @@ -1 +1,2 @@ -1 ukrainian x-vnd.Haiku-IconsScreensaver 0 +1 ukrainian x-vnd.Haiku-IconsScreensaver 3278763328 +by Vincent Duvert Screensaver Icons автор Vincent Duvert diff --git a/data/catalogs/add-ons/screen_savers/ifs/uk.catkeys b/data/catalogs/add-ons/screen_savers/ifs/uk.catkeys index 28db0f4066..d23e9361ea 100644 --- a/data/catalogs/add-ons/screen_savers/ifs/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/ifs/uk.catkeys @@ -1 +1,4 @@ -1 ukrainian x-vnd.Haiku-IFSScreensaver 0 +1 ukrainian x-vnd.Haiku-IFSScreensaver 1843903800 +Iterated Function System\n\n© 1997 Massimino Pascal\n\nxscreensaver port by Stephan Aßmus\n Screensaver IFS Iterated Function System\n\n© 1997 Massimino Pascal\n\nавтор портування Stephan Aßmus\n +Morphing speed: Screensaver IFS Швидкість морфізму: +Render dots additive Screensaver IFS Додатковий рендер точок diff --git a/data/catalogs/add-ons/screen_savers/message/uk.catkeys b/data/catalogs/add-ons/screen_savers/message/uk.catkeys index 0d2bd39432..fa47d82a18 100644 --- a/data/catalogs/add-ons/screen_savers/message/uk.catkeys +++ b/data/catalogs/add-ons/screen_savers/message/uk.catkeys @@ -1 +1,3 @@ -1 ukrainian x-vnd.Haiku-MessageScreensaver 0 +1 ukrainian x-vnd.Haiku-MessageScreensaver 854294461 +Insert clever anecdote or phrase here! Screensaver Message Вставте класний анекдот або фразу сюди! +by Ryan Leavengood Screensaver Message автор Ryan Leavengood diff --git a/data/catalogs/add-ons/tracker/zipomatic/uk.catkeys b/data/catalogs/add-ons/tracker/zipomatic/uk.catkeys index 10d2493985..a6496bb105 100644 --- a/data/catalogs/add-ons/tracker/zipomatic/uk.catkeys +++ b/data/catalogs/add-ons/tracker/zipomatic/uk.catkeys @@ -1,11 +1,13 @@ -1 ukrainian x-vnd.haiku.zip-o-matic 4030963969 +1 ukrainian x-vnd.haiku.zip-o-matic 2207848100 %ld files added. file:ZipOMaticWindow.cpp %ld файлів додано. +1 file added. file:ZipOMaticWindow.cpp Додано 1 файл. Archive file:ZipperThread.cpp Архів Archive created OK file:ZipOMaticWindow.cpp Архів успішно створений Are you sure you want to stop creating this archive? file:ZipOMaticWindow.cpp Ви впевнені, що хочете зупинити створення цього архіву? Continue file:ZipOMaticWindow.cpp Продовжити Creating archive: %s file:ZipOMaticWindow.cpp Створення архіву: %s Do you want to stop them? file:ZipOMatic.cpp Ви хочете зупинити це? +Drop files here. file:ZipOMaticWindow.cpp Перенесіть файли сюди. Error creating archive file:ZipOMaticWindow.cpp Помилка створення архіву Filename: %s file:ZipOMaticWindow.cpp Ім'я файлу: %s Let them continue file:ZipOMatic.cpp Нехай це продовжується diff --git a/data/catalogs/add-ons/translators/exr/uk.catkeys b/data/catalogs/add-ons/translators/exr/uk.catkeys index 0adca488c8..10e0564d42 100644 --- a/data/catalogs/add-ons/translators/exr/uk.catkeys +++ b/data/catalogs/add-ons/translators/exr/uk.catkeys @@ -1,8 +1,9 @@ -1 ukrainian x-vnd.Haiku-EXRTranslator 976342086 +1 ukrainian x-vnd.Haiku-EXRTranslator 3390292316 Based on OpenEXR (http://www.openexr.com) ConfigView Базоване на OpenEXR (http://www.openexr.com) EXR Images ConfigView Зображення EXR EXR Images EXRTranslator Зображення EXR EXR Settings main Настройки EXR +EXR image EXRTranslator Зображення EXR EXR image translator EXRTranslator Перетворювач зображень EXR Version %d.%d.%d, %s ConfigView Версія %d.%d.%d, %s a division of Lucasfilm Entertainment Company Ltd ConfigView відділення Lucasfilm Entertainment Company Ltd diff --git a/data/catalogs/add-ons/translators/gif/uk.catkeys b/data/catalogs/add-ons/translators/gif/uk.catkeys index 9346fd5a2d..34010d52e5 100644 --- a/data/catalogs/add-ons/translators/gif/uk.catkeys +++ b/data/catalogs/add-ons/translators/gif/uk.catkeys @@ -1,10 +1,15 @@ -1 ukrainian x-vnd.Haiku-GIFTranslator 2939496153 +1 ukrainian x-vnd.Haiku-GIFTranslator 829368084 +Automatic (from alpha channel) GIFView Автоматично (з альфа каналу) Be Bitmap Format (GIFTranslator) GIFTranslator Формат Be Bitmap (Перетворювач GIF) BeOS system GIFView Система BeOS Colors GIFView Кольори +GIF Settings GIFTranslator Настройки GIF GIF image GIFTranslator Зображення GIF -Greyscale GIFView сірий +Greyscale GIFView Сірий +Optimal GIFView Оптимальний +Palette GIFView Палітра Use RGB color GIFView Використовувати кольори RGB Use dithering GIFView Використовувати згладжування +Websafe GIFView Придатний для Web Write interlaced images GIFView Записати зображення, що переплітаються Write transparent images GIFView Записати прозорі зображення diff --git a/data/catalogs/add-ons/translators/hvif/uk.catkeys b/data/catalogs/add-ons/translators/hvif/uk.catkeys index 202cd12123..0c84817efa 100644 --- a/data/catalogs/add-ons/translators/hvif/uk.catkeys +++ b/data/catalogs/add-ons/translators/hvif/uk.catkeys @@ -1,6 +1,7 @@ -1 ukrainian x-vnd.Haiku-HVIFTranslator 1594129735 +1 ukrainian x-vnd.Haiku-HVIFTranslator 813066125 HVIF Settings HVIFMain Настройки HVIF HVIF icons HVIFTranslator Іконки HVIF +HVIFTranslator Settings HVIFTranslator Настройки перетворювача HVIFТ Native Haiku icon format translator HVIFView Перетворювач формату рідних векторних іконок Haiku Native Haiku vector icon translator HVIFTranslator Перетворювач рідних векторних іконок Haiku Render size: HVIFView Розмір рендера: diff --git a/data/catalogs/add-ons/translators/ico/uk.catkeys b/data/catalogs/add-ons/translators/ico/uk.catkeys index 73e7b17821..5bb485dd91 100644 --- a/data/catalogs/add-ons/translators/ico/uk.catkeys +++ b/data/catalogs/add-ons/translators/ico/uk.catkeys @@ -1,11 +1,14 @@ -1 ukrainian x-vnd.Haiku-ICOTranslator 2616402112 +1 ukrainian x-vnd.Haiku-ICOTranslator 3151213372 Cursor ICOTranslator Курсор Enforce valid icon sizes ConfigView Змусити доступні розміри іконок ICO Settings main Настройки ICO +ICOTranslator Settings ConfigView Настройки перетворювача ICO Icon ICOTranslator Іконка Valid icon sizes are 16, 32, or 48 ConfigView Доступні розміри іконок є 16, 32, або 48 Version %d.%d.%d, %s ConfigView Версія %d.%d.%d, %s +Windows %s %ld bit image ICOTranslator Вікна зображення %s %ld bit Windows icon images ConfigView Вікна зображень іконок Windows icon images ICOTranslator Вікна зображень іконки Windows icon translator ICOTranslator Перетворювач вікон іконок Write 32 bit images on true color input ConfigView Записати зображення 32 bit на вхід true color +pixels in either direction. ConfigView пікселів в кожному напрямку. diff --git a/data/catalogs/add-ons/translators/jpeg/uk.catkeys b/data/catalogs/add-ons/translators/jpeg/uk.catkeys index e93c4e4a1a..d7a713fce2 100644 --- a/data/catalogs/add-ons/translators/jpeg/uk.catkeys +++ b/data/catalogs/add-ons/translators/jpeg/uk.catkeys @@ -1,8 +1,10 @@ -1 ukrainian x-vnd.Haiku-JPEGTranslator 2438630007 +1 ukrainian x-vnd.Haiku-JPEGTranslator 965709535 About JPEGTranslator Про Be Bitmap Format (JPEGTranslator) JPEGTranslator Формат Be Bitmap (Перетворювач JPEG) High JPEGTranslator Високе JPEG Library Error: %s\n be_jerror Помилка бібліотеки JPEG: %s\n +JPEG Library Warning: %s\n be_jerror Попередження бібліотеки JPEG: %s\n +JPEG images JPEGTranslator Зображення JPEG Low JPEGTranslator Низьке Make file smaller (sligthtly worse quality) JPEGTranslator Зробити файл меньшим (можлива втрата якості) None JPEGTranslator Жоден @@ -12,5 +14,9 @@ Prevent colors 'washing out' JPEGTranslator попереджати втрату Read JPEGTranslator Читати Read greyscale images as RGB32 JPEGTranslator Читати сірі зображення як RGB32 Show warning messages JPEGTranslator Показувати попередження +Use CMYK code with 0 for 100% ink coverage JPEGTranslator Використовувати код CMYK 0 для 100% охоплення чорнила Use progressive compression JPEGTranslator Використовувати прогресивний зтиск +Write JPEGTranslator Записати Write black-and-white images as RGB24 JPEGTranslator Записувати чорно-білі зображення як RGB24 +©2002-2003, Marcin Konicki\n©2005-2007, Haiku\n\nBased on IJG library © 1994-2009, Thomas G. Lane, Guido Vollbeding.\n\thttp://www.ijg.org/files/\n\nwith \"lossless\" encoding support patch by Ken Murchison\n\thttp://www.oceana.com/ftp/ljpeg/\n\nWith some colorspace conversion routines by Magnus Hellman\n\thttp://www.bebits.com/app/802\n JPEGTranslator ©2002-2003, Marcin Konicki\n©2005-2007, Haiku\n\n На основі бібліотеки IJG © 1994-2009, Thomas G. Lane, Guido Vollbeding.\n\thttp://www.ijg.org/files/\n\nз заплаткою для \"lossless\" кодування Ken Murchison\n\thttp://www.oceana.com/ftp/ljpeg/\n\nЗ деякою зміною передачі кольору від Magnus Hellman\n\thttp://www.bebits.com/app/802\n + diff --git a/data/catalogs/add-ons/translators/jpeg2000/uk.catkeys b/data/catalogs/add-ons/translators/jpeg2000/uk.catkeys index cea87062bb..8f72190cf9 100644 --- a/data/catalogs/add-ons/translators/jpeg2000/uk.catkeys +++ b/data/catalogs/add-ons/translators/jpeg2000/uk.catkeys @@ -1,6 +1,13 @@ -1 ukrainian x-vnd.Haiku-JPEG2000Translator 3397102117 +1 ukrainian x-vnd.Haiku-JPEG2000Translator 547915409 About JPEG2000Translator Про Be Bitmap Format (JPEG2000Translator) JPEG2000Translator Be Bitmap Format (Перетворювач JPEG2000) +High JPEG2000Translator Висока +JPEG2000 images JPEG2000Translator Зображення JPEG2000 +Low JPEG2000Translator Низька Output only codestream (.jpc) JPEG2000Translator Виводити тільки кодовий потік (.jpc) Output quality JPEG2000Translator Якість вихідних +Read JPEG2000Translator Читати +Read greyscale images as RGB32 JPEG2000Translator Читати сірі зображення як RGB32 +Write JPEG2000Translator Записати Write black-and-white images as RGB24 JPEG2000Translator Записати чорно-білі зображення як RGB24 +©2002-2003, Shard\n©2005-2006, Haiku\n\nBased on JasPer library:\n© 1999-2000, Image Power, Inc. and\nthe University of British Columbia, Canada.\n© 2001-2003 Michael David Adams.\n\thttp://www.ece.uvic.ca/~mdadams/jasper/\n\nImageMagick's jp2 codec was used as \"tutorial\".\n\thttp://www.imagemagick.org/\n JPEG2000Translator ©2002-2003, Shard\n©2005-2006, Haiku\n\nБазоване на бібліотеці JasPer:\n© 1999-2000, Image Power, Inc. і\nуніверситету Британської Колумбії, Canada.\n© 2001-2003 Michael David Adams.\n\thttp://www.ece.uvic.ca/~mdadams/jasper/\n\nImageMagick's jp2 кодек був використаний як \"tutorial\".\n\thttp://www.imagemagick.org/\n diff --git a/data/catalogs/add-ons/translators/rtf/uk.catkeys b/data/catalogs/add-ons/translators/rtf/uk.catkeys index f689b33a18..823ee1beec 100644 --- a/data/catalogs/add-ons/translators/rtf/uk.catkeys +++ b/data/catalogs/add-ons/translators/rtf/uk.catkeys @@ -1,4 +1,9 @@ -1 ukrainian x-vnd.Haiku-RTFTranslator 2402784437 +1 ukrainian x-vnd.Haiku-RTFTranslator 526958155 +RTF Settings main Настройки RTF +RTF text files RTFTranslator Текстові файли RTF RTF-Translator Settings ConfigView Настройки Перетворювача RTF +Rich Text Format (RTF) files ConfigView Файли Rich Text Format (RTF) +Rich Text Format Translator RTFTranslator Перетворювач Rich Text Format Rich Text Format translator v%d.%d.%d %s RTFTranslator Перетворювач Rich Text Format v%d.%d.%d %s RichTextFormat file RTFTranslator Файл формату RichText +Version %d.%d.%d, %s ConfigView Версія %d.%d.%d, %s diff --git a/data/catalogs/add-ons/translators/tga/uk.catkeys b/data/catalogs/add-ons/translators/tga/uk.catkeys index b580cf8bfe..2c454c9390 100644 --- a/data/catalogs/add-ons/translators/tga/uk.catkeys +++ b/data/catalogs/add-ons/translators/tga/uk.catkeys @@ -1,8 +1,10 @@ -1 ukrainian x-vnd.Haiku-TGATranslator 1321391055 +1 ukrainian x-vnd.Haiku-TGATranslator 2221210336 Ignore TGA alpha channel TGAView Ігнорувати альфа канал TGA Save with RLE Compression TGAView Зберегти зі стиском RLE +TGA Settings TGAMain Настройки TGA TGA image translator TGATranslator Перетворювач зображеньTGA TGA images TGATranslator Зображення TGA +TGATranslator Settings TGATranslator Настройки Перетворювача TGA Targa image (%d bits RLE colormap) TGATranslator Зображення Targa (палітра кольорів RLE %d біт) Targa image (%d bits RLE gray) TGATranslator Зображення Targa (сіре RLE %d біт) Targa image (%d bits RLE truecolor) TGATranslator Зображення Targa (повнокольрове RLE %d біт) diff --git a/data/catalogs/apps/3dmov/uk.catkeys b/data/catalogs/apps/3dmov/uk.catkeys new file mode 100644 index 0000000000..ae6f54b6bc --- /dev/null +++ b/data/catalogs/apps/3dmov/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.Haiku-3DMov 40426706 +3DMov System name 3D відео diff --git a/data/catalogs/apps/aboutsystem/be.catkeys b/data/catalogs/apps/aboutsystem/be.catkeys index d936ca4e94..408553a32f 100644 --- a/data/catalogs/apps/aboutsystem/be.catkeys +++ b/data/catalogs/apps/aboutsystem/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-About 128117018 +1 belarusian x-vnd.Haiku-About 1133193730 %.2f GHz AboutView %.2f ГГц %d MiB total AboutView %d MiB усяго %d MiB used (%d%%) AboutView %d MiB выкарыстана (%d%%) @@ -6,6 +6,7 @@ %ld Processors: AboutView %ld Працэсараў: %total MiB total, %inaccessible MiB inaccessible AboutView %total MiB усяго %inaccessible MiB недаступна ... and the many people making donations!\n\n AboutView ... і тыя, хто рабіў саве ахвяраванні!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView 2001 by Andy Ritger грунтуецца на Generalized Timing Formula About this system AboutWindow Інфармацыя пра сістэму AboutSystem System name Пра Сістэму BSD (2-clause) AboutView BSD (2 часткі) @@ -70,8 +71,8 @@ The BeGeistert team\n AboutView Каманада BeGeistert\n The Haiku-Ports team\n AboutView Каманда Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Каманда Haikuware і ихнія ахвяраванні\n The University of Auckland and Christof Lutteroth\n\n AboutView The University of Auckland and Christof Lutteroth\n\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 %MIT licence%. 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 Код, унікальны для Haiku, асабіста ядро і ўвесь код, да якога могуць звяртацца праграмы, распаўсюджваецца ў межах %MIT licence%. Некаторыя сістэмныя бібліятэкі змяшчаюць код, які распаўсюджваецца ў межах ліцэнзіі LGPL. Аўтарскія правы на код трэціх старон глядзіце ніжэй.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Аўтарскія правы на зыходны код Haiku належаць Haiku, Inc. ці суадносным аўтарам якія пазначаны ў зыходных тэкстах. Haiku™ і HAIKU logo® з´яўляюцца зарэгістраванымі гандлёвымі знакамі Haiku, Inc.\n\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 %MIT license%. 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 %MIT license% isn't a variable and has to be translated. Код, унікальны для Haiku, асабіста ядро і ўвесь код, да якога могуць звяртацца праграмы, распаўсюджваецца ў межах %ліцэнзіі MIT%. Некаторыя сістэмныя бібліятэкі змяшчаюць код, які распаўсюджваецца ў межах ліцэнзіі LGPL. Аўтарскія правы на код трэціх старон глядзіце ніжэй.\n\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 registered trademarks of Haiku, Inc.\n\n AboutView Аўтарскія правы на зыходны код Haiku належаць Haiku, Inc. ці суадносным аўтарам якія пазначаны ў зыходных тэкстах. Haiku® і HAIKU logo® з´яўляюцца зарэгістраванымі гандлёвымі знакамі Haiku, Inc.\n\n Time running: AboutView Час працы: Translations:\n AboutView Пераклады:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (асабіста за ядро NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/cs.catkeys b/data/catalogs/apps/aboutsystem/cs.catkeys index 1068bef547..f862f72bda 100644 --- a/data/catalogs/apps/aboutsystem/cs.catkeys +++ b/data/catalogs/apps/aboutsystem/cs.catkeys @@ -1,4 +1,4 @@ -1 czech x-vnd.Haiku-About 1388347678 +1 czech x-vnd.Haiku-About 1542889289 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB celkem %d MiB used (%d%%) AboutView %d MiB používáno (%d%%) @@ -47,7 +47,6 @@ The BeGeistert team\n AboutView Tým BeGeister\n The Haiku-Ports team\n AboutView Tým Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Tým Haikuware a jejich systém prémií\n The University of Auckland and Christof Lutteroth\n\n AboutView Aucklandská Universita a Christof Lutteroth\n\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 %MIT licence%. 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 Kód, který je jedinečný pro Haiku, zejména jádro a veškerý kód, ke kterému se mohou odkazovat aplikace, je distribuován pod podmínkami %MIT licence%. Některé knihovny obsahují kód třetích stran distribuovaný pod licencí LGPL. Copyrighty ke kódu třetích stran je možno nalézt níže. 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 (registered) trademarks of Haiku, Inc.\n\n AboutView Autorská práva ke kódu Haiku jsou majetkem společnosti Haiku, Inc., nebo příslušných autorů, je-li to výslovně uvedeno ve zdroji. Haiku a logo Haiku jsou ochranné známky společnosti Haiku, Inc.\n\n Time running: AboutView Uptime: Translations:\n AboutView Překlady:\n diff --git a/data/catalogs/apps/aboutsystem/de.catkeys b/data/catalogs/apps/aboutsystem/de.catkeys index 3f40dd3644..ff94452b5c 100644 --- a/data/catalogs/apps/aboutsystem/de.catkeys +++ b/data/catalogs/apps/aboutsystem/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-About 128117018 +1 german x-vnd.Haiku-About 1133193730 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB gesamt %d MiB used (%d%%) AboutView %d MiB benutzt (%d%%) @@ -6,6 +6,7 @@ %ld Processors: AboutView %ld Prozessoren: %total MiB total, %inaccessible MiB inaccessible AboutView %total MiB gesamt, %inaccessible MiB nicht verfügbar ... and the many people making donations!\n\n AboutView ... und die vielen Leute, die durch Spenden geholfen haben!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView Copyright © 2001 Andy Ritger, basierend auf 'Generalized Timing Formula'. About this system AboutWindow Über dieses System AboutSystem System name Über Haiku BSD (2-clause) AboutView 2-Klausel-BSD @@ -70,8 +71,8 @@ The BeGeistert team\n AboutView Das BeGeistert-Team\n The Haiku-Ports team\n AboutView Das Haiku-Ports-Team\n The Haikuware team and their bounty program\n AboutView Das Haikuware-Team und deren Bounty-Programm\n The University of Auckland and Christof Lutteroth\n\n AboutView Die Universität von Auckland und Christof Lutteroth\n\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 %MIT licence%. 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 Der von Haiku selbst erstellte Quellcode, besonders der Kernel und alle Teile des Codes, gegen den Anwendungen gelinkt werden können, steht unter den Bedingungen der %MIT Lizenz%. Einige Systembibliotheken, die Code von Dritten enthalten, stehen unter der LGPL Lizenz. Angaben zum Copyright von externen Quellen sind unten aufgeführt.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Die Urheberrechte am Haiku-Code liegen bei Haiku, Inc., beziehungsweise bei den entsprechenden Autoren, die explizit im Quelltext aufgeführt sind. Haiku™ und das HAIKU Logo® sind (registrierte) Marken von Haiku, Inc.\n\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 %MIT license%. 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 %MIT license% isn't a variable and has to be translated. Der von Haiku selbst erstellte Quellcode, besonders der Kernel und alle Teile des Codes, gegen den Anwendungen gelinkt werden können, wird unter den Bedingungen der %MIT Lizenz% veröffentlicht. Einige Systembibliotheken, die Code von Dritten enthalten, stehen unter der LGPL Lizenz. Angaben zum Copyright von externen Quellen sind unten aufgeführt.\n\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 registered trademarks of Haiku, Inc.\n\n AboutView Die Urheberrechte am Haiku-Code liegen bei Haiku, Inc., beziehungsweise bei den entsprechenden Autoren, die explizit im Quelltext aufgeführt sind. Haiku® und das HAIKU Logo® sind registrierte Marken von Haiku, Inc.\n\n Time running: AboutView Laufzeit: Translations:\n AboutView Übersetzungen:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (und seinen NewOS-Kernel)\n diff --git a/data/catalogs/apps/aboutsystem/eo.catkeys b/data/catalogs/apps/aboutsystem/eo.catkeys index d432bd4d87..7670435f60 100644 --- a/data/catalogs/apps/aboutsystem/eo.catkeys +++ b/data/catalogs/apps/aboutsystem/eo.catkeys @@ -1,4 +1,4 @@ -1 esperanto x-vnd.Haiku-About 3149623567 +1 esperanto x-vnd.Haiku-About 3304165178 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiBajtoj ĉiomaj %d MiB used (%d%%) AboutView %d MiBajtoj uzataj (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView La grupo BeGeistert\n The Haiku-Ports team\n AboutView La Hajku-Portantaro\n The Haikuware team and their bounty program\n AboutView La Haikuware grupo kaj ilia premia programo\n The University of Auckland and Christof Lutteroth\n\n AboutView la Universitato de Aŭklando kaj Christof Lutteroth\n\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 %MIT licence%. 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 La fontkodo unika je Haiku, speciale la kerno kaj la binditaj aplikaĵoj, disiĝas laŭ la termoj de la %permesilo MIT%. Certaj sistemaj bibliotekoj enhavas eksterpartian fontkodon disiĝintan laŭ la permesilo LGPL. Vi trovos la aŭtorrajtojn pro la eksterpartia fontkodo pieden.\n\n Time running: AboutView Ruldaŭro: Translations:\n AboutView Tradukoj:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (kaj lia NewOS kerno)\n diff --git a/data/catalogs/apps/aboutsystem/es.catkeys b/data/catalogs/apps/aboutsystem/es.catkeys index b5b62978c6..8b17a6bf80 100644 --- a/data/catalogs/apps/aboutsystem/es.catkeys +++ b/data/catalogs/apps/aboutsystem/es.catkeys @@ -1,4 +1,4 @@ -1 spanish x-vnd.Haiku-About 3149623567 +1 spanish x-vnd.Haiku-About 3304165178 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB en total %d MiB used (%d%%) AboutView %d MiB usados (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView El equipo de BeGeistert\n The Haiku-Ports team\n AboutView El equipo Haiku-Ports\n The Haikuware team and their bounty program\n AboutView El equipo de Haikuware y su programa de recompensas\n The University of Auckland and Christof Lutteroth\n\n AboutView La Universidad de Auckland y a Christof Lutteroth\n\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 %MIT licence%. 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 El código que es único de Haiku, en especial el núcleo y todo el código al cual se enlazan las aplicaciones, se distribuye bajo los términos de la %licencia MIT%. Algunas librerías del sistema contienen código de terceras personas distribuidas bajo la licencia LGPL. Los derechos de autor de terceras personas se encuentran a continuación.\n\n Time running: AboutView Tiempo en ejecución: Translations:\n AboutView Traducciones:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (y su núcleo NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/fi.catkeys b/data/catalogs/apps/aboutsystem/fi.catkeys index acfe2a318f..f6534d7797 100644 --- a/data/catalogs/apps/aboutsystem/fi.catkeys +++ b/data/catalogs/apps/aboutsystem/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-About 128117018 +1 finnish x-vnd.Haiku-About 1133193730 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d mebitavua yhteensä %d MiB used (%d%%) AboutView %d mebitavua käytetty (%d%%) @@ -6,6 +6,7 @@ %ld Processors: AboutView %ld Suoritinta: %total MiB total, %inaccessible MiB inaccessible AboutView %total mebitavua yhteensä, %inaccessible mebitavua luoksepääsemätön ... and the many people making donations!\n\n AboutView ... ja monet lahjoituksia tehneet ihmiset!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView 2001, Andy Ritger perustuen Generalized Timing Formula -standardiin About this system AboutWindow Tietoa tästä järjestelmästä AboutSystem System name Järjestelmästä BSD (2-clause) AboutView BSD (2-ehto) @@ -70,8 +71,8 @@ The BeGeistert team\n AboutView BeGeistert-ryhmä\n The Haiku-Ports team\n AboutView Haiku-Ports -ryhmä\n The Haikuware team and their bounty program\n AboutView Haikuware-ryhmä ja heidän bounty-ohjelmansa\n The University of Auckland and Christof Lutteroth\n\n AboutView Aucklandin yliopisto ja Christof Lutteroth\n\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 %MIT licence%. 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 Haikulle uniikki koodi, erityisesti ydin ja kaikki koodi, johon sovellukset linkitetään, jaellaan %MIT licence%-lisenssin ehtojen alla. Jotkut järjestelmäkirjastot sisältävät kolmannen osapuolen koodia, joka jaetaan LGPL-lisenssin alla. Löydät kolmannen osapuolen tekijänoikeustiedot alta.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Tekijänoikeus Haiku-koodiin on Haiku, Inc.-yrityksen tai vastaavien lähdekoodissa nimenomaisesti ilmaistujen tekijöiden omaisuutta. Haiku™ ja Haiku logo® ovat Haiku, Inc. -yrityksen (rekisteröityjä) tavaramerkkejä.\n\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 %MIT license%. 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 %MIT license% isn't a variable and has to be translated. Haikulle uniikki koodi, erityisesti ydin ja kaikki koodi, johon sovellukset ehkä linkitetään, jaellaan %MIT licence%-lisenssin ehtojen alla. Jotkut järjestelmäkirjastot sisältävät kolmannen osapuolen koodia, joka jaetaan LGPL-lisenssin alla. Löydät kolmannen osapuolen tekijänoikeustiedot alta.\n\nHuomautus: %MIT license% ei ole muuttuja ja se on suomennettava. +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 registered trademarks of Haiku, Inc.\n\n AboutView Tekijänoikeus Haiku-koodiin on Haiku, Inc.-yrityksen tai vastaavien lähdekoodissa nimenomaisesti ilmaistujen tekijöiden omaisuutta. Haiku® ja HAIKU logo® ovat Haiku, Inc.-yrityksen rekisteröityjä tavaramerkkejä.\n\n Time running: AboutView Käynnissäoloaika: Translations:\n AboutView Käännökset:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (ja hänen NewOS-ytimensä)\n diff --git a/data/catalogs/apps/aboutsystem/fr.catkeys b/data/catalogs/apps/aboutsystem/fr.catkeys index 33de8d6cf5..73602d8bf2 100644 --- a/data/catalogs/apps/aboutsystem/fr.catkeys +++ b/data/catalogs/apps/aboutsystem/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-About 128117018 +1 french x-vnd.Haiku-About 282658629 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d Mio au total %d MiB used (%d%%) AboutView %d Mio utilisés (%d%%) @@ -70,7 +70,6 @@ The BeGeistert team\n AboutView L'équipe BeGeistert\n The Haiku-Ports team\n AboutView L'équipe de Haiku-Ports\n The Haikuware team and their bounty program\n AboutView L'équipe Haikuware et son programme de récompenses\n The University of Auckland and Christof Lutteroth\n\n AboutView L'université d'Auckland et Christof Lutteroth\n\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 %MIT licence%. 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 Le code source spécifique à Haiku, en particulier, celui du noyau et des applications liées, est distribué suivant les termes de la %licence MIT%. Quelques librairies systèmes contiennent du code tiers, distribué sous licence LGPL. Vous pouvez trouver les copyrights de ce code ci-dessous. 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 (registered) trademarks of Haiku, Inc.\n\n AboutView Les droits d'auteurs sur le code d'Haiku sont la propriété d'Haiku, Inc ou de ses auteurs respectifs, conformément à ce qui est expressément indiqué dans les sources. Haiku™ et le logo HAIKU ® sont des marques (déposées) de Haiku, Inc\n\n Time running: AboutView Temps depuis le démarrage : Translations:\n AboutView Traductions :\n diff --git a/data/catalogs/apps/aboutsystem/it.catkeys b/data/catalogs/apps/aboutsystem/it.catkeys index 3c9ee5bf9b..d0fc4acba5 100644 --- a/data/catalogs/apps/aboutsystem/it.catkeys +++ b/data/catalogs/apps/aboutsystem/it.catkeys @@ -1,4 +1,4 @@ -1 italian x-vnd.Haiku-About 3149623567 +1 italian x-vnd.Haiku-About 3304165178 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB totali %d MiB used (%d%%) AboutView %d MiB utilizzati (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView Il team del BeGeistert\n The Haiku-Ports team\n AboutView Il team di Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Il team di Haikuware e il loro programma di bounty\n The University of Auckland and Christof Lutteroth\n\n AboutView L'Università di Auckland e Christof Lutteroth\n\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 %MIT licence%. 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 Il codice che è unico di Haiku, in particolare il kernel e tutto il codice che le applicazioni possono linkare, è distribuito secondo i termini della %licenza MIT%. Alcune librerie di sistema contengono codice di terze parti distribuito sotto licenza LGPL. È possibile trovare il copyright del codice di terze parti qui sotto.\n\n Time running: AboutView Tempo dall'avvio: Translations:\n AboutView Traduzioni:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (e il suo kernel NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/ja.catkeys b/data/catalogs/apps/aboutsystem/ja.catkeys index 963b9f78f2..546a08a83a 100644 --- a/data/catalogs/apps/aboutsystem/ja.catkeys +++ b/data/catalogs/apps/aboutsystem/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-About 128117018 +1 japanese x-vnd.Haiku-About 1344586426 %.2f GHz AboutView %.2f GHz %d MiB total AboutView 合計 %d MiB %d MiB used (%d%%) AboutView %d MiB 使用中 (%d%%) @@ -6,11 +6,12 @@ %ld Processors: AboutView %ld プロセッサー： %total MiB total, %inaccessible MiB inaccessible AboutView 合計 %total MiB / %inaccessible MiB アクセス不可 ... and the many people making donations!\n\n AboutView ...寄付をしていただいた大勢の方々!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView 2001 by Andy Ritger based on the Generalized Timing Formula About this system AboutWindow このシステムについて AboutSystem System name このシステムについて -BSD (2-clause) AboutView BSD (第2条) -BSD (3-clause) AboutView BSD (第3条) -BSD (4-clause) AboutView BSD (第4条) +BSD (2-clause) AboutView BSD (2条項) +BSD (3-clause) AboutView BSD (3条項) +BSD (4-clause) AboutView BSD (4条項) Be Inc. and its developer team, for having created BeOS!\n\n AboutView Be Inc. およびその開発チーム: 彼らはBeOSを創造してくれました! Contains software developed by the NetBSD Foundation, Inc. and its contributors:\nftp, tput\nCopyright © 1996-2008 The NetBSD Foundation, Inc. All rights reserved. AboutView 次のソフトウェアはNetBSD Foundation, Inc.およびその貢献者らにより開発されたソフトウェアを含みます:\nftp, tput\nCopyright © 1996-2008 The NetBSD Foundation, Inc. All rights reserved. Contains software from the FreeBSD Project, released under the BSD license:\ncal, ftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved. AboutView 次のソフトウェアはFreeBSD Projectで開発され、BSDライセンスで公開されているソフトウェアを含みます:\ncal, ftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved. @@ -70,7 +71,6 @@ The BeGeistert team\n AboutView BeGeistert 展チーム\n The Haiku-Ports team\n AboutView Haiku-Ports チーム\n The Haikuware team and their bounty program\n AboutView Haikuware チーム＆報奨金プログラム\n The University of Auckland and Christof Lutteroth\n\n AboutView Auckland 大学 と Christof Lutteroth\n\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 %MIT licence%. 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 Haiku 特有のコード、特にカーネルとカーネルにリンクするアプリケーションのコードは、%MIT licence%で公開しています。一部のシステムライブラリが LPGL ライセンスで公開されている第三者が作のコードを含めています。第三者の著作権情報は下記に記載されています。\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Haikuのコードの著作権はHaiku, Inc.または各ソースコードに明示された個々の著者に帰属します。Haiku™およびHAIKUロゴ・マーク®はHaiku, Inc.の(登録)商標です。 Time running: AboutView 稼動時間： Translations:\n AboutView 各国語翻訳：\n diff --git a/data/catalogs/apps/aboutsystem/lt.catkeys b/data/catalogs/apps/aboutsystem/lt.catkeys index 97ce15984a..aadfa86d51 100644 --- a/data/catalogs/apps/aboutsystem/lt.catkeys +++ b/data/catalogs/apps/aboutsystem/lt.catkeys @@ -1,4 +1,4 @@ -1 lithuanian x-vnd.Haiku-About 3149623567 +1 lithuanian x-vnd.Haiku-About 3304165178 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB iš viso %d MiB used (%d%%) AboutView %d MiB naudojama (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView „BeGeistert“ komandai\n The Haiku-Ports team\n AboutView „Haiku-Ports“ komandai\n The Haikuware team and their bounty program\n AboutView „Haikuware“ komandai ir jos premijavimo programai\n The University of Auckland and Christof Lutteroth\n\n AboutView Oklando universitetui ir Kristofui Luterotui\n\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 %MIT licence%. 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 Pirminiai tekstai, naudojami išimtinai „Haiku“, ypač branduolio bei visas kodas su kuriuo galima saistyti programas, platinamas pagal %MIT licence%. Kai kuriose sistemos bibliotekose yra trečiųjų šalių kodo, platinamo LGPL licenzijos sąlygomis. Trečiųjų šalių kodo autorių teisės yra išvardintos žemiau žemiau.\n\n Time running: AboutView Veikimo laikas: Translations:\n AboutView Vertimai:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Traviui Geiselbrecht (bei jo NewOS branduoliui)\n diff --git a/data/catalogs/apps/aboutsystem/nb.catkeys b/data/catalogs/apps/aboutsystem/nb.catkeys index f3bb605826..7d9509c873 100644 --- a/data/catalogs/apps/aboutsystem/nb.catkeys +++ b/data/catalogs/apps/aboutsystem/nb.catkeys @@ -1,4 +1,4 @@ -1 norwegian_bokmål x-vnd.Haiku-About 128117018 +1 norwegian_bokmål x-vnd.Haiku-About 282658629 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB totalt %d MiB used (%d%%) AboutView %d MiB brukt (%d%%) @@ -70,7 +70,6 @@ The BeGeistert team\n AboutView BeGeistert-teamet\n The Haiku-Ports team\n AboutView Haiku-Ports-teamet\n The Haikuware team and their bounty program\n AboutView Haikuware-teamet og deres dusørprogram\n The University of Auckland and Christof Lutteroth\n\n AboutView University of Auckland og Christof Lutteroth\n\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 %MIT licence%. 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 Koden som er unik for Haiku, særlig kjernen og all kode som applikasjoner kan lenkes til, distribueres under %MIT-lisensen%. Noen systembiblioteker inneholder kode fra tredjepart som distribueres under LGPL-lisensen. Opphavsrettighetene til tredjepartskode finner du nedenfor.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Opphavsretten til Haiku-koden tilhører Haiku, Inc. eller de respektive forfattere der det er uttrykkelig nevnt i kildekoden. Haiku™ og HAIKU-logoen® er (registrerte) varemerker tilhørende Haiku, Inc.\n\n Time running: AboutView Oppetid: Translations:\n AboutView Oversettelse:\n diff --git a/data/catalogs/apps/aboutsystem/nl.catkeys b/data/catalogs/apps/aboutsystem/nl.catkeys index 2ca54f9646..dcd0db3cc2 100644 --- a/data/catalogs/apps/aboutsystem/nl.catkeys +++ b/data/catalogs/apps/aboutsystem/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch x-vnd.Haiku-About 2763068380 +1 dutch x-vnd.Haiku-About 2917609991 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB totaal %d MiB used (%d%%) AboutView %d MiB gebruikt (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView Het BeGeistert-team\n The Haiku-Ports team\n AboutView Het Haiku-Ports-team\n The Haikuware team and their bounty program\n AboutView Het Haikuware-team en hun bountyprogramma\n The University of Auckland and Christof Lutteroth\n\n AboutView De Universiteit van Auckland en Christof Lutteroth\n\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 %MIT licence%. 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 De code die uniek van Haiku is, in het bijzonder de kernel en alle code waar applicaties naar kunnen linken, wordt verspreid onder de %MIT-licence%. Sommige systeembibliotheken bevatten code van een derde partij, verspreid onder de LGPL-licentie. U kunt de copyrights van de code van derde partijen hieronder vinden.\n\n Time running: AboutView Looptijd: Translations:\n AboutView Vertalingen:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (en zijn NewOS kernel)\n diff --git a/data/catalogs/apps/aboutsystem/pl.catkeys b/data/catalogs/apps/aboutsystem/pl.catkeys index 9dedf6389a..23e758ba7d 100644 --- a/data/catalogs/apps/aboutsystem/pl.catkeys +++ b/data/catalogs/apps/aboutsystem/pl.catkeys @@ -1,4 +1,4 @@ -1 polish x-vnd.Haiku-About 3149623567 +1 polish x-vnd.Haiku-About 3304165178 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB ogółem %d MiB used (%d%%) AboutView %d MiB użyte (%d%%) @@ -24,7 +24,6 @@ The BeGeistert team\n AboutView Grupy BeGeistert\n The Haiku-Ports team\n AboutView Zespółu Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Zespółu Haikuware i ich program nagród\n The University of Auckland and Christof Lutteroth\n\n AboutView Uniwersytetu w Auckland oraz Christofa Lutterotha -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 %MIT licence%. 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 Kod unikalny dla projektu Haiku, w szczególności jądro systemu oraz kod źródłowy, do którego odwołują się aplikacje systemowe, jest udostępniany na licencji %MIT licence%. Część bibliotek systemowych zawiera kod źródłowy stron trzecich, dystrybuowany na zasadach licencji LGPL. Prawa autorskie do kodu stron trzecich możesz znaleźć na liście poniżej.\n\n Time running: AboutView Czas działania: Translations:\n AboutView Tłumaczenie:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (i jego kernela NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/pt_br.catkeys b/data/catalogs/apps/aboutsystem/pt_br.catkeys index b2d0ae4f41..04d832b20e 100644 --- a/data/catalogs/apps/aboutsystem/pt_br.catkeys +++ b/data/catalogs/apps/aboutsystem/pt_br.catkeys @@ -1,4 +1,4 @@ -1 brazilian_portuguese x-vnd.Haiku-About 2709881985 +1 brazilian_portuguese x-vnd.Haiku-About 2864423596 %d MiB used (%d%%) AboutView %d MiB usados (%d%%) %total MiB total, %inaccessible MiB inaccessible AboutView %total MiB total, %inaccessible MiB inacessíveis ... and the many people making donations!\n\n AboutView ... e as muitas pessoas que fizeram doações!\n\n @@ -11,7 +11,6 @@ Source Code: AboutView Código fonte: The BeGeistert team\n AboutView A equipe BeGeistert\n The Haiku-Ports team\n AboutView A equipe Haiku-Ports\n The Haikuware team and their bounty program\n AboutView A equipe do Haikuware e o seu programa de recompensas\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 %MIT licence%. 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 Este código do Haiku é único, especialmente o kernel e todo o código que pode ser ligado nos aplicativos, são distribuídos sob os termos da %MIT licence%. Algumas bibliotecas do sistema contém código de terceiros distribuído sob a licença LGPL. Você pode encontrar os direitos autorais para o código de terceiros abaixo.\n\n Time running: AboutView Tempo de funcionamento: Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (e seu kernel NewOS)\n Website, marketing & documentation:\n AboutView Website, marketing e documentação:\n diff --git a/data/catalogs/apps/aboutsystem/ro.catkeys b/data/catalogs/apps/aboutsystem/ro.catkeys index 15a66d4912..d4dbac2071 100644 --- a/data/catalogs/apps/aboutsystem/ro.catkeys +++ b/data/catalogs/apps/aboutsystem/ro.catkeys @@ -1,4 +1,4 @@ -1 romanian x-vnd.Haiku-About 128117018 +1 romanian x-vnd.Haiku-About 282658629 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB total %d MiB used (%d%%) AboutView %d MiB utilizați (%d%%) @@ -70,7 +70,6 @@ The BeGeistert team\n AboutView Echipa BeGeistert\n The Haiku-Ports team\n AboutView Echipa Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Echipa Haikuware și programul lor de recompense\n The University of Auckland and Christof Lutteroth\n\n AboutView Universitatea Auckland și Christof Lutteroth\n\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 %MIT licence%. 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 Codul sursă care este unic pentru Haiku, în special nucleul și întreg codul sursă utilizat de acesta, este distribuit utilizând termenii descriși de %MIT licence%. O parte din bibliotecile sistemului conțin cod sursă provenind de la terți distribuit sub licența LGPL. Puteți găsi mai jos mențiunile referitoare la drepturile de autor asupra codulului sursă provenit de la terți.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Drepturile de autor ale codului Haiku sunt proprietăți ale Haiku, Inc. sau ale autorilor respectivi când este notat în mod special în sursă. Haiku™ și sigla® Haiku sunt mărci (înregistrate) ale Haiku, Inc.\n\n Time running: AboutView Rulează de: Translations:\n AboutView Traduceri:\n diff --git a/data/catalogs/apps/aboutsystem/ru.catkeys b/data/catalogs/apps/aboutsystem/ru.catkeys index fa963bfbde..bf5fc23203 100644 --- a/data/catalogs/apps/aboutsystem/ru.catkeys +++ b/data/catalogs/apps/aboutsystem/ru.catkeys @@ -1,4 +1,4 @@ -1 russian x-vnd.Haiku-About 345253943 +1 russian x-vnd.Haiku-About 2392344107 %.2f GHz AboutView %.2f ГГц %d MiB total AboutView Всего %d Мбайт %d MiB used (%d%%) AboutView %d Мбайт использовано (%d%%) @@ -45,8 +45,6 @@ The BeGeistert team\n AboutView Команде BeGeistert\n The Haiku-Ports team\n AboutView Команде Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Команде Haikuware и их программе пожертвований\n The University of Auckland and Christof Lutteroth\n\n AboutView Университету Окленда и Christof Lutteroth\n\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 %MIT licence%. 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 Код, написанный специально для Haiku, особенно ядро и весь код, с которым могут быть связаны приложения, распространяется на условиях %MIT licence%. Некоторые системные библиотеки содержат сторонний код, распространяемый под лицензией LGPL. Вы можете найти авторские права на этот код ниже.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Права на код Haiku принадлежат Haiku, Inc. или конкретным авторам, указанным в исходном коде. Haiku™ и логотип HAIKU® являются (зарегистрированными) торговыми марками Haiku, Inc.\n\n Time running: AboutView Время работы: Translations:\n AboutView Переводчики:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (за его ядро NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/sk.catkeys b/data/catalogs/apps/aboutsystem/sk.catkeys index 085a27dcf8..58f3b94b1c 100644 --- a/data/catalogs/apps/aboutsystem/sk.catkeys +++ b/data/catalogs/apps/aboutsystem/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-About 128117018 +1 slovak x-vnd.Haiku-About 2175207182 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB celkom %d MiB used (%d%%) AboutView %d MiB využitých (%d%%) @@ -70,8 +70,6 @@ The BeGeistert team\n AboutView Tím BeGeistert\n The Haiku-Ports team\n AboutView Tím Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Tím Haikuware a ich program odmien\n The University of Auckland and Christof Lutteroth\n\n AboutView University of Auckland a Christof Lutteroth\n\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 %MIT licence%. 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 Kód, ktorý je charakteristický pre Haiku, najmä jadro a kód, ktorý využívajú aplikácie môže byť šírený za podmienok %MIT licence%. Niektoré systémové knižnice obsahujú kód tretích strán šírený pod licenciou LGPL. Autorské práva tretích strán nájdete uvedené nižšie. -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 (registered) trademarks of Haiku, Inc.\n\n AboutView Autorské práva ku kódu Haiku sú vlastníctvom Haiku, Inc. alebo jednotlivých autorov, kde sú v kóde výslovne uvedení. Haiku™ a logo HAIKU® sú (registrované) obchodné známky Haiku, Inc.\n\n Time running: AboutView Čas behu: Translations:\n AboutView Preklady:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (a jeho jadro NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/sv.catkeys b/data/catalogs/apps/aboutsystem/sv.catkeys index ce9b984181..36a30e2b34 100644 --- a/data/catalogs/apps/aboutsystem/sv.catkeys +++ b/data/catalogs/apps/aboutsystem/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-About 128117018 +1 swedish x-vnd.Haiku-About 1133193730 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB totalt %d MiB used (%d%%) AboutView %d MiB använt (%d%%) @@ -6,6 +6,7 @@ %ld Processors: AboutView %ld Processorer: %total MiB total, %inaccessible MiB inaccessible AboutView %total MiB totalt, %inaccessible MiB otillgängligt ... and the many people making donations!\n\n AboutView ...och alla de som har skänkt pengar!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView 2001 av Andy Ritger, baserat på generaliserad tidsformel About this system AboutWindow Om Haiku AboutSystem System name OmHaiku BSD (2-clause) AboutView BSD (2-klausul) @@ -70,8 +71,8 @@ The BeGeistert team\n AboutView BeGeistert-teamet\n The Haiku-Ports team\n AboutView Haiku Ports-teamet\n The Haikuware team and their bounty program\n AboutView Haikuware-teamet och deras belöningsprogram\n The University of Auckland and Christof Lutteroth\n\n AboutView The University of Auckland och Christof Lutteroth\n\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 %MIT licence%. 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 Koden som är unik för Haiku, speciellt kärnan och all kod som applikationer kan länka till, är distribuerad under villkoren av %MIT licence%. Vissa systembibliotek kan innehålla kod från tredjepart distribuerad under LGPL licensen. Här under kan du finna upphovsrätten till kod från tredjepart.\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Upphovsrätten till Haikus källkod är en egendom tillhörande Haiku, Inc eller dess respektive skapare där det uttryckligen är angivet i källkoden. Haiku™ och HAIKU logotyp® är (registrerade) varumärken tillhörande Haiku, Inc.\n\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 %MIT license%. 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 %MIT license% isn't a variable and has to be translated. Koden som är unik för Haiku, särskilt kärnan och all kod som program länkar mot, är distribuerad under villkoren hos %MIT licensen%. Några systembibliotek innehåller tredjepartskod distribuerat under villkoren för LGPL licensen. Du kan finna upphovsrättsvillkoren för tredjepartskod nedan.\n\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 registered trademarks of Haiku, Inc.\n\n AboutView Upphovsrätten till Haiku's källkod en egendom tillhörande Haiku, Inc. eller respektive upphovsman, där det uttryckligen är angivet i källkoden. Haiku® och Haiku's logo® är registrerade varumärken tillhörande Haiku, Inc.\n\n Time running: AboutView Tid sedan uppstart: Translations:\n AboutView Översättningar:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (och hans NewOS-kärna)\n diff --git a/data/catalogs/apps/aboutsystem/uk.catkeys b/data/catalogs/apps/aboutsystem/uk.catkeys index b69649ce16..7af0bb24c0 100644 --- a/data/catalogs/apps/aboutsystem/uk.catkeys +++ b/data/catalogs/apps/aboutsystem/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-About 2326505773 +1 ukrainian x-vnd.Haiku-About 1133193730 %.2f GHz AboutView %.2f GHz %d MiB total AboutView %d MiB заг. %d MiB used (%d%%) AboutView %d MiB викор. (%d%%) @@ -6,18 +6,65 @@ %ld Processors: AboutView %ld Процесори: %total MiB total, %inaccessible MiB inaccessible AboutView %total MiB заг., %inaccessible MiB недоступно ... and the many people making donations!\n\n AboutView ...і багатьом людям, що зробили внески!\n\n +2001 by Andy Ritger based on the Generalized Timing Formula AboutView 2001 by Andy Ritger based on the Generalized Timing Formula About this system AboutWindow Про цю систему +AboutSystem System name Про систему +BSD (2-clause) AboutView BSD (2-clause) +BSD (3-clause) AboutView BSD (3-clause) +BSD (4-clause) AboutView BSD (4-clause) Be Inc. and its developer team, for having created BeOS!\n\n AboutView Be Inc. і команді розробників, за створення BeOS!\n\n +Contains software developed by the NetBSD Foundation, Inc. and its contributors:\nftp, tput\nCopyright © 1996-2008 The NetBSD Foundation, Inc. All rights reserved. AboutView Містить програмне забезпечення NetBSD Foundation, Inc. і її контрибуторів:\nftp, tput\nCopyright © 1996-2008 NetBSD Foundation, Inc. Всі права застережені. +Contains software from the FreeBSD Project, released under the BSD license:\ncal, ftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 The FreeBSD Project. All rights reserved. AboutView Містить програмне забезпечення проекту FreeBSD , зреалізоване під ліцензією BSD:\ncal, ftpd, ping, telnet, telnetd, traceroute\nCopyright © 1994-2008 Проект FreeBSD . Всі права застережені. +Contains software from the GNU Project, released under the GPL and LGPL licenses:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation. AboutView Містить програмне забезпечення проекту GNU , реалізоване під ліцензіями GPL і LGPL licenses:\nGNU C Library, GNU coretools, diffutils, findutils, sharutils, gawk, bison, m4, make, gdb, wget, ncurses, termcap, Bourne Again Shell.\nCopyright © The Free Software Foundation. Contributors:\n AboutView Співробітники:\n +Copyright © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\nAll rights reserved. AboutView Copyright © 1987-1988 Digital Equipment Corporation, Maynard, Massachusetts.\nВсі права застережені. +Copyright © 1990-2002 Info-ZIP. All rights reserved. AboutView Copyright © 1990-2002 Info-ZIP. Всі права застережені. +Copyright © 1990-2003 Wada Laboratory, the University of Tokyo. AboutView Copyright © 1990-2003 Wada Laboratory, університет Токіо. +Copyright © 1991-2000 Silicon Graphics, Inc. SGI's Software FreeB license. All rights reserved. AboutView Copyright © 1991-2000 Silicon Graphics, Inc. Ліцензія SGI's Software FreeB. Всі права застережені. +Copyright © 1994-1997 Mark Kilgard. All rights reserved. AboutView Copyright © 1994-1997 Mark Kilgard. Всі права застережені. +Copyright © 1994-2008 Xiph.Org. All rights reserved. AboutView Copyright © 1994-2008 Xiph.Org. Всі права застережені. +Copyright © 1994-2009, Thomas G. Lane, Guido Vollbeding. This software is based in part on the work of the Independent JPEG Group. AboutView Copyright © 1994-2009, Thomas G. Lane, Guido Vollbeding. Це програмне забезпечення базується на роботах Independent JPEG Group. +Copyright © 1995, 1998-2001 Jef Poskanzer. All rights reserved. AboutView Copyright © 1995, 1998-2001 Jef Poskanzer. Всі права застережені. +Copyright © 1995-2001 Lars Düning. All rights reserved. AboutView Copyright © 1995-2001 Lars Düning. Всі права застережені. +Copyright © 1995-2004 Jean-loup Gailly and Mark Adler. AboutView Copyright © 1995-2004 Jean-loup Gailly і Mark Adler. +Copyright © 1996-1997 Jeff Prosise. All rights reserved. AboutView Copyright © 1996-1997 Jeff Prosise. Всі права застережені. +Copyright © 1996-2005 Julian R Seward. All rights reserved. AboutView Copyright © 1996-2005 Julian R Seward. Всі права застережені. +Copyright © 1997-2006 PDFlib GmbH and Thomas Merz. All rights reserved.\nPDFlib and PDFlib logo are registered trademarks of PDFlib GmbH. AboutView Copyright © 1997-2006 PDFlib GmbH і Thomas Merz. Всі права застережені.\nPDFlib і логотип PDFlib є зареєстрованими торговими марками PDFlib GmbH. +Copyright © 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper. AboutView Copyright © 1998-2000 Thai Open Source Software Center Ltd і Clark Cooper. +Copyright © 1998-2003 Daniel Veillard. All rights reserved. AboutView Copyright © 1998-2003 Daniel Veillard. Всі права застережені. + +Copyright © 1999-2000 Y.Takagi. All rights reserved. AboutView Copyright © 1999-2000 Y.Takagi. Всі права застережені. +Copyright © 1999-2006 Brian Paul. Mesa3D Project. All rights reserved. AboutView Copyright © 1999-2006 Brian Paul. Проект Mesa3D. Всі права застережені. +Copyright © 1999-2007 Michael C. Ring. All rights reserved. AboutView Copyright © 1999-2007 Michael C. Ring. Всі права застережені. +Copyright © 1999-2010 by the authors of Gutenprint. All rights reserved. AboutView Copyright © 1999-2010 авторів програми Gutenprint. Всі права застережені. +Copyright © 2000 Jean-Pierre ervbefeL and Remi Lefebvre. AboutView Copyright © 2000 Jean-Pierre ervbefeL і Remi Lefebvre. +Copyright © 2000-2007 Fabrice Bellard, et al. AboutView Copyright © 2000-2007 Fabrice Bellard, та інші. +Copyright © 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard. All rights reserved. AboutView Copyright © 2001-2002 Thomas Broyer, Charlie Bozeman і Daniel Veillard. Всі права застережені. +Copyright © 2001-2003 Expat maintainers. AboutView Copyright © 2001-2003 Розробники Expat. +Copyright © 2002-2003 Steve Lhomme. All rights reserved. AboutView Copyright © 2002-2003 Steve Lhomme. Всі права застережені. +Copyright © 2002-2004 Vivek Mohan. All rights reserved. AboutView Copyright © 2002-2004 Vivek Mohan. Всі права застережені. +Copyright © 2002-2005 Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. AboutView Copyright © 2002-2005 Industrial Light & Magic, і відділення Lucas Digital Ltd. LLC. +Copyright © 2002-2006 Maxim Shemanarev (McSeem). AboutView Copyright © 2002-2006 Maxim Shemanarev (McSeem). +Copyright © 2002-2008 Alexander L. Roshal. All rights reserved. AboutView Copyright © 2002-2008 Alexander L. Roshal. Всі права застережені. +Copyright © 2003 Peter Hanappe and others. AboutView Copyright © 2003 Peter Hanappe і інші. +Copyright © 2003-2006 Intel Corporation. All rights reserved. AboutView Copyright © 2003-2006 Intel Corporation. Всі права застережені. +Copyright © 2004-2005 Intel Corporation. All rights reserved. AboutView Copyright © 2004-2005 Intel Corporation. Всі права застережені. +Copyright © 2006-2007 Intel Corporation. All rights reserved. AboutView Copyright © 2006-2007 Intel Corporation. Всі права застережені. +Copyright © 2007 Ralink Technology Corporation. All rights reserved. AboutView Copyright © 2007 Ralink Technology Corporation. Всі права застережені. +Copyright © 2007-2009 Marvell Semiconductor, Inc. All rights reserved. AboutView Copyright © 2007-2009 Marvell Semiconductor, Inc. Всі права застережені. +Copyright © 2010-2011 Google Inc. All rights reserved. AboutView Copyright © 2010-2011 Google Inc. Всі права застережені. Current maintainers:\n AboutView Розробники:\n GCC %d Hybrid AboutView GCC %d гібрид Google & their Google Summer of Code program\n AboutView Google і їхній програмі Google Summer of Code\n Kernel: AboutView Ядро: License: AboutView Ліцензія: Licenses: AboutView Ліцензії: +MIT (no promotion) AboutView MIT (без підтримки) +MIT license. All rights reserved. AboutView Ліцензія MIT. Всі права застережені. Memory: AboutView Пам’ять: Michael Phipps (project founder)\n\n AboutView Michael Phipps (засновнику проекту)\n\n Past maintainers:\n AboutView Попередні розробники:\n +Portions of this software are copyright. Copyright © 1996-2006 The FreeType Project. All rights reserved. AboutView Це програмне забезпечення захищене авторськими правами. Copyright © 1996-2006 Проект FreeType . Всі права застережені. Processor: AboutView Процесор: Revision AboutView Ревізія Source Code: AboutView Код: @@ -25,7 +72,8 @@ The BeGeistert team\n AboutView Команді BeGeistert\n The Haiku-Ports team\n AboutView Команді Haiku-Ports\n The Haikuware team and their bounty program\n AboutView Команді Haikuware з їхньою програмою заохочень\n The University of Auckland and Christof Lutteroth\n\n AboutView Університету Окленда і Крістофу Люттероту\n\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 %MIT licence%. 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 Код що є унікальним для Haiku, особливо ядро і весь код, що додатки можуть використовувати, поширюються за умовами %MIT licence%. Деякі системні бібліотеки містять другорядні частини коду під ліцензією LGPL. Ви можете знайти авторські права цих частин нижче.\n\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 %MIT license%. 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 %MIT license% isn't a variable and has to be translated. Код є унікальним для Haiku, особливо ядро і коди всіх додатків, котрі згадуються, поширюються за умовами ліцензії MIT. Деякі системні бібліотеки містять вторинні частини коду, що поширюються під умовами ліцензії LGPL. Авторські права дивись нижче.\n\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 registered trademarks of Haiku, Inc.\n\n AboutView Авторські права коду Haiku є власністю Haiku, Inc. або сторонніх авторів про що згадується в коді. Haiku® і лого HAIKU ® є зареєстрованою торговою маркою Haiku, Inc.\n\n Time running: AboutView Час роботи: Translations:\n AboutView Переклади:\n Travis Geiselbrecht (and his NewOS kernel)\n AboutView Travis Geiselbrecht (і ядро його NewOS)\n diff --git a/data/catalogs/apps/aboutsystem/zh_hans.catkeys b/data/catalogs/apps/aboutsystem/zh_hans.catkeys index b4ca6cfea3..5bcccd9172 100644 --- a/data/catalogs/apps/aboutsystem/zh_hans.catkeys +++ b/data/catalogs/apps/aboutsystem/zh_hans.catkeys @@ -1,4 +1,4 @@ -1 simplified_chinese x-vnd.Haiku-About 3511832710 +1 simplified_chinese x-vnd.Haiku-About 3666374321 %.2f GHz AboutView %.2f GHz %d MiB total AboutView 总计%d MiB %d MiB used (%d%%) AboutView 已用 %d MiB (%d%%) @@ -69,7 +69,6 @@ The BeGeistert team\n AboutView BeGeistert 小组 \n The Haiku-Ports team\n AboutView Haiku-Ports 小组\n The Haikuware team and their bounty program\n AboutView Haikuware 小组及其维护程序\n The University of Auckland and Christof Lutteroth\n\n AboutView 奥克兰大学与 Christof Lutteroth\n\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 %MIT licence%. 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 专用于 Haiku 的代码在 %MIT协议% 下发布，特别是内核与所有应用程序可能链接使用的代码。某些系统库可能包含在 LGPL协议 下发布的第三方代码。在下面的介绍中，您可以找到第三方代码所使用的授权协议。\n\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 (registered) trademarks of Haiku, Inc.\n\n AboutView Haiku 源代码版权是 Haiku, Inc 和源码中声明的贡献者所拥有的财产。Haiku™ 和 HAIKU logo® 是 Haiku, Inc 的（注册）商标。\n\n Time running: AboutView 运行时间： Translations:\n AboutView 翻译：\n diff --git a/data/catalogs/apps/activitymonitor/uk.catkeys b/data/catalogs/apps/activitymonitor/uk.catkeys index 912c4054b7..ecc2e68813 100644 --- a/data/catalogs/apps/activitymonitor/uk.catkeys +++ b/data/catalogs/apps/activitymonitor/uk.catkeys @@ -1,9 +1,10 @@ -1 ukrainian x-vnd.Haiku-ActivityMonitor 3373427116 +1 ukrainian x-vnd.Haiku-ActivityMonitor 3704566709 %.1f KB/s DataSource %.1f KB/іек %.1f MB DataSource %.1f MB %.1f faults/s DataSource %.1f помилок/сек %lld ms SettingsWindow %lld мілісек. %lld sec. SettingsWindow %lld сек. +ActivityMonitor System name Монітор активності Add graph ActivityWindow Додати графік Additional items ActivityView Додаткові елементи Apps DataSource Додатки @@ -26,6 +27,7 @@ Page faults DataSource Помилки на сторінці Ports DataSource Порти Quit ActivityWindow Вийти RX DataSource Shorter version for Receiving. RX +Raw clipboard DataSource Буфер обміну Receiving DataSource Отримання Remove graph ActivityView Видалити графік Running applications DataSource Запущені додатки @@ -39,6 +41,7 @@ Swap DataSource Підкачка Swap space DataSource Розмір підкачки TX DataSource Shorter version for Sending TX Teams DataSource Команди +Text clipboard DataSource Буфер обміну тексту Threads DataSource Потоки Update time interval: SettingsWindow Інтервал часу поновлення: Used memory DataSource Використана пам'ять diff --git a/data/catalogs/apps/bootmanager/uk.catkeys b/data/catalogs/apps/bootmanager/uk.catkeys index 11acd43d41..c453be01c1 100644 --- a/data/catalogs/apps/bootmanager/uk.catkeys +++ b/data/catalogs/apps/bootmanager/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-BootManager 2981479428 +1 ukrainian x-vnd.Haiku-BootManager 3014946856 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 Про відновлення MBR %disk з %file. Ви дійсно бажаєте продовжити? About to write the boot menu to disk. Are you sure you want to continue? BootManagerController Про запис бутменю на диск. Ви дійсно бажаєте продовжити? About to write the following boot menu to the boot disk (%s). Please verify the information below before continuing. BootManagerController Про запис бутменю до загрузочного диску (%s). Перевірте інформацію перед продовженням. @@ -13,10 +13,11 @@ At least one partition must be selected! BootManagerController Принаймн Back BootManagerController Button Назад Backup Master Boot Record BootManagerController Title Відновлення основного загрузочного запису Boot Manager is unable to read the partition table! BootManagerController Завантажувач не зміг прочитати таблицю розділів! +BootManager System name Завантажувач Cannot access! DrivesPage Cannot install В доступі заборонено! Default Partition DefaultPartitionPage Title Розділ по замовчуванню Default Partition: DefaultPartitionPage Menu field label Розділ по замовчуванню: -Done BootManagerController Button Зроблено +Done BootManagerController Button Готово Drives DrivesPage Title Пристрої Error reading partition table BootManagerController Title Помилка при читанні таблиці розділів File: FileSelectionPage Text control label Файл: @@ -34,6 +35,8 @@ Old Master Boot Record saved BootManagerController Title Збереження с Partition table not compatible BootManagerController Title Таблиця розділів несумісна Partitions DefaultPartitionPage Pop up menu title Розділи Partitions PartitionsPage 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. BootManagerController Будь-ласка виберіть файл з якого відновлюватиметься MBR. Це файл, що було створено при першому встановленні завантажувача. +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. Цей файл було створено при першому встановленні завантажувача. Please select the drive you want the boot manager to be installed to or uninstalled from. DrivesPage Виберіть пристрій на який треба встановити або з якого треба видалити завантажувач. 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' для невілювання затримки під час завантаження. Previous WizardView Button Попереднє @@ -41,7 +44,11 @@ Quit DrivesPage Button Вийти Restore MBR BootManagerController Button Відновлення MBR Select FileSelectionPage Button Вибрати Summary BootManagerController Title Підсумок +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\nзараз буде збережено на диск. Виберіть файл для збереження MBR.\n\nКоли під час встановлення щось піде не так або Ви бажатимете видалити бутменю просто запустіть програму завантажувача і виберіть опцію 'Uninstall'. The Master Boot Record could not be restored! BootManagerController Основний загрузочний запис неможливо відновити! +The Master Boot Record of the boot device (%DISK) has been successfully restored from %FILE. BootManagerController Основний загрузочний запис пристрою (%DISK) був успішно відновлений з %FILE. +The boot manager has been successfully installed on your system. BootManagerController Завантажувач успішно встановлений на Вашу систему. +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 old Master Boot Record could not be saved to %s BootManagerController Старий MBR не було збережено до %s The old Master Boot Record was successfully saved to %s. BootManagerController Старий MBR успішно збережено в %s. 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 вільного простору до першого розділу. @@ -53,5 +60,6 @@ Uninstall boot manager BootManagerController Title Видалити завант Uninstallation of boot menu completed BootManagerController Title Видалення бутменю завершене Uninstallation of boot menu failed BootManagerController Title Видалення бутменю призупинено Unknown LegacyBootMenu Text is shown for an unknown partition type Невідомий +Unnamed %d LegacyBootMenu Default name of a partition whose name could not be read from disk; characters in codepage 437 are allowed only Неназваний %d Update DrivesPage Button Обновити Write boot menu BootManagerController Button Записати бутменю diff --git a/data/catalogs/apps/cdplayer/uk.catkeys b/data/catalogs/apps/cdplayer/uk.catkeys index a15666e781..8efcb5269f 100644 --- a/data/catalogs/apps/cdplayer/uk.catkeys +++ b/data/catalogs/apps/cdplayer/uk.catkeys @@ -1,6 +1,8 @@ -1 ukrainian x-vnd.Haiku-CDPlayer 2145467092 +1 ukrainian x-vnd.Haiku-CDPlayer 592310631 Audio CD CDPlayer Аудіо CD +CD CDPlayer CD CD drive is empty CDPlayer CD пристрій пустий +CDPlayer System name Програвач CD Disc: %ld:%.2ld / %ld:%.2ld CDPlayer Диск: %ld:%.2ld / %ld:%.2ld Disc: --:-- / --:-- CDPlayer Диск: --:-- / --:-- Disc: 88:88 / 88:88 CDPlayer Диск: 88:88 / 88:88 diff --git a/data/catalogs/apps/charactermap/be.catkeys b/data/catalogs/apps/charactermap/be.catkeys index ad491c66e7..0e5832b409 100644 --- a/data/catalogs/apps/charactermap/be.catkeys +++ b/data/catalogs/apps/charactermap/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-CharacterMap 2137207616 +1 belarusian x-vnd.Haiku-CharacterMap 4082916013 Aegean numbers UnicodeBlocks Эгейскія лічбы Alphabetic presentation forms UnicodeBlocks Формы алфавітнага прадстаўлення Ancient Greek musical notation UnicodeBlocks Старажытнагрэчаскія музыкальныя сімвалы @@ -33,7 +33,7 @@ CJK unified ideographs extension A UnicodeBlocks Іерогліфы CJK дап CJK unified ideographs extension B UnicodeBlocks Іерогліфы CJK дапаўненне B Carian UnicodeBlocks Карыянскі Cham UnicodeBlocks Чам -CharacterMap System name Таблица сімвалаў +CharacterMap System name Табліца сімвалаў Cherokee UnicodeBlocks Чырокі Clear CharacterWindow Ачысціць Code CharacterWindow Код @@ -43,6 +43,8 @@ Combining diacritical marks supplement UnicodeBlocks Камбінаванне Combining half marks UnicodeBlocks Камбінаванне паўметак Control pictures UnicodeBlocks Выявы ўпраўлення Coptic UnicodeBlocks Коптскі +Copy as escaped byte string CharacterView Капіяваць кадаваным радком +Copy character CharacterView Капіяваць сімвал Counting rod numerals UnicodeBlocks Лічбы злічальных палачак Cuneiform UnicodeBlocks Клінапіс Cuneiform numbers and punctuation UnicodeBlocks Клінапісныя лічбы і пунктуацыя diff --git a/data/catalogs/apps/charactermap/de.catkeys b/data/catalogs/apps/charactermap/de.catkeys index 8e8d474c82..072b916e33 100644 --- a/data/catalogs/apps/charactermap/de.catkeys +++ b/data/catalogs/apps/charactermap/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-CharacterMap 2137207616 +1 german x-vnd.Haiku-CharacterMap 4082916013 Aegean numbers UnicodeBlocks Ägäische Zahlen Alphabetic presentation forms UnicodeBlocks Alphabetische Präsentationsformen Ancient Greek musical notation UnicodeBlocks Antike griechische musikalische Notation @@ -43,6 +43,8 @@ Combining diacritical marks supplement UnicodeBlocks Kombinierende diakritische Combining half marks UnicodeBlocks Kombinierende halbe diakritische Zeichen Control pictures UnicodeBlocks Steuerzeichensymbole Coptic UnicodeBlocks Koptisch +Copy as escaped byte string CharacterView Zeichen als Byte-Code kopieren +Copy character CharacterView Zeichen kopieren Counting rod numerals UnicodeBlocks Rechenstab-Numerale Cuneiform UnicodeBlocks Keilschrift Cuneiform numbers and punctuation UnicodeBlocks Keilförmige Nummern und Zeichensetzung diff --git a/data/catalogs/apps/charactermap/fi.catkeys b/data/catalogs/apps/charactermap/fi.catkeys index 9bb0af944a..3af4dcba36 100644 --- a/data/catalogs/apps/charactermap/fi.catkeys +++ b/data/catalogs/apps/charactermap/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-CharacterMap 2137207616 +1 finnish x-vnd.Haiku-CharacterMap 4082916013 Aegean numbers UnicodeBlocks Aegean-numerot Alphabetic presentation forms UnicodeBlocks Aakkosellinen esitysmuoto Ancient Greek musical notation UnicodeBlocks Antiikin kreikan nuottikirjoitus @@ -43,6 +43,8 @@ Combining diacritical marks supplement UnicodeBlocks Yhdistettyjen diakriittist Combining half marks UnicodeBlocks Yhdistetyt puolimerkit Control pictures UnicodeBlocks Ohjainkuvat Coptic UnicodeBlocks Kopti +Copy as escaped byte string CharacterView Kopioi koodinvaihtotavumerkkijonona +Copy character CharacterView Kopioi merkki Counting rod numerals UnicodeBlocks Laskentatankonumerraalit Cuneiform UnicodeBlocks Nuolenpääkirjoitus Cuneiform numbers and punctuation UnicodeBlocks Nuolenpääkirjoituksen numerot ja välimerkit diff --git a/data/catalogs/apps/charactermap/fr.catkeys b/data/catalogs/apps/charactermap/fr.catkeys index 7e06881c96..74ac34c095 100644 --- a/data/catalogs/apps/charactermap/fr.catkeys +++ b/data/catalogs/apps/charactermap/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-CharacterMap 1169041226 +1 french x-vnd.Haiku-CharacterMap 1451954922 Aegean numbers UnicodeBlocks Nombres égéens Alphabetic presentation forms UnicodeBlocks Formes de présentation alphabétiques Ancient Greek musical notation UnicodeBlocks Musique grecque ancienne @@ -22,20 +22,23 @@ Buhid UnicodeBlocks Bouhid Byzantine musical symbols UnicodeBlocks Symboles musicaux byzantins CJK compatibility UnicodeBlocks Compatibilité CJC CJK compatibility forms UnicodeBlocks Formes compatibles CJC -CJK compatibility ideographs UnicodeBlocks Idéogrammes CJC de compatibilité -CJK compatibility ideographs Supplement UnicodeBlocks Supplément idéogrammes CJC de compatibilité +CJK compatibility ideographs UnicodeBlocks Idéogrammes de compatibilité CJC +CJK compatibility ideographs Supplement UnicodeBlocks Supplément d'idéogrammes de compatibilité CJC CJK radicals supplement UnicodeBlocks Formes supplémentaires de clés CJC CJK strokes UnicodeBlocks Traits CJC CJK symbols and punctuation UnicodeBlocks Ponctuation CJC CJK unified ideographs UnicodeBlocks Idéogrammes unifiés CJC -CJK unified ideographs extension A UnicodeBlocks Supplément A idéogrammes unifiés CJC -CJK unified ideographs extension B UnicodeBlocks Supplément B idéogrammes unifiés CJC +CJK unified ideographs extension A UnicodeBlocks Supplément A aux idéogrammes unifiés CJC +CJK unified ideographs extension B UnicodeBlocks Supplément B aux idéogrammes unifiés CJC Carian UnicodeBlocks Carien Cham UnicodeBlocks Cham CharacterMap System name Table des caractères Cherokee UnicodeBlocks Chérokî Clear CharacterWindow Nettoyer Code CharacterWindow Code +Combining diacritical marks UnicodeBlocks Marques diacritiques d'association +Combining diacritical marks for symbols UnicodeBlocks Marques diacritiques d'association pour les symboles +Combining diacritical marks supplement UnicodeBlocks Supplément aux marques diacritiques d'association Combining half marks UnicodeBlocks Demi-signes combinatoires Control pictures UnicodeBlocks Pictogrammes de commande Coptic UnicodeBlocks Copte @@ -71,6 +74,7 @@ Greek and Coptic UnicodeBlocks Grec et Copte Greek extended UnicodeBlocks Grec étendu Gujarati UnicodeBlocks Goudjarati Gurmukhi UnicodeBlocks Gourmoukhî +Halfwidth and fullwidth forms UnicodeBlocks Formulaires demi-largeur et largeur complète Hangul Jamo UnicodeBlocks Jamos Hangûl Hangul compatibility Jamo UnicodeBlocks Jamos de compatibilité hangûl Hangul syllables UnicodeBlocks Syllabes hangûl @@ -111,7 +115,7 @@ Miscellaneous mathematical symbols B UnicodeBlocks Divers symboles mathématiqu Miscellaneous symbols UnicodeBlocks Symboles divers Miscellaneous symbols and arrows UnicodeBlocks Divers symboles et flèches Miscellaneous technical UnicodeBlocks Signes techniques divers -Modifier tone letters UnicodeBlocks Supplément de modificateurs de ton +Modifier tone letters UnicodeBlocks Lettres modificatives de ton Mongolian UnicodeBlocks Mongol Muscial symbols UnicodeBlocks Symboles musciaux Myanmar UnicodeBlocks Myanmar (Birman) @@ -121,6 +125,7 @@ Number forms UnicodeBlocks Formes numérales Ogham UnicodeBlocks Oġam Ol Chiki UnicodeBlocks Santâlî Old Persian UnicodeBlocks Perse ancien +Old italic UnicodeBlocks Italique ancien Optical character recognition UnicodeBlocks Reconnaissance optique de caractères Oriya UnicodeBlocks Oriyâ Osmanya UnicodeBlocks Osmanya @@ -138,6 +143,7 @@ Shavian UnicodeBlocks Shavien Show private blocks CharacterWindow Montrer les zones privées Sinhala UnicodeBlocks Singhalais Small form variants UnicodeBlocks Petites variantes de forme +Spacing modifier letters UnicodeBlocks Lettres modificatives d'espace Specials UnicodeBlocks Caractères spéciaux Sundanese UnicodeBlocks Soudanais Superscripts and subscripts UnicodeBlocks Exposants et indices diff --git a/data/catalogs/apps/charactermap/ja.catkeys b/data/catalogs/apps/charactermap/ja.catkeys index 9b94bc80df..c100c39e8c 100644 --- a/data/catalogs/apps/charactermap/ja.catkeys +++ b/data/catalogs/apps/charactermap/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-CharacterMap 2137207616 +1 japanese x-vnd.Haiku-CharacterMap 4082916013 Aegean numbers UnicodeBlocks エーゲ数字 Alphabetic presentation forms UnicodeBlocks アルファベット表示形 Ancient Greek musical notation UnicodeBlocks 古代ギリシャ記譜法 @@ -43,6 +43,8 @@ Combining diacritical marks supplement UnicodeBlocks 結合分音記号補助 Combining half marks UnicodeBlocks 半記号(合成可能) Control pictures UnicodeBlocks 制御機能用記号 Coptic UnicodeBlocks コプト文字 +Copy as escaped byte string CharacterView エスケープされた数値としてコピー +Copy character CharacterView 文字をコピー Counting rod numerals UnicodeBlocks 算木 Cuneiform UnicodeBlocks 楔形文字 Cuneiform numbers and punctuation UnicodeBlocks 楔形文字数字と句読点 diff --git a/data/catalogs/apps/charactermap/sk.catkeys b/data/catalogs/apps/charactermap/sk.catkeys index 4f7c3dbcc8..835ce542b4 100644 --- a/data/catalogs/apps/charactermap/sk.catkeys +++ b/data/catalogs/apps/charactermap/sk.catkeys @@ -1,28 +1,178 @@ -1 slovak x-vnd.Haiku-CharacterMap 2467880345 +1 slovak x-vnd.Haiku-CharacterMap 1331216786 +Aegean numbers UnicodeBlocks Egejské čísla +Alphabetic presentation forms UnicodeBlocks Varianty abecedných znakov +Ancient Greek musical notation UnicodeBlocks Starogrécky hudobný zápis +Ancient Greek numbers UnicodeBlocks Starogrécke čísla +Ancient smbols UnicodeBlocks Staroveké symboly +Arabic UnicodeBlocks Arabčina +Arabic presentation forms A UnicodeBlocks Varianty arabských znakov A +Arabic presentation forms B UnicodeBlocks Varianty arabských znakov B +Arabic supplement UnicodeBlocks Arabčina, dodatok +Armenian UnicodeBlocks Arménčina +Arrows UnicodeBlocks Šípky +Balinese UnicodeBlocks Balinézske +Basic Latin UnicodeBlocks Latinka - základné znaky +Bengali UnicodeBlocks Bengálčina Block elements UnicodeBlocks Blokové prvky +Bopomofo UnicodeBlocks Bopomofo +Bopomofo extended UnicodeBlocks Bopomofo - ďalšie znaky +Box drawing UnicodeBlocks Kreslenie rámčekov +Braille patterns UnicodeBlocks Braillove vzory +Buginese UnicodeBlocks Buginézština +Buhid UnicodeBlocks Buhidčina +Byzantine musical symbols UnicodeBlocks Byzantské hudobné symboly +CJK compatibility UnicodeBlocks ČJK - kompatibilné formáty +CJK compatibility forms UnicodeBlocks ČJK - kompatibilné varianty +CJK compatibility ideographs UnicodeBlocks ČJK - kompatibilné idiogramy +CJK compatibility ideographs Supplement UnicodeBlocks ČJK - kompatibilné idiogramy, doplnok +CJK radicals supplement UnicodeBlocks ČJK – radikály, dodatok +CJK strokes UnicodeBlocks Ťahy ČJK +CJK symbols and punctuation UnicodeBlocks ČJK symboly a intepunkcia +CJK unified ideographs UnicodeBlocks Zjednotené ideogramy pre ČJK +CJK unified ideographs extension A UnicodeBlocks Zjednotené ideogramy pre ČJK, rozšírenie A +CJK unified ideographs extension B UnicodeBlocks Zjednotené ideogramy pre ČJK, rozšírenie B +Carian UnicodeBlocks Carian +Cham UnicodeBlocks Cham CharacterMap System name Mapa znakov +Cherokee UnicodeBlocks Cherokee Clear CharacterWindow Vyčistiť Code CharacterWindow Kód Combining diacritical marks UnicodeBlocks Kombinujúce diakritické značky Combining diacritical marks for symbols UnicodeBlocks Kombinujúce diakritické značky pre symboly Combining diacritical marks supplement UnicodeBlocks Kombinujúce diakritické značky - doplnok Combining half marks UnicodeBlocks Kombinujúce poloznačky +Control pictures UnicodeBlocks Riadiace obrázky +Coptic UnicodeBlocks Koptčina +Counting rod numerals UnicodeBlocks Tyčové číslovky +Cuneiform UnicodeBlocks Klinové písmo +Cuneiform numbers and punctuation UnicodeBlocks Klinové písmo - čísla a diakritika Currency symbols UnicodeBlocks Symboly mien +Cypriot syllabary UnicodeBlocks Cyperské slabičné písmo +Cyrillic UnicodeBlocks Cyrilika +Cyrillic extended A UnicodeBlocks Cyrillika, rozšírená A +Cyrillic extended B UnicodeBlocks Cyrillika, rozšírená A +Cyrillic supplement UnicodeBlocks Cyrilika, dodatok +Deseret UnicodeBlocks Deseret +Devanagari UnicodeBlocks Dévanágarí +Dingbats UnicodeBlocks Symboly a znaky dingbats Domino tiles UnicodeBlocks Kocky domino +Enclosed CJK letters and months UnicodeBlocks Uzavreté ČJK znaky a mesiace +Enclosed alphanumerics UnicodeBlocks Uzavreté alfanumerické znaky +Ethiopic UnicodeBlocks Etiópčina +Ethiopic extended UnicodeBlocks Etiópčina – ďalšie znaky +Ethiopic supplement UnicodeBlocks Etiópčina, dodatok File CharacterWindow Súbor Filter: CharacterWindow Filter: Font CharacterWindow Písmo -General punctuation UnicodeBlocks Všeobecná diakritika +Font size: CharacterWindow Veľksť písma: +General punctuation UnicodeBlocks Všeobecná intepunkcia Geometric shapes UnicodeBlocks Geometrické tvary +Georgian UnicodeBlocks Gruzínčina +Georgian supplement UnicodeBlocks Gruzínčina, dodatok +Gothic UnicodeBlocks Gotické +Greek and Coptic UnicodeBlocks Gréčtina a koptčina Off +Greek extended UnicodeBlocks Gréčtina - ďalšie znaky +Gujarati UnicodeBlocks Gudžarátčina +Gurmukhi UnicodeBlocks Gurumukhí +Halfwidth and fullwidth forms UnicodeBlocks Znaky s polovičnou a plnou šírkou +Hangul Jamo UnicodeBlocks Znaky jamo abecedy hangul +Hangul compatibility Jamo UnicodeBlocks Kompatibilné znaky jamo abecedy hangul +Hangul syllables UnicodeBlocks Hangul - slabiky +Hanunoo UnicodeBlocks Hanunóo +Hebrew UnicodeBlocks Hebrejčina +Hiragana UnicodeBlocks Hiragana +IPA extensions UnicodeBlocks Znaky fonetickej abecedy IPA +Ideographic description characters UnicodeBlocks Ideografické popisné znaky +Kanbun UnicodeBlocks Kanbun +Kangxi radicals UnicodeBlocks Kandži – radikály +Kannada UnicodeBlocks Kannadčina +Katakana UnicodeBlocks Katakana +Katakana phonetic extensions UnicodeBlocks Katakana - fonetické rozšírenia +Kayah Li UnicodeBlocks Kayah Li +Kharoshthi UnicodeBlocks Kharoshthi +Khmer UnicodeBlocks Khmérčina +Khmer symbols UnicodeBlocks Khmérske symboly +Lao UnicodeBlocks Laoština +Latin extended A UnicodeBlocks Rozšírená latinka A +Latin extended B UnicodeBlocks Rozšírená latinka B +Latin extended C UnicodeBlocks Rozšírená latinka C +Latin extended D UnicodeBlocks Rozšírená latinka D +Latin extended additional UnicodeBlocks Rozšírená latinka, dodatok +Latin-1 supplement UnicodeBlocks Latinka-1, dodatok +Lepcha UnicodeBlocks Lepcha Letterlike symbols UnicodeBlocks Symboly podpobné písmenám +Limbu UnicodeBlocks Limbu +Linear B ideograms UnicodeBlocks Lineárne písmo B - ideogramy +Linear B syllabary UnicodeBlocks Lineárne písmo B - slabičné písmo +Lycian UnicodeBlocks Lycian +Lydian UnicodeBlocks Lydian +Mahjong tiles UnicodeBlocks Dlaždice Mahjong +Malayalam UnicodeBlocks Malajálamčina +Mathematical alphanumeric symbols UnicodeBlocks Matematické alfanumerické symboly Mathematical operators UnicodeBlocks Matematické operátory +Miscellaneous mathematical symbols A UnicodeBlocks Rozličné matematické symboly A +Miscellaneous mathematical symbols B UnicodeBlocks Rozličné matematické symboly B Miscellaneous symbols UnicodeBlocks Rozličné symboly +Miscellaneous symbols and arrows UnicodeBlocks Rôzne symboly a šípky Miscellaneous technical UnicodeBlocks Rozličné technické +Modifier tone letters UnicodeBlocks Písmená modifikátorov tónu +Mongolian UnicodeBlocks Mongolské +Muscial symbols UnicodeBlocks Hudobné symboly +Myanmar UnicodeBlocks Mjanmarčina +N'Ko UnicodeBlocks N'Ko +New Tai Lue UnicodeBlocks New Tai Lue Number forms UnicodeBlocks Číselné tvary +Ogham UnicodeBlocks Ogam +Ol Chiki UnicodeBlocks Ol Chiki +Old Persian UnicodeBlocks Staroperzské +Old italic UnicodeBlocks Starotalianske Optical character recognition UnicodeBlocks Optické rozpoznávanie znakov +Oriya UnicodeBlocks Uríjčina +Osmanya UnicodeBlocks Osmanya +Phags-pa UnicodeBlocks Phags-pa +Phaistos disc UnicodeBlocks Disk z Faistu +Phoenician UnicodeBlocks Fenické +Phonetic extensions UnicodeBlocks Fonetické rozšírenia +Phonetic extensions supplement UnicodeBlocks Fonetické rozšírenia, doplnok Private use area UnicodeBlocks Oblasť na súkromné použitie +Quit CharacterWindow Ukončiť +Rejang UnicodeBlocks Rejang +Runic UnicodeBlocks Runy +Saurashtra UnicodeBlocks Saurashtra +Shavian UnicodeBlocks Shavianské Show private blocks CharacterWindow Zobrziť privátne bloky +Sinhala UnicodeBlocks Sinhalčina +Small form variants UnicodeBlocks Malé varianty znakov +Spacing modifier letters UnicodeBlocks Písmená na úpravu medzier +Specials UnicodeBlocks Špeciálne znaky +Sundanese UnicodeBlocks Sundčina Superscripts and subscripts UnicodeBlocks Horné a dolné indexy +Supplement punctuation UnicodeBlocks Doplnková intepunkcia +Supplemental arrows A UnicodeBlocks Šípky, doplnok A +Supplemental arrows B UnicodeBlocks Šípky, doplnok B +Supplemental mathematical operators UnicodeBlocks Doplnkové matematické operátory +Supplementary private use area A UnicodeBlocks Doplnková oblasť A pre súkromné použitie +Supplementary private use area B UnicodeBlocks Doplnková oblasť A pre súkromné použitie +Syloti Nagri UnicodeBlocks Syloti Nagri +Syriac UnicodeBlocks Sýrčina +Tagalog UnicodeBlocks Tagalčina +Tagbanwa UnicodeBlocks Tagbanwa Tags UnicodeBlocks Značky +Tai Le UnicodeBlocks Tai Le +Tai Xuan Jing symbols UnicodeBlocks Symboly Tai Xuan Jing +Tamil UnicodeBlocks Tamilčina +Telugu UnicodeBlocks Telugčina +Thaana UnicodeBlocks Thaana +Thai UnicodeBlocks Thajčina +Tibetan UnicodeBlocks Tibetčina +Tifinagh UnicodeBlocks Tifinagh +Ugaritic UnicodeBlocks Ugaritské +Unified Canadian Aboriginal syllabics UnicodeBlocks Zjednotené slabikotvorné hlásky kanadských pôvodných obyvateľov +Vai UnicodeBlocks Vai +Variation selectors UnicodeBlocks Selektory variácií +Variation selectors supplement UnicodeBlocks Selektory variácií, dodatok Vertical forms UnicodeBlocks Zvislé tvary View CharacterWindow Zobraziť +Yi Radicals UnicodeBlocks Yi - radikály +Yi syllables UnicodeBlocks Yi - slabiky +Yijing hexagram symbols UnicodeBlocks Yijing – šesťcípe symboly diff --git a/data/catalogs/apps/charactermap/sv.catkeys b/data/catalogs/apps/charactermap/sv.catkeys index ce751ccd69..744048c2e8 100644 --- a/data/catalogs/apps/charactermap/sv.catkeys +++ b/data/catalogs/apps/charactermap/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-CharacterMap 2137207616 +1 swedish x-vnd.Haiku-CharacterMap 2426642683 Aegean numbers UnicodeBlocks Egeiska siffror Alphabetic presentation forms UnicodeBlocks Alfabetiska presentationsformer Ancient Greek musical notation UnicodeBlocks Gammelgrekiska noter @@ -43,6 +43,7 @@ Combining diacritical marks supplement UnicodeBlocks Kombinerade diakritiska te Combining half marks UnicodeBlocks Kombinerade halvmarkörer Control pictures UnicodeBlocks Kontrollbilder Coptic UnicodeBlocks Koptisk +Copy character CharacterView Kopiera tecken Counting rod numerals UnicodeBlocks Räknestavssiffror Cuneiform UnicodeBlocks Kilskrift Cuneiform numbers and punctuation UnicodeBlocks Kilskrift (siffror och interpunktioner) diff --git a/data/catalogs/apps/charactermap/uk.catkeys b/data/catalogs/apps/charactermap/uk.catkeys index 9eb2d66ce2..84ab1c4025 100644 --- a/data/catalogs/apps/charactermap/uk.catkeys +++ b/data/catalogs/apps/charactermap/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-CharacterMap 2687645748 +1 ukrainian x-vnd.Haiku-CharacterMap 4082916013 Aegean numbers UnicodeBlocks Егейські номери Alphabetic presentation forms UnicodeBlocks Алфавітні форми презентацій Ancient Greek musical notation UnicodeBlocks Давньогрецький нотний запис @@ -7,6 +7,7 @@ Ancient smbols UnicodeBlocks Давні символи Arabic UnicodeBlocks Арабська Arabic presentation forms A UnicodeBlocks Арабські форми презентацій А Arabic presentation forms B UnicodeBlocks Арабська форма B +Arabic supplement UnicodeBlocks Доповнення до арабської Armenian UnicodeBlocks Вірменська Arrows UnicodeBlocks Стрілки Balinese UnicodeBlocks Балійська @@ -22,6 +23,9 @@ Buhid UnicodeBlocks Бухід Byzantine musical symbols UnicodeBlocks Візантійські музичні символи CJK compatibility UnicodeBlocks CJK сумісність CJK compatibility forms UnicodeBlocks Форми CJK сумісності +CJK compatibility ideographs UnicodeBlocks Сумісні ієрогліфи CJK +CJK compatibility ideographs Supplement UnicodeBlocks Доповнення CJK-суміснісних ієрогліфів +CJK radicals supplement UnicodeBlocks Доповнення CJK радикалів CJK strokes UnicodeBlocks CJK наголоси CJK symbols and punctuation UnicodeBlocks CJK символи і знаки пунктуації CJK unified ideographs UnicodeBlocks CJK єдині ієрогліфи @@ -29,6 +33,7 @@ CJK unified ideographs extension A UnicodeBlocks CJK єдине розшире CJK unified ideographs extension B UnicodeBlocks CJK єдиного розширення ієрогліфів B Carian UnicodeBlocks Каріан Cham UnicodeBlocks Чам +CharacterMap System name CharacterMap Cherokee UnicodeBlocks Черокі Clear CharacterWindow Очистити Code CharacterWindow Код @@ -38,10 +43,13 @@ Combining diacritical marks supplement UnicodeBlocks Об'єднуючі доп Combining half marks UnicodeBlocks Об'єднуючі половини знаків Control pictures UnicodeBlocks Управління фотографіями Coptic UnicodeBlocks Коптська +Copy as escaped byte string CharacterView Копіювати як пусту стрічку +Copy character CharacterView Копіювати символ Counting rod numerals UnicodeBlocks Підрахунок стрижня цифр Cuneiform UnicodeBlocks Клинопис Cuneiform numbers and punctuation UnicodeBlocks Клинописні цифри і знаки пунктуації Currency symbols UnicodeBlocks Символи валют +Cypriot syllabary UnicodeBlocks Складові кіпрської Cyrillic UnicodeBlocks Кирилиця Cyrillic extended A UnicodeBlocks Кирилиця розширена А Cyrillic extended B UnicodeBlocks Розширення кирилиці B @@ -62,7 +70,7 @@ Font size: CharacterWindow Розмір шрифту: General punctuation UnicodeBlocks Знаки пунктуації Geometric shapes UnicodeBlocks Геометричні форми Georgian UnicodeBlocks Грузинська -Georgian supplement UnicodeBlocks Грузинська додаток +Georgian supplement UnicodeBlocks Грузинська варіант Glagotic UnicodeBlocks Глаготік Gothic UnicodeBlocks Готична Greek and Coptic UnicodeBlocks Грецька і коптська @@ -79,6 +87,7 @@ Hiragana UnicodeBlocks Хірагана IPA extensions UnicodeBlocks Розширення IPA Ideographic description characters UnicodeBlocks Символи ідеографічного опису Kanbun UnicodeBlocks Канбун +Kangxi radicals UnicodeBlocks Радикали Кангксі Kannada UnicodeBlocks Каннада Katakana UnicodeBlocks Катакана Katakana phonetic extensions UnicodeBlocks Фонетичні розширення катакани @@ -91,7 +100,8 @@ Latin extended A UnicodeBlocks Розширена латиниця Latin extended B UnicodeBlocks Розширена латиниця B Latin extended C UnicodeBlocks Розширена латиниця C Latin extended D UnicodeBlocks Розширена латиниця D -Latin-1 supplement UnicodeBlocks Латинська-1 додаток +Latin extended additional UnicodeBlocks Розширена додаткова латиниця +Latin-1 supplement UnicodeBlocks Латинська-1 варіант Lepcha UnicodeBlocks Лепха Letterlike symbols UnicodeBlocks Буквоподібні символи Limbu UnicodeBlocks Лімбу @@ -114,7 +124,7 @@ Muscial symbols UnicodeBlocks Muscial символи Myanmar UnicodeBlocks М'янми N'Ko UnicodeBlocks Нко New Tai Lue UnicodeBlocks Нові Тай Лю -Number forms UnicodeBlocks Кількість форм +Number forms UnicodeBlocks Форми цифр Ogham UnicodeBlocks Огам Ol Chiki UnicodeBlocks Ол Чікі Old Persian UnicodeBlocks Староперська @@ -160,9 +170,12 @@ Thai UnicodeBlocks Тайська Tibetan UnicodeBlocks Тибетська Tifinagh UnicodeBlocks Тіфінаг Ugaritic UnicodeBlocks Угаритська +Unified Canadian Aboriginal syllabics UnicodeBlocks Єдина складова канадських аборигенів Vai UnicodeBlocks Ваі Variation selectors UnicodeBlocks Селектори зміни +Variation selectors supplement UnicodeBlocks Доповнення змінних селекторів Vertical forms UnicodeBlocks Вертикальні форми View CharacterWindow Вигляд Yi Radicals UnicodeBlocks Ї Радикали +Yi syllables UnicodeBlocks Склади Yi Yijing hexagram symbols UnicodeBlocks Гексаграмні символи Yijing diff --git a/data/catalogs/apps/clock/uk.catkeys b/data/catalogs/apps/clock/uk.catkeys new file mode 100644 index 0000000000..9e2fb9c5ac --- /dev/null +++ b/data/catalogs/apps/clock/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.Haiku-Clock 1361795373 +Clock System name Годинник diff --git a/data/catalogs/apps/codycam/sv.catkeys b/data/catalogs/apps/codycam/sv.catkeys index 0cb05ef207..b3c4382ec9 100644 --- a/data/catalogs/apps/codycam/sv.catkeys +++ b/data/catalogs/apps/codycam/sv.catkeys @@ -17,7 +17,7 @@ Capture Rate Menu CodyCam Bildfrekvensmeny Capture controls CodyCam Inhämtningsinställningar Capturing Image… VideoConsumer.cpp Fångar bild… Closing the window\n VideoConsumer.cpp Stänger fönstret\n -CodyCam Application name CodyKamera +CodyCam System name CodyKamera Connected… VideoConsumer.cpp Ansluen... Couldn't find requested directory on server VideoConsumer.cpp Kunde inte hitta den begärda katalogen på servern Directory: CodyCam Katalog: diff --git a/data/catalogs/apps/codycam/uk.catkeys b/data/catalogs/apps/codycam/uk.catkeys index 243358eff4..8a8bce142a 100644 --- a/data/catalogs/apps/codycam/uk.catkeys +++ b/data/catalogs/apps/codycam/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku.CodyCam 719498491 +1 ukrainian x-vnd.Haiku.CodyCam 441085909 Can't find an available connection to the video window CodyCam Неможливо знайти доступне вікно відео Cannot connect the video source to the video window CodyCam Неможливо підключити відео джерело до відео вікна Cannot create a video window CodyCam Неможливо створити вікно відео @@ -8,6 +8,7 @@ Cannot find the media roster CodyCam Неможливо знайти медіа Cannot get a time source CodyCam Неможливо отримати тривалість Cannot register the video window CodyCam Неможливо зареєструвати вікно відео Cannot seek time source! CodyCam Неможливо звернутися до лічильника часу! +Cannot set the time source for the video source CodyCam Неможливо встановити лічильник для джерела відео Cannot set the time source for the video window CodyCam Неможливо встановити лічильник для відео вікна Cannot start the video source CodyCam Неможливо запустити джерело відео Cannot start the video window CodyCam Неможливо запустити вікно відео @@ -16,6 +17,7 @@ Capture Rate Menu CodyCam Меню періодичності захоплен Capture controls CodyCam Керування захопленням Capturing Image… VideoConsumer.cpp Захоплення зображення… Closing the window\n VideoConsumer.cpp Закриття вікна\n +CodyCam System name CodyCam Connected… VideoConsumer.cpp Підключення… Couldn't find requested directory on server VideoConsumer.cpp Неможливо знайти очікуваний каталог на сервері Directory: CodyCam Каталог: @@ -45,6 +47,7 @@ File transmission failed VideoConsumer.cpp Передача файлу приз Format: CodyCam Формат: Image Format Menu CodyCam Меню формата зображення JPEG image CodyCam Зображення JPEG +Last Capture: VideoConsumer.cpp Останнє захоплення: Local CodyCam Локальний Locking the window\n VideoConsumer.cpp Закриття вікна\n Logging in… VideoConsumer.cpp Авторизація… @@ -71,6 +74,7 @@ Type: CodyCam Тип: Video settings CodyCam Налаштування відео Waiting… CodyCam Очікування… capture rate expected CodyCam вкажіть періодичність захоплення +cmd: '%s'\n FtpClient команда: '%s'\n destination directory expected CodyCam вкажіть папку призначення image file format expected CodyCam вкажіть формат зображення invalid upload client %ld\n VideoConsumer.cpp неналежний клієнт вивантаження %ld\n diff --git a/data/catalogs/apps/deskbar/be.catkeys b/data/catalogs/apps/deskbar/be.catkeys index ccf99ea9a9..b1f13ddbb0 100644 --- a/data/catalogs/apps/deskbar/be.catkeys +++ b/data/catalogs/apps/deskbar/be.catkeys @@ -1,9 +1,10 @@ -1 belarusian x-vnd.Be-TSKB 1962084612 +1 belarusian x-vnd.Be-TSKB 4265681964 BeMenu -About Haiku BeMenu Пра Haiku +About this system BeMenu Пра гэтую Сістэму Always on top PreferencesWindow Заўсёды наверсе Applications B_USER_DESKBAR_DIRECTORY/Applications Праграмы Applications PreferencesWindow Праграмы +Auto-hide PreferencesWindow Схаваць аўтаматычна Auto-raise PreferencesWindow Узнікаць аўтаматычна Change time… TimeView Змяніць час... Clock PreferencesWindow Гадзіннік diff --git a/data/catalogs/apps/deskbar/cs.catkeys b/data/catalogs/apps/deskbar/cs.catkeys index a4d352653c..00bbba0174 100644 --- a/data/catalogs/apps/deskbar/cs.catkeys +++ b/data/catalogs/apps/deskbar/cs.catkeys @@ -1,6 +1,5 @@ -1 czech x-vnd.Be-TSKB 2722191795 +1 czech x-vnd.Be-TSKB 3232664655 BeMenu -About Haiku BeMenu O Haiku Always on top PreferencesWindow Vždy na vrchu Applications PreferencesWindow Aplikace Auto-raise PreferencesWindow Automatické zvětšení diff --git a/data/catalogs/apps/deskbar/de.catkeys b/data/catalogs/apps/deskbar/de.catkeys index b2739ae365..53890eb021 100644 --- a/data/catalogs/apps/deskbar/de.catkeys +++ b/data/catalogs/apps/deskbar/de.catkeys @@ -1,10 +1,10 @@ -1 german x-vnd.Be-TSKB 1465644101 +1 german x-vnd.Be-TSKB 4265681964 BeMenu -About Haiku BeMenu Über Haiku +About this system BeMenu Über dieses System Always on top PreferencesWindow Immer im Vordergrund Applications B_USER_DESKBAR_DIRECTORY/Applications Anwendungen Applications PreferencesWindow Anwendungen -Auto-hide PreferencesWindow Automatisch in den Hintergrund +Auto-hide PreferencesWindow Automatisch ausblenden Auto-raise PreferencesWindow Automatisch nach vorn holen Change time… TimeView Uhrzeit ändern… Clock PreferencesWindow Uhr diff --git a/data/catalogs/apps/deskbar/fi.catkeys b/data/catalogs/apps/deskbar/fi.catkeys index 562b31810d..cb5ed134c1 100644 --- a/data/catalogs/apps/deskbar/fi.catkeys +++ b/data/catalogs/apps/deskbar/fi.catkeys @@ -1,6 +1,6 @@ -1 finnish x-vnd.Be-TSKB 1465644101 +1 finnish x-vnd.Be-TSKB 4265681964 BeMenu -About Haiku BeMenu Haikusta +About this system BeMenu Tästä järjestelmästä Always on top PreferencesWindow Aina päällimmäisenä Applications B_USER_DESKBAR_DIRECTORY/Applications Sovellukset Applications PreferencesWindow Sovellukset diff --git a/data/catalogs/apps/deskbar/fr.catkeys b/data/catalogs/apps/deskbar/fr.catkeys index b1727deab2..4867d932e6 100644 --- a/data/catalogs/apps/deskbar/fr.catkeys +++ b/data/catalogs/apps/deskbar/fr.catkeys @@ -1,6 +1,5 @@ -1 french x-vnd.Be-TSKB 1962084612 +1 french x-vnd.Be-TSKB 2472557472 BeMenu -About Haiku BeMenu À propos d'Haiku Always on top PreferencesWindow Toujours au dessus Applications B_USER_DESKBAR_DIRECTORY/Applications Applications Applications PreferencesWindow Applications diff --git a/data/catalogs/apps/deskbar/ja.catkeys b/data/catalogs/apps/deskbar/ja.catkeys index e6f8bff90f..eb5db436ad 100644 --- a/data/catalogs/apps/deskbar/ja.catkeys +++ b/data/catalogs/apps/deskbar/ja.catkeys @@ -1,9 +1,10 @@ -1 japanese x-vnd.Be-TSKB 1962084612 +1 japanese x-vnd.Be-TSKB 4265681964 BeMenu -About Haiku BeMenu Haiku について +About this system BeMenu このシステムについて Always on top PreferencesWindow 常に手前に Applications B_USER_DESKBAR_DIRECTORY/Applications アプリケーション Applications PreferencesWindow アプリケーション +Auto-hide PreferencesWindow 自動的に隠す Auto-raise PreferencesWindow マウスオーバーで手前に Change time… TimeView 日付と時刻の設定… Clock PreferencesWindow 日付と時刻 diff --git a/data/catalogs/apps/deskbar/nb.catkeys b/data/catalogs/apps/deskbar/nb.catkeys index 8678354ca9..bf06de07fb 100644 --- a/data/catalogs/apps/deskbar/nb.catkeys +++ b/data/catalogs/apps/deskbar/nb.catkeys @@ -1,6 +1,5 @@ -1 norwegian_bokmål x-vnd.Be-TSKB 1962084612 +1 norwegian_bokmål x-vnd.Be-TSKB 2472557472 BeMenu -About Haiku BeMenu Om Haiku Always on top PreferencesWindow Alltid øverst Applications B_USER_DESKBAR_DIRECTORY/Applications B_USER_DESKBAR_DIRECTORY/Programmer Applications PreferencesWindow Programmer diff --git a/data/catalogs/apps/deskbar/ru.catkeys b/data/catalogs/apps/deskbar/ru.catkeys index 9b38905b16..f11293a481 100644 --- a/data/catalogs/apps/deskbar/ru.catkeys +++ b/data/catalogs/apps/deskbar/ru.catkeys @@ -1,6 +1,6 @@ -1 russian x-vnd.Be-TSKB 1465644101 +1 russian x-vnd.Be-TSKB 4265681964 BeMenu <Папка Be пуста> -About Haiku BeMenu О системе Haiku +About this system BeMenu Об этой системе Always on top PreferencesWindow Всегда сверху Applications B_USER_DESKBAR_DIRECTORY/Applications Приложения Applications PreferencesWindow Приложения diff --git a/data/catalogs/apps/deskbar/sk.catkeys b/data/catalogs/apps/deskbar/sk.catkeys index 6bf1a93426..39f9aa12ee 100644 --- a/data/catalogs/apps/deskbar/sk.catkeys +++ b/data/catalogs/apps/deskbar/sk.catkeys @@ -1,9 +1,10 @@ -1 slovak x-vnd.Be-TSKB 1962084612 +1 slovak x-vnd.Be-TSKB 4265681964 BeMenu -About Haiku BeMenu O Haiku +About this system BeMenu O tomto systéme Always on top PreferencesWindow Vždy na vrchu Applications B_USER_DESKBAR_DIRECTORY/Applications Aplikácie Applications PreferencesWindow Aplikácie +Auto-hide PreferencesWindow Automaticky skrývať Auto-raise PreferencesWindow Automaticky aktivovať Change time… TimeView Zmeniť čas... Clock PreferencesWindow Hodiny diff --git a/data/catalogs/apps/deskbar/sv.catkeys b/data/catalogs/apps/deskbar/sv.catkeys index 10df993961..e771c77780 100644 --- a/data/catalogs/apps/deskbar/sv.catkeys +++ b/data/catalogs/apps/deskbar/sv.catkeys @@ -5,14 +5,14 @@ Always on top PreferencesWindow Alltid överst Applications B_USER_DESKBAR_DIRECTORY/Applications Program Applications PreferencesWindow Program Auto-hide PreferencesWindow Dölj automatiskt -Auto-raise PreferencesWindow Höj fönstret vid närkontakt +Auto-raise PreferencesWindow Höj vid närkontakt Change time… TimeView Ställ in tid... Clock PreferencesWindow Klocka Close all WindowMenu Stäng alla Demos B_USER_DESKBAR_DIRECTORY/Demos Exempelprogram Deskbar System name Deskbar Deskbar preferences PreferencesWindow Deskbar inställningar -Deskbar preferences… BeMenu Deskbar inställningar... +Deskbar preferences… BeMenu Inställningar... Desktop applets B_USER_DESKBAR_DIRECTORY/Desktop applets Skrivbordsprogram Edit menu… PreferencesWindow Redigera meny... Expand new applications PreferencesWindow Expandera nya program diff --git a/data/catalogs/apps/deskbar/uk.catkeys b/data/catalogs/apps/deskbar/uk.catkeys index 51c1cb28fa..b1e221ca0d 100644 --- a/data/catalogs/apps/deskbar/uk.catkeys +++ b/data/catalogs/apps/deskbar/uk.catkeys @@ -1,12 +1,19 @@ -1 ukrainian x-vnd.Be-TSKB 900486640 +1 ukrainian x-vnd.Be-TSKB 4265681964 BeMenu <Папка Ве пуста> +About this system BeMenu Про систему Always on top PreferencesWindow Завжди зверху +Applications B_USER_DESKBAR_DIRECTORY/Applications Додатки Applications PreferencesWindow Додатки +Auto-hide PreferencesWindow Автозникнення Auto-raise PreferencesWindow Автоспливання Change time… TimeView Змінити час… Clock PreferencesWindow Годинник Close all WindowMenu Закрити все +Demos B_USER_DESKBAR_DIRECTORY/Demos Демо +Deskbar System name Deskbar +Deskbar preferences PreferencesWindow Налаштування Deskbar Deskbar preferences… BeMenu Налаштування Deskbar… +Desktop applets B_USER_DESKBAR_DIRECTORY/Desktop applets Аплети екрану Edit menu… PreferencesWindow Редагувати меню… Expand new applications PreferencesWindow Розпакувати нові додатки Find… BeMenu Знайти… @@ -16,6 +23,7 @@ Menu PreferencesWindow Меню Mount BeMenu Змонтувати No windows WindowMenu Немає вікон Power off BeMenu Вимкнути +Preferences B_USER_DESKBAR_DIRECTORY/Preferences Настройки Quit application WindowMenu Вийти з додатку Recent applications BeMenu Недавні додатки Recent applications: PreferencesWindow Недавні додатки: diff --git a/data/catalogs/apps/deskbar/zh_hans.catkeys b/data/catalogs/apps/deskbar/zh_hans.catkeys index f044ef3020..8c602af38b 100644 --- a/data/catalogs/apps/deskbar/zh_hans.catkeys +++ b/data/catalogs/apps/deskbar/zh_hans.catkeys @@ -1,6 +1,5 @@ -1 simplified_chinese x-vnd.Be-TSKB 1962084612 +1 simplified_chinese x-vnd.Be-TSKB 2472557472 BeMenu -About Haiku BeMenu 关于 Haiku Always on top PreferencesWindow 置顶 Applications B_USER_DESKBAR_DIRECTORY/Applications 应用程序 Applications PreferencesWindow 应用程序 diff --git a/data/catalogs/apps/deskcalc/uk.catkeys b/data/catalogs/apps/deskcalc/uk.catkeys index 8de9ab55e6..4290a6f682 100644 --- a/data/catalogs/apps/deskcalc/uk.catkeys +++ b/data/catalogs/apps/deskcalc/uk.catkeys @@ -1,4 +1,5 @@ -1 ukrainian x-vnd.Haiku-DeskCalc 1432606073 +1 ukrainian x-vnd.Haiku-DeskCalc 2547506672 Audio Feedback CalcView Озвучка віддачі +DeskCalc System name Калькулятор Enable Num Lock on startup CalcView Включати Num Lock при запуску Show keypad CalcView Показати клавіатуру diff --git a/data/catalogs/apps/devices/fi.catkeys b/data/catalogs/apps/devices/fi.catkeys index 312f453512..51271e606b 100644 --- a/data/catalogs/apps/devices/fi.catkeys +++ b/data/catalogs/apps/devices/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-Devices 1943893993 +1 finnish x-vnd.Haiku-Devices 865240481 ACPI Information DeviceACPI ACPI-tiedot ACPI Processor Namespace '%2' DeviceACPI ACPI-prosessorinimiavaruus ’%2’ ACPI System Bus DeviceACPI ACPI-järjestelmäväylä @@ -8,35 +8,47 @@ ACPI bus Device ACPI-väylä ACPI bus DevicesView ACPI-väylä ACPI controller Device ACPI-ohjain ACPI node '%1' DeviceACPI ACPI-solmu ’%1’ +Array DeviceSCSI Matriisi Basic information DevicesView Perustiedot Bridge Device Silta +Bridge DeviceSCSI Silta Bus DevicesView Väylä Bus Information Device Väylätiedot +CD-ROM DeviceSCSI CD-ROM +Card Reader DeviceSCSI Korttilukija Category DevicesView Luokka +Changer DeviceSCSI Vaihtaja Class Info:\t\t\t\t: %classInfo% DeviceACPI Luokkatiedot:\t\t\t\t: %classInfo% +Class Info:\t\t\t\t: %classInfo% DeviceSCSI Luokkatiedot:\t\t\t\t: %classInfo% Class info DevicePCI Luokkatiedot Communication controller Device Viestintäohjain +Communications DeviceSCSI Viestinnät Computer Device Tietokone Computer DevicesView Tietokone Connection DevicesView Yhteys Detailed DevicesView Yksityiskohdat Device Device Laite Device Name\t\t\t\t: %Name%\nManufacturer\t\t\t: %Manufacturer%\nDriver used\t\t\t\t: %DriverUsed%\nDevice paths\t: %DevicePaths% Device Laitenimi\t\t\t\t: %Name%\nValmistaja\t\t\t: %Manufacturer%\nKäytetty ajuri\t\t\t\t: %DriverUsed%\nLaitepolut\t: %DevicePaths% +Device class DeviceSCSI Laiteluokka Device name Device Laitenimi Device name DeviceACPI Laitenimi Device name DevicePCI Laitenimi +Device name DeviceSCSI Laitenimi Device name: Device Laitenimi: Device paths Device Laitepolut Device paths DevicePCI Laitepolut Devices DevicesView Laitteet Devices System name Laitteet +Disk Drive DeviceSCSI Levyasema Display controller Device Näyttöohjain Docking station Device Telakka-asema Driver used Device Käytetty laite Driver used DevicePCI Käytetty ajuri +Enclosure DeviceSCSI Kotelo Encryption controller Device Salausohjain Generate system information DevicesView Tuota järjestelmätiedot Generic system peripheral Device Yleinen järjestelmän oheislaite +Graphics Peripheral DeviceSCSI Grafiikkaoheislaite ISA bus Device ISA-väylä ISA bus DevicesView ISA-väylä Input device controller Device Syötelaiteohjain @@ -44,6 +56,7 @@ Intelligent controller Device Älyohjain Manufacturer Device Valmistaja Manufacturer DeviceACPI Valmistaja Manufacturer DevicePCI Valmistaja +Manufacturer DeviceSCSI Valmistaja Manufacturer: Device Valmistaja: Mass storage controller Device Massamuistilaiteohjain Memory controller Device Muistiohjain @@ -53,21 +66,30 @@ Network controller Device Verkko-ohjain None Device Ei mitään Not implemented DeviceACPI Ei ole toteutettu Not implemented DevicePCI Ei ole toteutettu +Optical Drive DeviceSCSI Optinen laite Order by: DevicesView Järjestys: +Other DeviceSCSI Muu PCI Information DevicePCI PCI-tiedot PCI bus Device PCI-väylä PCI bus DevicesView PCI-väylä +Printer DeviceSCSI Tulostin Processor Device Suoritin +Processor DeviceSCSI Suoritin Quit DevicesView Poistu +RBC DeviceSCSI RBC Refresh devices DevicesView Virkistä laitteita Report compatibility DevicesView Ilmoita yhteensopivuudesta +SCSI Information DeviceSCSI SCSI-tiedot Satellite communications controller Device Satelliittiviestintäohjain +Scanner DeviceSCSI Skanneri Serial bus controller Device Sarjaväyläohjain Signal processing controller Device Signaalikäsittelyohjain +Tape Drive DeviceSCSI Nauha-asema Unclassified device Device Luokittelematon laite Unknown DevicePCI Tuntematon Unknown device Device Tuntematon laite Unknown device DevicesView Tuntematon laite Value PropertyList Arvo Wireless controller Device Langaton ohjain +Worm DeviceSCSI Kertakirjoitteinen unknown Device tuntematon diff --git a/data/catalogs/apps/devices/sv.catkeys b/data/catalogs/apps/devices/sv.catkeys index d58c29766d..a0640245f9 100644 --- a/data/catalogs/apps/devices/sv.catkeys +++ b/data/catalogs/apps/devices/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-Devices 1943893993 +1 swedish x-vnd.Haiku-Devices 865240481 ACPI Information DeviceACPI ACPI-information ACPI Processor Namespace '%2' DeviceACPI ACPI Processor-namnrymd '%2' ACPI System Bus DeviceACPI ACPI systembuss @@ -8,35 +8,47 @@ ACPI bus Device ACPI-buss ACPI bus DevicesView ACPI-buss ACPI controller Device ACPI-kontroller ACPI node '%1' DeviceACPI ACPI nod '%1' +Array DeviceSCSI Matris Basic information DevicesView Grundläggande information Bridge Device Brygga +Bridge DeviceSCSI Brygga Bus DevicesView Buss Bus Information Device Bussinformation +CD-ROM DeviceSCSI CD-ROM +Card Reader DeviceSCSI Kortläsare Category DevicesView Kategori +Changer DeviceSCSI Växlare Class Info:\t\t\t\t: %classInfo% DeviceACPI Klassinformation:\t\t\t\t: %classInfo% +Class Info:\t\t\t\t: %classInfo% DeviceSCSI Klassinformation:\t\t\t\t: %classInfo% Class info DevicePCI Klassinformation Communication controller Device Kommunikationskontroller +Communications DeviceSCSI Kommunikations Computer Device Dator Computer DevicesView Dator Connection DevicesView Anslutning Detailed DevicesView Detaljerat Device Device Enhet Device Name\t\t\t\t: %Name%\nManufacturer\t\t\t: %Manufacturer%\nDriver used\t\t\t\t: %DriverUsed%\nDevice paths\t: %DevicePaths% Device Enhetsnamn\t\t\t\t: %Name%\nTillverkare\t\t\t: %Manufacturer%\nDrivrutin\t\t\t\t: %DriverUsed%\nEnhetssökväg\t: %DevicePaths% +Device class DeviceSCSI Enhetsklass Device name Device Enhetsnamn Device name DeviceACPI Enhetsnamn Device name DevicePCI Enhetsnamn +Device name DeviceSCSI Enhetsnamn Device name: Device Enhetsnamn: Device paths Device Enhetssökväg Device paths DevicePCI Enhetssökväg Devices DevicesView Enheter Devices System name Enheter +Disk Drive DeviceSCSI Diskenhet Display controller Device Skärmkontroller Docking station Device Dockningsstation Driver used Device Drivrutin använd Driver used DevicePCI Använd drivrutin +Enclosure DeviceSCSI Hölje Encryption controller Device Krypteringskontroller Generate system information DevicesView Generera systeminformation Generic system peripheral Device Allmänt systemtillbehör +Graphics Peripheral DeviceSCSI Grafisk kringutrustning ISA bus Device ISA-buss ISA bus DevicesView ISA-buss Input device controller Device Indataenhetskontroller @@ -44,6 +56,7 @@ Intelligent controller Device Intelligent kontroller Manufacturer Device Tillverkare Manufacturer DeviceACPI Tillverkare Manufacturer DevicePCI Tillverkare +Manufacturer DeviceSCSI Tillverkare Manufacturer: Device Tillverkare: Mass storage controller Device Lagringskontroller Memory controller Device Minneskontroller @@ -53,21 +66,30 @@ Network controller Device Nätverkskontroller None Device Ingen Not implemented DeviceACPI Inte implementerat Not implemented DevicePCI Inte implementerat +Optical Drive DeviceSCSI Optisk enhet Order by: DevicesView Sortera efter: +Other DeviceSCSI Annan PCI Information DevicePCI PCI-information PCI bus Device PCI-buss PCI bus DevicesView PCI-buss +Printer DeviceSCSI Skrivare Processor Device Processor +Processor DeviceSCSI Processor Quit DevicesView Avsluta +RBC DeviceSCSI RBC Refresh devices DevicesView Uppdatera enhetsvy Report compatibility DevicesView Rapportera kompatibilitet +SCSI Information DeviceSCSI SCSI information Satellite communications controller Device Satelitkommunikationskontroller +Scanner DeviceSCSI Skanner Serial bus controller Device Seriell kontroller Signal processing controller Device Signalbehandlingskontroller +Tape Drive DeviceSCSI Bandstation Unclassified device Device Oklassificerad enhet Unknown DevicePCI Okänt Unknown device Device Okänd enhet Unknown device DevicesView Okänd enhet Value PropertyList Värde Wireless controller Device Trådlös kontroller +Worm DeviceSCSI Mask unknown Device okänd diff --git a/data/catalogs/apps/devices/uk.catkeys b/data/catalogs/apps/devices/uk.catkeys index fc5d378359..04290a07d2 100644 --- a/data/catalogs/apps/devices/uk.catkeys +++ b/data/catalogs/apps/devices/uk.catkeys @@ -1,36 +1,73 @@ -1 ukrainian x-vnd.Haiku-Devices 197304729 +1 ukrainian x-vnd.Haiku-Devices 1943893993 +ACPI Information DeviceACPI Інформація про ACPI +ACPI Processor Namespace '%2' DeviceACPI Місце імені процесора ACPI '%2' +ACPI System Bus DeviceACPI Шина системи ACPI +ACPI System Indicator DeviceACPI Індикатор системи ACPI +ACPI Thermal Zone DeviceACPI Теплова зона ACPI +ACPI bus Device Шина ACPI +ACPI bus DevicesView ШинаACPI ACPI controller Device ACPI контролер +ACPI node '%1' DeviceACPI Вузол ACPI '%1' Basic information DevicesView Основна інформація Bridge Device Міст Bus DevicesView Шина +Bus Information Device Інфо про шину Category DevicesView Категорії +Class Info:\t\t\t\t: %classInfo% DeviceACPI Інфо про клас:\t\t\t\t: %classInfo% +Class info DevicePCI Інфо про клас Communication controller Device Контролер зв’язку Computer Device Комп’ютер +Computer DevicesView Компютер Connection DevicesView Підключенню Detailed DevicesView Докладно +Device Device Пристрій +Device Name\t\t\t\t: %Name%\nManufacturer\t\t\t: %Manufacturer%\nDriver used\t\t\t\t: %DriverUsed%\nDevice paths\t: %DevicePaths% Device Ім'я пристрою\t\t\t\t: %Name%\nВиробник\t\t\t: %Manufacturer%\nВикор. драйвер \t\t\t\t: %DriverUsed%\nШляхи пристрою\t: %DevicePaths% Device name Device Назва пристрою +Device name DeviceACPI Ім'я пристрою +Device name DevicePCI Ім'я пристрою Device name: Device Назва пристрою: Device paths Device Шляхи пристрою +Device paths DevicePCI Шляхи пристрою Devices DevicesView Пристрої +Devices System name Пристрої Display controller Device Контролер дисплея Docking station Device Док-станція Driver used Device Використовує драйвер +Driver used DevicePCI Використовує драйвер +Encryption controller Device Контроллер шифрування Generate system information DevicesView Створення системної інформації Generic system peripheral Device Периферійні пристрої +ISA bus Device ISA bus +ISA bus DevicesView Шина ISA Input device controller Device Контролер ввідних пристроїв Intelligent controller Device Інтелектуальний контролер Manufacturer Device Виробник +Manufacturer DeviceACPI Виробник +Manufacturer DevicePCI Виробник Manufacturer: Device Виробник: Mass storage controller Device Контролер накопичувачів Memory controller Device Контролер пам’яті Multimedia controller Device Мультимедійний контролер +Name PropertyList Імя Network controller Device Мережевий контролер +None Device Жоден +Not implemented DeviceACPI Не підтримується +Not implemented DevicePCI Не підтримується Order by: DevicesView Сортувати по: +PCI Information DevicePCI Інформація про PCI +PCI bus Device ШинаPCI +PCI bus DevicesView Шина PCI Processor Device Процесор Quit DevicesView Вийти Refresh devices DevicesView Оновлення пристроїв Report compatibility DevicesView Повідомити про сумісність Satellite communications controller Device Контроллер супутникового зв’язку Serial bus controller Device Контроллер послідовної шини +Signal processing controller Device Контроллер обробки сигналів Unclassified device Device Некласифіковані пристрої +Unknown DevicePCI Невідомий +Unknown device Device Невідомий пристрій +Unknown device DevicesView Невідомий пристрій +Value PropertyList Значення Wireless controller Device Бездротовий контролер +unknown Device невідомий diff --git a/data/catalogs/apps/diskprobe/uk.catkeys b/data/catalogs/apps/diskprobe/uk.catkeys index 77dd3f2491..cbc2c18929 100644 --- a/data/catalogs/apps/diskprobe/uk.catkeys +++ b/data/catalogs/apps/diskprobe/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-DiskProbe 2710260630 +1 ukrainian x-vnd.Haiku-DiskProbe 3441574721 %ld (native) ProbeView %ld (рідна) (native) ProbeView (рідний) 15 bit TypeEditors 15 біт @@ -20,11 +20,17 @@ Add ProbeView Додати Attribute AttributeWindow Атрибут Attribute ProbeView Атрибут +Attribute offset: ProbeView Зміщення атрибуту: +Attribute type: ProbeView Тип атрибуту: +Attribute: ProbeView Атрибут: Attributes ProbeView Атрибути Back ProbeView Назад +Base ProbeView A menu item, the number that is basis for a system of calculation. The base 10 system is a decimal system. This is in the same menu window than 'Font size' and 'BlockSize' Основа Block ProbeView Блок Block %Ld (0x%Lx) ProbeView Блок %Ld (0x%Lx) Block 0x%Lx ProbeView Блок 0x%Lx +Block: ProbeView Блок: +BlockSize ProbeView A menu item, a shortened form from 'block size'. This is in the same menu windowthan 'Base' and 'Font size' Розмір блоку Bookmarks ProbeView Закладки Boolean TypeEditors This is the type of editor Булевий Boolean editor TypeEditors Булевий редактор @@ -44,7 +50,11 @@ Could not open file \"%s\": %s\n DiskProbe Неможливо відкрити Could not read image TypeEditors Image means here a picture file, not a disk image. Неможливо прочитати образ Decimal ProbeView A menu item, as short as possible, noun is recommended if it is shorter than adjective. Десятковий Device ProbeView Пристрій +Device offset: ProbeView Зміщення пристрою: +Device: ProbeView Пристрій: +DiskProbe System name DiskProbe DiskProbe request AttributeWindow Запит DiskProbe +DiskProbe request DiskProbe Запит DiskProbe DiskProbe request ProbeView Запит DiskProbe Do you really want to remove the attribute \"%s\" from the file \"%s\"?\n\nYou cannot undo this action. AttributeWindow Ви дійсно бажаєте видалити атрибут \"%s\" для файлу \"%s\"?\n\nЦя дія незворотня. Don't save ProbeView Не зберігати @@ -53,6 +63,8 @@ Edit ProbeView Редагувати Examine device: OpenWindow Перевірка пристрою: File FileWindow Файл File ProbeView Файл +File offset: ProbeView Зміщення файлу: +File: ProbeView Файл: Find FindWindow Знайти Find again ProbeView Знайти знову Find… ProbeView Знайти… @@ -61,7 +73,7 @@ Flattened bitmap TypeEditors Плаский образ Floating-point value: TypeEditors Значення з плаваючою комою: Font size ProbeView Розмір шрифту Grayscale TypeEditors Відтінки сірого -Hex ProbeView A menu item, as short as possible, noun is recommended if it is shorter than adjective. Шіснадцятичний +Hex ProbeView A menu item, as short as possible, noun is recommended if it is shorter than adjective. Шіснадцятковий Hexadecimal FindWindow A menu item, as short as possible, noun is recommended if it is shorter than adjective. Шістнадцятичний Icon TypeEditors Іконка Icon view TypeEditors У вигляді іконки @@ -82,17 +94,20 @@ Number editor TypeEditors Редактор номеру Number: TypeEditors Номер: OK DiskProbe Гаразд OK ProbeView Гаразд +Offset: ProbeView Зміщення: Open device FileWindow Відкрити пристрій Open file… FileWindow Відкрити файл… PNG format TypeEditors PNG формат Page setup… ProbeView Налаштування сторінки… Paste ProbeView Вставити Previous ProbeView Попереднє +Print… ProbeView Друк… Probe device OpenWindow Перевірити пристрій Probe file… OpenWindow Перевірити файл… Quit FileWindow Вийти Raw editor AttributeWindow Raw редактор Redo ProbeView Відмінити відміну +Remove AttributeWindow Видалити Remove from file AttributeWindow Видалити для файлу Save ProbeView Зберегти Save changes before closing? ProbeView Зберегти зміни перед закриттям? @@ -110,6 +125,9 @@ Type editor not supported ProbeView Редактор типу не підтри Undo ProbeView Відмінити Unknown format TypeEditors Невідомий формат Unknown type TypeEditors Невідомий тип +View ProbeView This is the last menubar item 'File Edit Block View' Перегляд Writing to the file failed:\n%s\n\nAll changes will be lost when you quit. ProbeView Запис до файлу зупинено:\n%s\n\nКоли Ви вийдете зміни не збережуться. none ProbeView No attributes немає +of ProbeView з +of 0x0 ProbeView This is a part of 'Block 0xXXXX of 0x0026' message. In languages without 'of' structure it can be replaced simply with '/'. з 0x0 what: '%.4s'\n\n TypeEditors 'What' is a message specifier that defines the type of the message. what: '%.4s'\n\n diff --git a/data/catalogs/apps/diskusage/uk.catkeys b/data/catalogs/apps/diskusage/uk.catkeys index 914461423f..487175b851 100644 --- a/data/catalogs/apps/diskusage/uk.catkeys +++ b/data/catalogs/apps/diskusage/uk.catkeys @@ -1 +1,24 @@ -1 ukrainian x-vnd.Haiku-DiskUsage 0 +1 ukrainian x-vnd.Haiku-DiskUsage 2324691237 +%a, %d %b %Y, %r Info Window %a, %d %b %Y, %r +%d file Status View %d файл +%d files Status View %d файлів +9999.99 GB Status View 9999.99 +Created Info Window Створено +DiskUsage System name Використання дисків +Free on %refName% Scanner Вільно на %refName% +Get Info Pie View Інформація +Kind Info Window Тип +Modified Info Window Змінено +Open Pie View Відкрити +Open With Pie View Відкрити в +Outdated view Pie View Вікно перегляду +Path Info Window Шлях +Rescan Pie View Пересканувати +Rescan Volume View Пересканувати +Scan Status View Сканувати +Scanning %refName% Scanner Сканування %refName% +Size Info Window Розмір +file unavailable Pie View файл недоступний +file unavailable Status View файл недоступний +in %d files Info Window в %d файлах +no supporting apps Pie View відсутні підтримувані додатки diff --git a/data/catalogs/apps/drivesetup/uk.catkeys b/data/catalogs/apps/drivesetup/uk.catkeys index 6b26c92c8c..02edf785ea 100644 --- a/data/catalogs/apps/drivesetup/uk.catkeys +++ b/data/catalogs/apps/drivesetup/uk.catkeys @@ -1,9 +1,12 @@ -1 ukrainian x-vnd.Haiku-DriveSetup 696879283 +1 ukrainian x-vnd.Haiku-DriveSetup 1209826930 %ld MiB Support %ld MiB DiskView <пусто> PartitionList <пусто> Active PartitionList Активний Are you sure you want to delete the selected partition?\n\nAll data on the partition will be irretrievably lost if you do so! MainWindow Ви впевнені що бажаєте видалити вибраний розділ?\n\nВсі дані на розділі будуть безповоротно втрачені! +Are you sure you want to initialize the partition \"%s\"? You will be asked again before changes are written to the disk. MainWindow Ви впевнені , що бажаєте ініціалізувати розділ \"%s\"? Ви повинні будете відповісти повторно при запису на диск. +Are you sure you want to initialize the partition? You will be asked again before changes are written to the disk. MainWindow Ви впевнені , що бажаєте ініціалізувати розділ? Ви повинні будете відповісти повторно при запису на диск. +Are you sure you want to write the changes back to disk now?\n\nAll data on the disk %s will be irretrievably lost if you do so! MainWindow Ви впевнені що бажаєте записати зміни на диск зараз?\n\nВсі дані на диску %s будуть безповоротно втрачені! Are you sure you want to write the changes back to disk now?\n\nAll data on the partition %s will be irretrievably lost if you do so! MainWindow Ви впевнені що бажаєте записати зміни на диск зараз?\n\nВсі дані в розділі %s будуть безповоротно втрачені! Are you sure you want to write the changes back to disk now?\n\nAll data on the partition will be irretrievably lost if you do so! MainWindow Ви впевнені, що бажаєте записати зміни на диск?\n\nВсі дані на розділі будуть безповоротно втрачені! Are you sure you want to write the changes back to disk now?\n\nAll data on the selected disk will be irretrievably lost if you do so! MainWindow Ви впевнені, що бажаєте записати зміни на диск зараз?\n\nВсі дані на вибраному диску будуть безповоротно втрачені! @@ -26,8 +29,10 @@ Device DiskView Пристрій Device PartitionList Пристрій Disk MainWindow Диск Disk system \"%s\"\" not found! MainWindow Системний диск \"%s\"\" не знайдено! +DriveSetup System name DriveSetup Eject MainWindow Виштовхнути End: %ld MB Support Кінець: %ld MB +Error: MainWindow in any error alert Помилка: Failed to delete the partition. No changes have been written to disk. MainWindow Видалення розділу призупинене. Жодні зміни не були записані на диск. Failed to initialize the partition %s!\n MainWindow Призупинена ініціалізація розділу %s!\n Failed to initialize the partition. No changes have been written to disk. MainWindow Ініціалізація розділу призупинена. Жодні зміни не були записані на диск. @@ -39,6 +44,7 @@ Initialize MainWindow Ініціалізація Mount MainWindow Змонтувати Mount all MainWindow Підмонтувати все Mounted at PartitionList Змонтувати на +No disk devices have been recognized. DiskView Не розпізнано жодного дискового пристрою. OK MainWindow Гаразд Offset: %ld MB Support Початок: %ld MB Parameters PartitionList Параметри @@ -56,7 +62,7 @@ The currently selected partition is not empty. MainWindow Поточний ви The partition %s has been successfully initialized.\n MainWindow Розділ %s був успішно ініціалізований.\n The partition %s is already mounted. MainWindow Розділ %s повністю підмонтований. The partition %s is already unmounted. MainWindow Розділ %s повністю відмонтований. -The partition %s is currently mounted. MainWindow Розділ %s Повністю підмонтовано. +The partition %s is currently mounted. MainWindow Розділ %s повністю підмонтовано. The selected disk is read-only. MainWindow Вибраний диск тільки для читання. The selected partition does not contain a partitioning system. MainWindow Вибраний розділ не містить системної розмітки. There was an error acquiring the partition row. MainWindow Сталася помилка при одержанні параметрів розділу. diff --git a/data/catalogs/apps/expander/uk.catkeys b/data/catalogs/apps/expander/uk.catkeys index 8b3952a375..bae2325386 100644 --- a/data/catalogs/apps/expander/uk.catkeys +++ b/data/catalogs/apps/expander/uk.catkeys @@ -1,10 +1,11 @@ -1 ukrainian x-vnd.Haiku-Expander 2487745131 +1 ukrainian x-vnd.Haiku-Expander 187676748 Are you sure you want to stop expanding this\narchive? The expanded items may not be complete. ExpanderWindow Ви впевнені, що хочете зупинити розпаковку цього архіва? Розпаковка елементів може бути неповною. Automatically expand files ExpanderPreferences Автоматично розпакувати файли Automatically show contents listing ExpanderPreferences Автоматично показувати список вмісту Cancel ExpanderPreferences Відміна Cancel ExpanderWindow Відмінити Close ExpanderMenu Закрити +Close window when done expanding ExpanderPreferences Закрити вікно після розпаковки Continue ExpanderWindow Продовжити Creating listing for '%s' ExpanderWindow Створення списку для '%s' Destination ExpanderWindow Папка призначення @@ -12,20 +13,23 @@ Destination folder: ExpanderPreferences Папка призначення: Error when expanding archive ExpanderWindow Помилка при розпаковці архіва Expand ExpanderMenu Розпакувати Expand ExpanderWindow Розпакувати +Expander System name Розпаковувач Expander settings ExpanderPreferences Настройки Розпаковувача -Expander: Choose destination DirectoryFilePanel Expander: Виберіть ціль +Expander: Choose destination DirectoryFilePanel Розпаковувач: Виберіть ціль Expander: Open ExpanderWindow Expander: Відкрити -Expanding '%s' ExpanderWindow Розтиск '%s' +Expanding '%s' ExpanderWindow Розпаковка '%s' Expansion: ExpanderPreferences Розширення: File ExpanderMenu Файл -File expanded ExpanderWindow Файл розпаковано +File expanded ExpanderWindow Розпаковка файлу Hide contents ExpanderWindow Сховати вміст Leave destination folder path empty ExpanderPreferences Зберегти шлях папки призначення пустим +OK ExpanderPreferences Гаразд Open destination folder after extraction ExpanderPreferences Відкрити папку призначення після розтиску Other: ExpanderPreferences Інший: Same directory as source (archive) file ExpanderPreferences Та ж папка що і джерела (архіву) Select DirectoryFilePanel Вибрати Select ExpanderPreferences Вибрати +Select '%s' DirectoryFilePanel Вибрати '%s' Select current DirectoryFilePanel Вибрати поточний Set destination… ExpanderMenu Встановити ціль… Set source… ExpanderMenu Встановити джерело… @@ -42,3 +46,4 @@ The destination is read only. ExpanderWindow Ціль тільки для чи The file doesn't exist ExpanderWindow Файл відсутній The folder was either moved, renamed or not\nsupported. ExpanderWindow Папка була переіменована, видалена або не\nпідтримується. Use: ExpanderPreferences Використати: +is not supported ExpanderWindow не підтримується diff --git a/data/catalogs/apps/glteapot/uk.catkeys b/data/catalogs/apps/glteapot/uk.catkeys new file mode 100644 index 0000000000..b6693e348e --- /dev/null +++ b/data/catalogs/apps/glteapot/uk.catkeys @@ -0,0 +1,24 @@ +1 ukrainian x-vnd.Haiku-GLTeapot 2890609668 +Add a teapot TeapotWindow Додати чайник +Backface culling TeapotWindow Backface culling +Blue TeapotWindow Голубий +FPS display TeapotWindow Показати FPS +File TeapotWindow Файл +Filled polygons TeapotWindow Заповнити багатокутники +Fog TeapotWindow Туман +GLTeapot System name Чайник GL +Gouraud shading TeapotWindow Затінення Гуро +Green TeapotWindow Зелений +Lighting TeapotWindow Свічення +Lights TeapotWindow Світло +Lower left TeapotWindow Нижній лівий +Off TeapotWindow Вимкнути +Options TeapotWindow Опції +Perspective TeapotWindow Перспектива +Quit TeapotWindow Вийти +Red TeapotWindow Червоний +Right TeapotWindow Вправо +Upper center TeapotWindow Вище центру +White TeapotWindow Білий +Yellow TeapotWindow Жовтий +Z-buffered TeapotWindow Z-буферизація diff --git a/data/catalogs/apps/icon-o-matic/uk.catkeys b/data/catalogs/apps/icon-o-matic/uk.catkeys index 38b7c578a6..52e589d8f0 100644 --- a/data/catalogs/apps/icon-o-matic/uk.catkeys +++ b/data/catalogs/apps/icon-o-matic/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.haiku-icon_o_matic 4031165655 +1 ukrainian x-vnd.haiku-icon_o_matic 2326864078 Icon-O-Matic-PathCmd <змінити шлях> Icon-O-Matic-Menu-Edit <нічого не переробляти> Icon-O-Matic-Menu-Edit <нічого, щоб скасувати> @@ -26,6 +26,7 @@ Add with path Icon-O-Matic-ShapesList Додати зі шляхом Add with path & style Icon-O-Matic-ShapesList Додати зі шляху і стилю Add with style Icon-O-Matic-ShapesList Додати зі стилем All Icon-O-Matic-Properties Всі +Append… Icon-O-Matic-Menu-File Додати… Assign Path Icon-O-Matic-AddPathsCmd Призначити шлях Assign Paths Icon-O-Matic-AddPathsCmd Призначення шляхів Assign Style Icon-O-Matic-AssignStyleCmd Прив'язати стиль @@ -33,6 +34,7 @@ BEOS:ICON Attribute Icon-O-Matic-SavePanel Атрибут BEOS:ICON Bleep! Exporter - Continue in error dialog Bleep! Bummer Cancel button - error alert Помилка Cancel Icon-O-Matic-ColorPicker Відмінити +Cancel Icon-O-Matic-Menu-Settings Відміна Cancel Icon-O-Matic-SVGExport Відмінити Caps Icon-O-Matic-PropertyNames Шапки Change Color Icon-O-Matic-SetColorCmd Змінити Колір @@ -40,6 +42,7 @@ Clean Up Path Icon-O-Matic-CleanUpPathCmd Очистити шлях Clean up Icon-O-Matic-PathsList Очистити Click on a shape above Empty transformers list - 1st line Натиснути на фігуру нижче Click on an object in Empty property list - 1st line Натисніть на об'єкт в +Close Icon-O-Matic-Menu-File Закрити Closed Icon-O-Matic-PropertyNames Закрити Color Icon-O-Matic-PropertyNames Колір Color Icon-O-Matic-StyleTypes Колір @@ -50,11 +53,13 @@ Contour Transformation Контур Copy Icon-O-Matic-Properties Копіювати Detect Orient. Icon-O-Matic-PropertyNames Виявляти орієнт. Diamond Icon-O-Matic-StyleTypes Ромб +Discard Icon-O-Matic-Menu-Settings Витягнути Duplicate Icon-O-Matic-PathsList Дублювати Duplicate Icon-O-Matic-ShapesList Дублювати Duplicate Icon-O-Matic-StylesList Дублювати Edit Icon-O-Matic-Menus Редагувати Edit Gradient Icon-O-Matic-SetGradientCmd Редагувати градієнт +Error: Icon-O-Matic-Exporter Помилка: Error: Icon-O-Matic-Main Помилка: Export Icon-O-Matic-Menu-File Експорт Export Icon Dialog title Експорт іконки @@ -72,6 +77,8 @@ Gradient Icon-O-Matic-StyleTypes Градієнт Gradient type Icon-O-Matic-StyleTypes Тип градієнту HVIF Source Code Icon-O-Matic-SavePanel Код джерела HVIF Height Icon-O-Matic-PropertyNames Висота +Icon-O-Matic System name Icon-O-Matic +Icon-O-Matic might not have interpreted all data from the SVG when it was loaded. By overwriting the original file, this information would now be lost. Icon-O-Matic-SVGExport Icon-O-Matic може неправильно інтерпретувати дані з SVG , коли буде завантажений. При перезаписі файлу ця інформація може бути втрачена. Insert Control Point Icon-O-Matic-InsertPointCmd Вставити контрольну точку Invert selection Icon-O-Matic-Properties Обернути виділення Joins Icon-O-Matic-PropertyNames З'єднання @@ -148,8 +155,10 @@ Rotate indices forwards Icon-O-Matic-PathsList обертати за годин Rotation Icon-O-Matic-PropertyNames Обертання Rounding Icon-O-Matic-PropertyNames Округлення Save Icon-O-Matic-Menu-File Зберегти +Save Icon-O-Matic-Menu-Settings Зберегти Save Icon Dialog title Зберегти Іконку Save as… Icon-O-Matic-Menu-File Зберегти як… +Save changes to current icon? Icon-O-Matic-Menu-Settings Зберегти зміни для біжучої іконки? Saving your document failed! Icon-O-Matic-Exporter Збереження вашого документу призупинене! Scale Icon-O-Matic-TransformationBoxStates Масштаб Scale X Icon-O-Matic-PropertyNames Маштаб по X @@ -178,6 +187,7 @@ Translation X Icon-O-Matic-PropertyNames Перетворення по X Translation Y Icon-O-Matic-PropertyNames Перетворення по Y Unassign Path Icon-O-Matic-UnassignPathCmd Відв'язати шлях Undo Icon-O-Matic-Main Скасувати +Untitled Icon-O-Matic-Main Неназваний Width Icon-O-Matic-PropertyNames Ширина Yes Icon-O-Matic-StyledTextImport Так any of the other lists to Empty property list - 2nd line будь-який з інших списків до diff --git a/data/catalogs/apps/installedpackages/uk.catkeys b/data/catalogs/apps/installedpackages/uk.catkeys index 8e161f27f6..b3a7f3ac28 100644 --- a/data/catalogs/apps/installedpackages/uk.catkeys +++ b/data/catalogs/apps/installedpackages/uk.catkeys @@ -1,4 +1,5 @@ -1 ukrainian x-vnd.Haiku-InstalledPackages 148986533 +1 ukrainian x-vnd.Haiku-InstalledPackages 4131220089 +InstalledPackages System name Встановлення пакунків No package selected. UninstallView Пакунок не вибрано OK UninstallView Гаразд Package description UninstallView Опис пакунків diff --git a/data/catalogs/apps/installer/be.catkeys b/data/catalogs/apps/installer/be.catkeys index b86cd3711f..e67ae78374 100644 --- a/data/catalogs/apps/installer/be.catkeys +++ b/data/catalogs/apps/installer/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian x-vnd.Haiku-Installer 1384722558 +1 belarusian x-vnd.Haiku-Installer 3852628561 %1ld of %2ld InstallerWindow number of files copied %1ld з %2ld 1) If you are installing Haiku onto real hardware (not inside an emulator) it is recommended that you have already prepared a hard disk partition. The Installer and the DriveSetup tool offer to initialize existing partitions with the Haiku native file system, but the options to change the actual partition layout may not have been tested on a sufficiently great variety of computer configurations so we do not recommend using it.\n InstallerApp 1) Калі вы ўсталёўваеце Haiku на рэальнае жалеза (не на эмулятар), мы рэкамендуем загадзя падрыхтаваць падзел на дыску.Усталёўшчык і утыліта DriveSetup дапамогуць усталяваць на падзеле родную для Haiku файлавую сістэму, але опыці па змене цякучай табліцы падзелаў яшчэ недадакова пратэсціраваныя, таму іх ужыванне не рэкамендуецца.\n 2) The Installer will make the Haiku partition itself bootable, but takes no steps to integrate Haiku into an existing boot menu. If you have GRUB already installed, you can add Haiku to its boot menu. Depending on what version of GRUB you use, this is done differently.\n\n\n InstallerApp 2)Усталёўшчык зробіць падзел Haiku загрузачным, але не дадасць Haiku да вашага меню загрузкі. Калі у вас ужо ўсталяваны GRUB, вы можаце самастойна дадаць Haiku да яго меню. Гэта робіцца па-рознаму у залежнасці ад вашай версіі загрузчыка.\n\n\n @@ -46,6 +46,7 @@ Install from: InstallerWindow Усталяваць з: Install progress: InstallerWindow Прагрэс усталёўкі: Installation canceled. InstallProgress Усталёўка адмененая. Installation completed. Boot sector has been written to '%s'. Press Quit to leave the Installer or choose a new target volume to perform another installation. InstallerWindow Усталёўка завершана. Загрузачны сектар запісаны ў '%s'.Націсніце Выйсці, каб пакінуць усталёўшчык ці абраць іншы том для новай усталёўкі. +Installation completed. Boot sector has been written to '%s'. Press Restart to restart the computer or choose a new target volume to perform another installation. InstallerWindow Усталёўка завершана. Загрузачны сектар запісаны ў '%s'.Націсніце Перазапусціць, каб перазапусціць кампутар ці абрярыце іншы том для яшчэ адной усталёўкі. Installer System name Усталёўшчык Installer\n\twritten by Jérôme Duval and Stephan Aßmus\n\tCopyright 2005-2010, Haiku.\n\n InstallerApp Installer\n\tАўтары: Jérôme Duval, Stephan Aßmus\n\tCopyright 2005-2010, Haiku.\n\n Launch the DriveSetup utility to partition\navailable hard drives and other media.\nPartitions can be initialized with the\nBe File System needed for a Haiku boot\npartition. InstallerWindow Запусціце утыліту DriveSetup каб размеціць\nдаступныя дыскі.\nПадзелы могуць быць ініцыялізаваны файлавай сістэмай\nBe File System, патрэбнай для загрузачнага падзелу Haiku. @@ -69,6 +70,7 @@ Quit Boot Manager InstallerWindow Выйсці з Менеджэра Запус Quit Boot Manager and DriveSetup InstallerWindow Выйсці з Менеджэра Запуску і DriveSetup Quit DriveSetup InstallerWindow Выйсці з DriveSetup README InstallerApp README +Restart InstallerWindow Перазапусціць Restart system InstallerWindow Перазагрузіць сістэму Running Boot Manager and DriveSetup…\n\nClose both applications to continue with the installation. InstallerWindow Працуюць Boot Manager і DriveSetup...\n\nЗакрыйце абедзве праграмы для працягу. Running Boot Manager…\n\nClose Boot Manager to continue with the installation. InstallerWindow Працуе Boot Manager…\n\nЗакрыйце Boot Manager для працягу ўсталёўкі. diff --git a/data/catalogs/apps/installer/de.catkeys b/data/catalogs/apps/installer/de.catkeys index 84085ab6c4..0bdbb3719c 100644 --- a/data/catalogs/apps/installer/de.catkeys +++ b/data/catalogs/apps/installer/de.catkeys @@ -98,7 +98,7 @@ Welcome to the Haiku Installer!\n\n InstallerApp Herzlich Willkommen zum Haiku- With GRUB 2 the first logical partition always has the number \"5\", regardless of the number of primary partitions.\n\n InstallerApp Bei GRUB 2 besitzt die erste logische Partition immer die Nummer \"5\", unabhängig von der Anzahl primärer Partitionen.\n\n With GRUB it's: (hdN,n)\n\n InstallerApp Bei GRUB ist es: (hdN,n)\n\n Write boot sector InstallerWindow Bootsektor schreiben -Write boot sector to '%s' InstallerWindow Der Bootsektor wird auf '%s' geschrieben +Write boot sector to '%s' InstallerWindow Bootsektor auf '%s' schreiben You can see the correct partition in GParted for example.\n\n\n InstallerApp Die richtige Partition findet man beispielweise mit GParted.\n\n\n You can't install the contents of a disk onto itself. Please choose a different disk. InstallProgress Der Inhalt eines Laufwerks kann nicht auf sich selbst installiert werden. Bitte ein anderes Ziellaufwerk wählen. You'll note that GRUB uses a different naming strategy for hard drives than Linux.\n\n InstallerApp Wie man sieht, besitzt GRUB ein zu Linux unterschiedliches Benennungsschema für Festplatten.\n\n diff --git a/data/catalogs/apps/installer/uk.catkeys b/data/catalogs/apps/installer/uk.catkeys index 9bd644fb6c..78dcd3bb31 100644 --- a/data/catalogs/apps/installer/uk.catkeys +++ b/data/catalogs/apps/installer/uk.catkeys @@ -1,23 +1,28 @@ -1 ukrainian x-vnd.Haiku-Installer 2747618228 +1 ukrainian x-vnd.Haiku-Installer 3852628561 %1ld of %2ld InstallerWindow number of files copied %1ld з %2ld 1) If you are installing Haiku onto real hardware (not inside an emulator) it is recommended that you have already prepared a hard disk partition. The Installer and the DriveSetup tool offer to initialize existing partitions with the Haiku native file system, but the options to change the actual partition layout may not have been tested on a sufficiently great variety of computer configurations so we do not recommend using it.\n InstallerApp 1) Якщо ви встановлюєте Haiku на реальному залізі (не в середині емулятора) рекомендується розбити жорсткий диск на розділи заздалегідь. Встановлювач і утиліта DriveSetup здатні до ініціалізації присутніх розділів у рідній файловій системі Haiku, але опції зміни існуючих розділів протестовані недостатньо і ми не рекомендуємо їх поки що до використання.\n 2) The Installer will make the Haiku partition itself bootable, but takes no steps to integrate Haiku into an existing boot menu. If you have GRUB already installed, you can add Haiku to its boot menu. Depending on what version of GRUB you use, this is done differently.\n\n\n InstallerApp 2) Встановлювач сам зробить розділ Haiku загрузочним, але він не робить жодних кроків для інтеграції Haiku в меню завантаження. Якщо Ви маєте встановлений GRUB, то можете додати Haiku до його меню завантаження. В залежності від версії GRUB, це робиться по різному.\n\n\n 2.1) GRUB 1\n InstallerApp 2.1) GRUB 1\n 2.2) GRUB 2\n InstallerApp 2.2) GRUB 2\n +3) When you successfully boot into Haiku for the first time, make sure to read our \"Welcome\" documentation, there is a link on the Desktop.\n\n InstallerApp 3) Коли Ви успішно зануритесь у Haiku почніть з прочитання документації \"Welcome\", її лінк Ви знайдете на робочому столі.\n\n InstallerWindow No partition available <немає> ?? of ?? InstallerWindow Unknown progress ?? з ?? ??? InstallerWindow Unknown currently copied item ??? ??? InstallerWindow Unknown partition name ??? +Abort InstallerWindow Відмінити Additional disk space required: %s InstallerWindow Очікується збільшення дискового простору: %s Additional disk space required: 0.0 KiB InstallerWindow Необхідно додатковий дисковий простір: 0.0 KiB Additionally you have to edit another file to actually display the boot menu:\n\n InstallerApp Додатково доведеться змінити ще один файл, щоб з’явилося меню завантаження:\n\n All hard disks start with \"hd\".\n InstallerApp Всі жорсткі диски починаються з \"hd\".\n +An error was encountered and the installation was not completed:\n\nError: %s InstallerWindow Сталася помилка і встановлення некомплектне:\n\nПомилка: %s Are you sure you want to abort the installation and restart the system? InstallerWindow Ви впевнені що бажаєте зупинити встановлення і перезавантажити систему? +Are you sure you want to abort the installation? InstallerWindow Ви дійсно бажаєте відмінити встановлення? Are you sure you want to install onto the current boot disk? The Installer will have to reboot your machine if you proceed. InstallProgress Ви впевнені що, хочете встановлювати на поточний загрузочний диск? Встановлювач перезавантажить машину, якщо ви продовжите. Are you sure you want to to stop the installation? InstallerWindow Ви впевнені, що бажаєте зупинити встановлення? Begin InstallerWindow Почати Boot sector not written because of an internal error. InstallProgress Загрузочний сектор не записано через внутрішню помилку. Boot sector successfully written. InstallProgress Завантажувальний сектор успішно записаний. +BootManager, the application to configure the Haiku boot menu, could not be launched. InstallerWindow Завантажувач (BootManager), додаток для конфігурування загрузочного меню Haiku, не є запущеним. Cancel InstallProgress Відмінити Cancel InstallerWindow Відмінити Choose the disk you want to install onto from the pop-up menu. Then click \"Begin\". InstallerWindow Виберіть диск для встановлення з випадаючого меню. Тоді клікніть \"Почати\". @@ -32,16 +37,21 @@ Finally, you have to update the boot menu by entering:\n\n InstallerApp Вре Finishing Installation. InstallProgress Завершення встановлення. GRUB's naming scheme is still: (hdN,n)\n\n InstallerApp Схема іменування в GRUB залишилась така: (hdN,n)\n\n Have fun and thanks a lot for trying out Haiku! We hope you like it! InstallerApp Насолоджуйтесь і дякуємо за спробу використання Haiku! Маємо надію що вона вам сподобається! +Here you have to comment out the line \"GRUB_HIDDEN_TIMEOUT=0\" by putting a \"#\" in front of it in order to actually display the boot menu.\n\n InstallerApp Там ви можете закоментувати рядок \"GRUB_HIDDEN_TIMEOUT=0\" помістивши \"#\" перед ним, з метою появи меню завантаження.\n\n Hide optional packages InstallerWindow Сховати необов’язкові пакети IMPORTANT INFORMATION BEFORE INSTALLING HAIKU\n\n InstallerApp ВАЖЛИВА ІНФОРМАЦІЯ ПЕРЕД ВСТАНОВЛЕННЯМ HAIKU\n\n If you have not created a partition yet, simply reboot, create the partition using whatever tool you feel most comfortable with, and reboot into Haiku to continue with the installation. You could for example use the GParted Live-CD, it can also resize existing partitions to make room.\n\n\n InstallerApp Якщо Ви досі не створили розділ, перезавантажтесь, створіть його за допомогою звичної Вам програми, завантажтесь в Haiku для продовження інсталяції. Для прикладу використайте GParted Live-CD, Який також може змінити розміри присутніх розділів.\n\n\n Install anyway InstallProgress Встановити в будь-якому разі Install from: InstallerWindow Встановити з: +Install progress: InstallerWindow Хід встановлення: Installation canceled. InstallProgress Встановлення призупинено. Installation completed. Boot sector has been written to '%s'. Press Quit to leave the Installer or choose a new target volume to perform another installation. InstallerWindow Встановлення завершене. Завантажувальний сектор записано до '%s'. Натисніть Вихід щоб покинути Встановлювач або виберіть інший цільовий том для виконання другого встановлення. +Installation completed. Boot sector has been written to '%s'. Press Restart to restart the computer or choose a new target volume to perform another installation. InstallerWindow Встановлення завершене. Загрузочний сектор записано до '%s'. Натисніть Перезавантажити для рестарту або вибрати іншу ціль для встановлення. +Installer System name Встановлювач Installer\n\twritten by Jérôme Duval and Stephan Aßmus\n\tCopyright 2005-2010, Haiku.\n\n InstallerApp Встановлювач\n\tАвтори Jérôme Duval і Stephan Aßmus\n\tCopyright 2005–2010, Haiku.\n\n Launch the DriveSetup utility to partition\navailable hard drives and other media.\nPartitions can be initialized with the\nBe File System needed for a Haiku boot\npartition. InstallerWindow Запустіть утиліту DriveSetup для розбиття\nдоступних вінчестерів і пристроїв.\nРозділи будуть зініціалізовані у \nBe File System необхідній для завантаження розділу з Haiku\n NOTE: While the naming strategy for hard disks is still as described under 2.1) the naming scheme for partitions has changed.\n\n InstallerApp Заувага: Хоча принцип іменування жорстких дисків такий самий, як описано в п. 2.1 іменування розділів змінилося.\n\n +Newer versions of GRUB use an extra configuration file to add custom entries to the boot menu. To add them to the top, you have to create/edit a file by launching your favorite editor from a Terminal like this:\n\n InstallerApp Найновіші версії GRUB використовують спеціальний конфігураційний файл, щоб додати пункти до бутменю. Для додавання у список досить створити/редагувати файл у вашому улюбленому текстовому редакторі запустивши його з Terminal'у, наприклад, так:\n\n No optional packages available. PackagesView Необов’язкові пакети відсутні. No partitions have been found that are suitable for installation. Please set up partitions and initialize at least one partition with the Be File System. InstallerWindow Не знайдено жодного розділу, що підходить для встановлення. Перевстановіть розділи або зініціалізуйте один з них в Be File System. OK InstallProgress Гаразд @@ -60,6 +70,7 @@ Quit Boot Manager InstallerWindow Вийти з Бутменеджера Quit Boot Manager and DriveSetup InstallerWindow Вийти з Бутменеджера і утиліти DriveSetup Quit DriveSetup InstallerWindow Вийти з DriveSetup README InstallerApp ПРОЧИТАЙ +Restart InstallerWindow Перезавантажити Restart system InstallerWindow Перезавантажити систему Running Boot Manager and DriveSetup…\n\nClose both applications to continue with the installation. InstallerWindow Працюють Бутменеджер і DriveSetup…\n\nЗакрийте обидва додатки для продовження встановлення. Running Boot Manager…\n\nClose Boot Manager to continue with the installation. InstallerWindow Працює Бутменеджер…\n\nЗакрийте його для продовження встановлення. @@ -90,6 +101,7 @@ Write boot sector InstallerWindow Записати загрузочний се Write boot sector to '%s' InstallerWindow Записати загрузочний сектор до '%s' You can see the correct partition in GParted for example.\n\n\n InstallerApp Ви можете подивитись правильний розподіл розділів, наприклад, у GParted.\n\n\n You can't install the contents of a disk onto itself. Please choose a different disk. InstallProgress Неможливо встановити розділ на самого себе. Виберіть інший диск. +You'll note that GRUB uses a different naming strategy for hard drives than Linux.\n\n InstallerApp Слід зауважити, що GRUB використовує інший спосіб іменування жорстких дисків ніж Linux.\n\n \"N\" is the hard disk number, starting with \"0\".\n InstallerApp \"N\" номер жорсткого диску, що починається з \"0\".\n \"n\" is the partition number, also starting with \"0\".\n InstallerApp \"n\" є номер розділу, завжди починається з \"0\".\n \"n\" is the partition number, which for GRUB 2 starts with \"1\"\n InstallerApp \"n\" є номер розділу, який для GRUB 2 починається з \"1\"\n diff --git a/data/catalogs/apps/launchbox/fi.catkeys b/data/catalogs/apps/launchbox/fi.catkeys index c4e1cb46e7..282d21eeec 100644 --- a/data/catalogs/apps/launchbox/fi.catkeys +++ b/data/catalogs/apps/launchbox/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-LaunchBox 1440389990 +1 finnish x-vnd.Haiku-LaunchBox 3172696206 Add button here LaunchBox Lisää painike tänne Auto-raise LaunchBox Automaattisesti päällimmäinen Bummer LaunchBox Valmis @@ -7,9 +7,8 @@ Clear button LaunchBox Nollaa painike Clone LaunchBox Klooni Close LaunchBox Sulje Description for '%3' LaunchBox Kohteen ’%3’ kuvaus -Failed to launch '%1'.\n\nError: LaunchBox Sovelluksen ’%1’ käynnistys epäonnistui:\n\nVirhe: +Failed to launch '%1'.\n\nError: LaunchBox Sovelluksen ’%1’ käynnistys epäonnistui:\n\nVirhe: Failed to launch 'something',error in Pad data. LaunchBox Epäonnistuttiin käynnistämään ’jotakin’, virhe Alustatiedoissa. -Failed to launch application with signature '%2'.\n\nError: LaunchBox Allekirjoituksella ’%2’ varustetun sovelluksen käynnistys epäonnistui.\n\nVirhe: Failed to send 'open folder' command to Tracker.\n\nError: LaunchBox Epäonnistuttiin lähettämään ’avaa kansio’-komento Seuraajalle.\n\nVirhe: Horizontal layout LaunchBox Vaakasuora sijoittelu Icon size LaunchBox Kuvakekoko @@ -30,5 +29,6 @@ Show on all workspaces LaunchBox Näytä kaikki työtilat Show window border LaunchBox Näytä ikkunaraja Vertical layout LaunchBox Pystysuora sijoittelu You can drag an icon here. LaunchBox Voit raahata kuvakkeen tänne. +\n\nFailed to launch application with signature '%2'.\n\nError: LaunchBox \n\nAllekirjoituksella ’%2’ varustetun sovelluksen käynnistys epäonnistui.\n\nVirhe: last chance LaunchBox viimeinen mahdollisuus launch popup LaunchBox käynnistysponnahdusikkuna diff --git a/data/catalogs/apps/launchbox/sk.catkeys b/data/catalogs/apps/launchbox/sk.catkeys index 567f930c89..73b79cd5d5 100644 --- a/data/catalogs/apps/launchbox/sk.catkeys +++ b/data/catalogs/apps/launchbox/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-LaunchBox 1440389990 +1 slovak x-vnd.Haiku-LaunchBox 2567299959 Add button here LaunchBox Pridať tlačidlo sem Auto-raise LaunchBox Automaticky aktivovať Bummer LaunchBox Škoda @@ -7,9 +7,8 @@ Clear button LaunchBox Tlačidlo Vyčistiť Clone LaunchBox Klonovať Close LaunchBox Zatvoriť Description for '%3' LaunchBox Popis „%3“ -Failed to launch '%1'.\n\nError: LaunchBox Nepodarilo sa spustiť „%1“.\n\nChyba: +Failed to launch '%1'.\n\nError: LaunchBox Nepodarilo sa spustiť „%1“.\n\nChyba: Failed to launch 'something',error in Pad data. LaunchBox Nepodarilo sa spustiť „niečo“, chyba v dátach Oblasti. -Failed to launch application with signature '%2'.\n\nError: LaunchBox Nepodarilo sa spustiť aplikáciu so signatúrou „%2“.\n\nChyba: Failed to send 'open folder' command to Tracker.\n\nError: LaunchBox Nepodarilo sa poslať príkaz „otvoriť priečinok“ Trackeru.\n\nChyba: Horizontal layout LaunchBox Vodorovné rozloženie Icon size LaunchBox Veľkosť ikon diff --git a/data/catalogs/apps/launchbox/sv.catkeys b/data/catalogs/apps/launchbox/sv.catkeys index 13ca41bdfd..859724c9b4 100644 --- a/data/catalogs/apps/launchbox/sv.catkeys +++ b/data/catalogs/apps/launchbox/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-LaunchBox 1440389990 +1 swedish x-vnd.Haiku-LaunchBox 3172696206 Add button here LaunchBox Lägg till knapp Auto-raise LaunchBox Upphöj automatiskt Bummer LaunchBox Hoppsan @@ -7,9 +7,8 @@ Clear button LaunchBox Rensa knapp Clone LaunchBox Klona Close LaunchBox Stäng Description for '%3' LaunchBox Beskrivning för '%3' -Failed to launch '%1'.\n\nError: LaunchBox Misslyckades att starta '%1'.\n\nFel: +Failed to launch '%1'.\n\nError: LaunchBox Misslyckades att starta '%1'.\n\nFel: Failed to launch 'something',error in Pad data. LaunchBox Misslyckades att starta 'någonting'. Fel på knappen. -Failed to launch application with signature '%2'.\n\nError: LaunchBox Misslyckades att starta programmet med signaturen '%2'.\n\nFel: Failed to send 'open folder' command to Tracker.\n\nError: LaunchBox Misslyckades att skicka 'öppna mapp' kommando till Tracker.\n\nFel: Horizontal layout LaunchBox Horisontal utformning Icon size LaunchBox Ikonstorlek @@ -30,5 +29,6 @@ Show on all workspaces LaunchBox Visa på alla arbetsytor Show window border LaunchBox Visa fönsterkant Vertical layout LaunchBox Vertikal utformning You can drag an icon here. LaunchBox Du kan dra en ikon hit. +\n\nFailed to launch application with signature '%2'.\n\nError: LaunchBox \n\nKunde inte starta programmet med signaturen '%2'.\n\nFel: last chance LaunchBox sista chansen launch popup LaunchBox starta popup diff --git a/data/catalogs/apps/launchbox/uk.catkeys b/data/catalogs/apps/launchbox/uk.catkeys index ba7f5568c8..9a5c636971 100644 --- a/data/catalogs/apps/launchbox/uk.catkeys +++ b/data/catalogs/apps/launchbox/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-LaunchBox 1555134888 +1 ukrainian x-vnd.Haiku-LaunchBox 1440389990 Add button here LaunchBox Додати кнопку тут Auto-raise LaunchBox Автоматичне спливання Bummer LaunchBox Помилка @@ -6,18 +6,26 @@ Cancel LaunchBox Відміна Clear button LaunchBox Очистити кнопку Clone LaunchBox Клонувати Close LaunchBox Закрити +Description for '%3' LaunchBox Опис для '%3' +Failed to launch '%1'.\n\nError: LaunchBox Призупинено запуск '%1'.\n\nПомилка: Failed to launch 'something',error in Pad data. LaunchBox Невдалося запустити 'щось', помилка в даних панелі. +Failed to launch application with signature '%2'.\n\nError: LaunchBox Призупинено запуск додатку з сигнатурою '%2'.\n\nПомилка: +Failed to send 'open folder' command to Tracker.\n\nError: LaunchBox Призупинено команду 'відкрити папку' для Tracker.\n\nПомилка: Horizontal layout LaunchBox Горизонтальне розташування Icon size LaunchBox Розмір Іконки Ignore double-click LaunchBox Ігнорувати подвійне натискання +LaunchBox System name LaunchBox Name Panel LaunchBox Панель назви New LaunchBox Новий OK LaunchBox Гаразд Pad LaunchBox Панель +Pad %1 LaunchBox Панель %1 Pad 1 LaunchBox Панель 1 Quit LaunchBox Вийти Really close this pad?\n(The pad will not be remembered.) LaunchBox Дійсно закрити цю панель?\n(Вона не збережеться.) Remove button LaunchBox Видалити кнопку +Set description… LaunchBox Встановити Опис… +Settings LaunchBox Настройки Show on all workspaces LaunchBox Показати на всіх робочих просторах Show window border LaunchBox Показувати межі вікна Vertical layout LaunchBox Вертикальне розташування diff --git a/data/catalogs/apps/magnify/uk.catkeys b/data/catalogs/apps/magnify/uk.catkeys index 3c132543ae..56a452dcaf 100644 --- a/data/catalogs/apps/magnify/uk.catkeys +++ b/data/catalogs/apps/magnify/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-Magnify 1821981944 +1 ukrainian x-vnd.Haiku-Magnify 3748875992 %width x %height @ %pixelSize pixels/pixel Magnify-Main %width x %height @ %pixelSize pixels/pixel Add a crosshair Magnify-Main Додати перехрестя Copy image Magnify-Main Копіювати зображення @@ -7,18 +7,23 @@ Decrease pixel size Magnify-Main Зменшити розмір пікселів Decrease window size Magnify-Main Зменшити розмір вікна Freeze/Unfreeze image Magnify-Main заморозити/відморозити зображення General:\n 32 x 32 - the top left numbers are the number of visible\n pixels (width x height)\n 8 pixels/pixel - represents the number of pixels that are\n used to magnify a pixel\n R:152 G:52 B:10 - the RGB values for the pixel under\n the red square\n Magnify-Help Основне:\n 32 x 32 - Верхнє ліве число кількість видимих\n пікселів (ширина x висота)\n 8 pixels/pixel - являє собою кількість пікселів які\n використовуются для збільшення пікселів\n R:152 G:52 B:10 - Значення RGB для пікселів під\n червоною площею\n +Help Magnify-Main Допомога Hide/Show grid Magnify-Main приховати/показати сітку Hide/Show info Magnify-Main приховати/показати Інформацію Increase pixel size Magnify-Main Збільшити розмір пікселя Increase window size Magnify-Main Збільшити розмір вікна Info Magnify-Main Інформація Info:\n hide/show info - hides/shows all these new features\n note: when showing, a red square will appear which signifies\n which pixel's rgb values will be displayed\n add/remove crosshairs - 2 crosshairs can be added (or removed)\n to aid in the alignment and placement of objects.\n The crosshairs are represented by blue squares and blue lines.\n hide/show grid - hides/shows the grid that separates each pixel\n Magnify-Help Інформація:\n hide/show info - сховати/показати всі нові можливості\n заувага: при показі, з'явиться червона площа яка означає\n скільки пікселів rgb буде показано\n add/remove crosshairs - 2 перехрестя може бути додано (або знято)\n для надання допомоги у вирівнюванні чи розташуванні об'єктів .\n Перехрестки позначені синіми квадратами і лініями.\n hide/show grid - приховати/показати сітку, яка відокремлює кожен піксель\n +Magnify System name Збільшення Magnify help Magnify-Help Допомога Magnify Make square Magnify-Main Задати площу Navigation:\n arrow keys - move the current selection (rgb indicator or crosshair)\n around 1 pixel at a time\n option-arrow key - moves the mouse location 1 pixel at a time\n x marks the selection - the current selection has an 'x' in it\n Magnify-Help Навігація:\n стрілочки - переміщують курсор вибору (rgb індикатора або перехрестя)\n довкола 1 пікселя за раз\n опція стрілочки - переміщає курсор 1 піксель за раз\n x зробіть вибір - поточний вибір має 'x' в собі\n Remove a crosshair Magnify-Main Зняти перехрестя Save image Magnify-Main Зберегти зображення +Sizing/Resizing:\n make square - sets the width and the height to the larger\n of the two making a square image\n increase/decrease window size - grows or shrinks the window\n size by 4 pixels.\n note: this window can also be resized to any size via the\n resizing region of the window\n increase/decrease pixel size - increases or decreases the number\n of pixels used to magnify a 'real' pixel. Range is 1 to 16.\n Magnify-Help Sizing/Resizing:\nзадає площу- виставляє висоту і ширину більш\n ніж двох площ зображень\n increase/decrease window size - звужує розширює вікно\n розміром 4 пікселі.\n заувага: це вікно може також бути змінене до іншого \n зміною його меж\n increase/decrease pixel size - змінює число\n пікселів, що використовуються для збільшення реального пікселя. Діапазон від 1 до 16.\n Stick coordinates Magnify-Main Вісь кординат +freeze - freezes/unfreezes magnification of whatever the\n cursor is currently over\n Magnify-Help Замороження - заморозити/розморозити будь-яке збільшення незалежно\n від положення курсора\n magnify: size must be a multiple of 4\n Console збільшення: Розмір має бути кратним 4\n no clip msg\n In console, when clipboard is empty after clicking Copy image немає кліпу msg\n +size must be > 4 and a multiple of 4\n Console розмір має бути > 4 і кратний 4\n usage: magnify [size] (magnify size * size pixels)\n Console Використання: Magnify [розмір] (Розмір збільшення * розмір пікселів)\n diff --git a/data/catalogs/apps/mail/uk.catkeys b/data/catalogs/apps/mail/uk.catkeys index 5fb57ce677..4753e973f5 100644 --- a/data/catalogs/apps/mail/uk.catkeys +++ b/data/catalogs/apps/mail/uk.catkeys @@ -1,7 +1,12 @@ -1 ukrainian x-vnd.Be-MAIL 3539940090 +1 ukrainian x-vnd.Be-MAIL 2276629278 %d - Date Mail %d - Дата %e - E-mail address Mail %e - поштова адреса +%e wrote:\\n Mail %e написано:\\n %n - Full name Mail %n - Повне ім'я +(Address unavailable) Mail (Адреса недоступна) +(Date unavailable) Mail (Дата недоступна) +(Name unavailable) Mail (Ім'я недоступне) + Mail <жодного> Account from mail Mail Аккаунт для пошти Account: Mail Аккаунт: Accounts… Mail Аккаунти… @@ -12,20 +17,25 @@ An error occurred trying to open this signature. Mail Помилка при с An error occurred trying to save the attachment. Mail Сталася помилка при збереженні вкладення. An error occurred trying to save this signature. Mail Помилка при збереженні цього підпису. Attach attributes: Mail Додати атрибути: +Attachments: Mail Вкладення: Auto signature: Mail Автопідпис: +Automatic Mail Автоматично Automatically mark mail as read: Mail Автоматично помітити як прочитане: Bcc: Mail Bcc: Beginner Mail Початківець Button bar: Mail Панель кнопок: Cancel Mail Відмінити +Cc: Mail Cc: Check spelling Mail Перевірити правопис Close Mail Закрити +Close and Mail Закрити і Colored quotes: Mail Забарвлення цитат: Copy Mail Копіювати Copy link location Mail Скопіювати розміщення посилання Copy to new Mail Копіювати до нового -Couldn't open this signature. Sorry. Mail Прикро,неможливо відкрити цей підпис. +Couldn't open this signature. Sorry. Mail Прикро, неможливо відкрити цей підпис. Cut Mail Вирізати +Date: Mail Дата: Decoding: Mail Розкодування: Default account: Mail Аккаунт по замовчуванню: Delete Mail Видалити @@ -54,6 +64,7 @@ Initial spell check mode: Mail Режим перевірки правопису Leave as '%s' Mail Зберегти як '%s' Leave as New Mail Зберегти як новий Leave same Mail Зберегти саме це +Mail System name Пошта Mail couldn't find its dictionary. Mail Пошта не може знайти цього словника. Mail preferences Mail Настройки пошти Mailing Mail Відправлення @@ -65,8 +76,11 @@ New mail message Mail Новий лист Next Mail Наступний Next message Mail Наступний лист No file attributes, just plain data Mail Жодних атрибутів,тільки чисті дані -None Mail Жоден +No matches Mail Не відповідати +None Mail Жодного OK Mail Гаразд +Off Mail Вимкнути +On Mail Включити Only files can be added as attachments. Mail Тільки файли можуть бути додані як вкладення. Open Mail Відкрити Open attachment Mail Відкрити вкладення @@ -79,10 +93,12 @@ Previous Mail Попередній Previous message Mail Попередній лист Print Mail Друкувати Print… Mail Друкувати… +Put your favorite e-mail queries and query templates in this folder. Mail Покладіть улюблені поштові запити і шаблони запитів у цю папку. Queries Mail Запити Quit Mail Завершити Quote Mail Цитата Random Mail Випадковий +Read Mail Читати Really delete this signature? This cannot be undone. Mail Дійсно видалити цей підпис? Це буде незворотним. Redo Mail Відмінити відміну Remove attachment Mail Видалити вкладення @@ -116,10 +132,12 @@ Signature: Mail Підпис Signatures Mail Підписи Size: Mail Розмір: Sorry Mail Вибачте +Sorry, could not find an application that supports the 'Person' data type. Mail Вибачте не знайдено жодного додатка що підтримує дані типу 'Person'. Start now Mail Запустити зараз Subject: Mail Тема: Text wrapping: Mail Обтікання тексту: The mail_daemon could not be started:\n\t Mail Mail_daemon не запущено:\n\t +The mail_daemon is not running. The message is queued and will be sent when the mail_daemon is started. Mail Mail_daemon не запущено. Лист стоїть в черзі і буде відправлений після запуску демона. There is no installed handler for URL links. Mail Не встановлено обробник посилань URL Title: Mail Назва: To: Mail До: @@ -132,3 +150,11 @@ View Mail Вигляд Warn unencodable: Mail Увага нерозкодоване: Your main text contains %ld unencodable characters. Perhaps a different character set would work better? Hit Send to send it anyway (a substitute character will be used in place of the unencodable ones), or choose Cancel to go back and try fixing it up. Mail Ваш основний текст містить %ld нерозкодованих символів. Можливо інше кодування спрацює краще? Виберіть Відправити якщо хочете зробити це не зважаючи(нерозкодований символ буде замінено таким що ситуативно підходить), або натисніть Відмінити щоб п.овернутися назад і виправити ситуацію. \\n - Newline Mail \\n - Нова стрічка +draft B_USER_DIRECTORY/mail/draft чорновик +helpful message Mail щасливе повідомлення +in B_USER_DIRECTORY/mail/in вхідні +mail B_USER_DIRECTORY/mail пошта +out B_USER_DIRECTORY/mail/out вихідні +queries B_USER_DIRECTORY/mail/queries запити +sent B_USER_DIRECTORY/mail/sent відіслати +spam B_USER_DIRECTORY/mail/spam спам diff --git a/data/catalogs/apps/mandelbrot/uk.catkeys b/data/catalogs/apps/mandelbrot/uk.catkeys new file mode 100644 index 0000000000..0bf89abfc4 --- /dev/null +++ b/data/catalogs/apps/mandelbrot/uk.catkeys @@ -0,0 +1,10 @@ +1 ukrainian x-vnd.Haiku-Mandelbrot 3766380907 +File Mandelbrot Файл +Iterations Mandelbrot Наближення +Mandelbrot System name Mandelbrot +Palette Mandelbrot Палітра +Palette 1 Mandelbrot Палітра 1 +Palette 2 Mandelbrot Палітра 2 +Palette 3 Mandelbrot Палітра 3 +Palette 4 Mandelbrot Палітра 4 +Quit Mandelbrot Вийти diff --git a/data/catalogs/apps/mediaconverter/uk.catkeys b/data/catalogs/apps/mediaconverter/uk.catkeys index f908e6f6ba..9cc40be1c3 100644 --- a/data/catalogs/apps/mediaconverter/uk.catkeys +++ b/data/catalogs/apps/mediaconverter/uk.catkeys @@ -1 +1,41 @@ -1 ukrainian x-vnd.Haiku-MediaConverter 0 +1 ukrainian x-vnd.Haiku-MediaConverter 283511503 +%d bit MediaFileInfo %d біт +%d byte MediaFileInfo %d біт +Audio: MediaConverter-FileInfo Аудіо: +Cancel MediaConverter Відмінити +Cancelling MediaConverter Відміна +Cancelling… MediaConverter Відміна… +Continue MediaConverter Продовжити +Conversion cancelled MediaConverter Конверсію відмінено +Conversion completed MediaConverter Конверсія завершена +Encoder parameters MediaConverter-EncoderWindow Параметри декодера +End   [ms]: MediaConverter Кінець [ms]: +Error MediaConverter Помилка +Error converting '%filename' MediaConverter Помилка перетворення '%filename' +Error creating '%filename' MediaConverter Помилка створення '%filename' +Error loading a file MediaConverter Помилка загрузки файла +Error loading files MediaConverter Помилка загрузки файлів +Error writing audio frame %Ld MediaConverter Помилка запису аудіо фрагменту %Ld +File Error MediaConverter-FileInfo Помилка файлу +File details MediaConverter Деталі файлу +File format: MediaConverter Формат файлу: +Low MediaConverter Низька +No audio Audio codecs list без звуку +No video Video codecs list Немає відео +None available Audio codecs Не доступний жоден +None available Video codecs Недоступний +OK MediaConverter Гаразд +OK MediaConverter-FileInfo Гаразд +Open… Menu Відкрити… +Output file '%filename' created MediaConverter Вихідний файл '%filename' створено +Output format MediaConverter Вихідний формат +Preview MediaConverter Попередній перегляд +Quit Menu Вийти +Select MediaConverter Вибрати +Select this folder MediaConverter Вибрати цю папку +Source files MediaConverter Джерело файлів +Start [ms]: MediaConverter Старт [ms]: +Video encoding: MediaConverter Кодування відео: +Video quality not supported MediaConverter Якість відео не підтримується +Video: MediaConverter-FileInfo Відео: +seconds MediaFileInfo секунд diff --git a/data/catalogs/apps/mediaplayer/uk.catkeys b/data/catalogs/apps/mediaplayer/uk.catkeys index da7f21eba9..a6f4e5063e 100644 --- a/data/catalogs/apps/mediaplayer/uk.catkeys +++ b/data/catalogs/apps/mediaplayer/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-MediaPlayer 612300642 +1 ukrainian x-vnd.Haiku-MediaPlayer 3494573104 1.85 : 1 (American) MediaPlayer-Main 1.85 : 1 (Амер.) 100% scale MediaPlayer-Main Масштаб 100% 2.35 : 1 (Cinemascope) MediaPlayer-Main 2.35 : 1 (Сінемаскоп) @@ -12,6 +12,7 @@ PlaylistItem-author <невідомий> PlaylistItem-name <неназваний> PlaylistItem-title <безіменний> +All files could not be moved into Trash. MediaPlayer-RemovePLItemsCmd Не вдалося відправити всі файли до кошика. Always on top MediaPlayer-Main Завжди зверху Aspect ratio MediaPlayer-Main Співідношення сторін Attributes MediaPlayer-Main Атрибути @@ -27,8 +28,12 @@ Copy Entries MediaPlayer-CopyPLItemsCmd Копіювати записи Copy Entry MediaPlayer-CopyPLItemsCmd Копіювати запис Drop files to play MediaPlayer-Main Скинути файли для відтворення Edit MediaPlayer-PlaylistWindow Редагувати +Error: MediaPlayer-Main Помилка: +Error: MediaPlayer-RemovePLItemsCmd Помилка: +File info… MediaPlayer-Main Інформація про файл… Full screen MediaPlayer-Main Повний екран Full volume MediaPlayer-SettingsWindow Повна гучність +Gets the URI of the currently playing item. MediaPlayer-Main Отримати URI, який відтворюєтся в даний момент. Gets/sets the volume (0.0-2.0). MediaPlayer-Main Отримання/встановлення гучності (0.0-2.0). Hide interface MediaPlayer-Main Приховати інтерфейс Import Entries MediaPlayer-ImportPLItemsCmd Імпортувати записи @@ -36,6 +41,7 @@ Import Entry MediaPlayer-ImportPLItemsCmd Імпортувати запис Internal error (locking failed). Saving the playlist failed. MediaPlayer-PlaylistWindow Внутрішня помилка (закриття призупинено). Збереження списку відтворення призупинено. Internal error (malformed message). Saving the playlist failed. MediaPlayer-PlaylistWindow Внутрішня помилка (неправильне повідомлення). Збереження списку відтворення призупинено. Internal error (out of memory). Saving the playlist failed. MediaPlayer-PlaylistWindow Внутрішня помилка (закінчилась память). Збереження списку відтворення призупинено. +It appears the media server is not running.\nWould you like to start it ? MediaPlayer-Main Схоже медіа сервер не працює.\nБажаєте запустити його? Large MediaPlayer-SettingsWindow Великий Lock Peaks MediaPlayer-PeakView Блокувати Піки Low volume MediaPlayer-SettingsWindow Мала гучність @@ -46,7 +52,9 @@ Move Entry MediaPlayer-MovePLItemsCmd Перемістити запис Move Into Trash Error MediaPlayer-RemovePLItemsCmd Помилка переміщення в корзину Mute MediaPlayer-Main Заглушити Muted MediaPlayer-SettingsWindow Приглушений +New player… MediaPlayer-Main Новий програвач… Next MediaPlayer-Main Наступний +No aspect correction MediaPlayer-Main Немає корекції погляду None of the files you wanted to play appear to be media files. MediaPlayer-Main Жоден з файлів, які ви хотіли відкрити не є медіа файлами. Nothing to Play MediaPlayer-Main Нічого для відтворення OK MediaPlayer-Main Гаразд @@ -58,11 +66,14 @@ Open MediaPlayer-Main Відкрити Open MediaPlayer-PlaylistWindow Відкрити Open Clips MediaPlayer-Main Відкрити Кліпи Open Playlist MediaPlayer-PlaylistWindow Відкрити список відтворення +Open file… MediaPlayer-Main Відкрити файл… +Open… MediaPlayer-PlaylistWindow Відкрити… Pause MediaPlayer-Main Пауза Pause playback. MediaPlayer-Main Пауза відтворення. Play MediaPlayer-Main Відтворити Play mode MediaPlayer-SettingsWindow Режим відтворення Playlist MediaPlayer-PlaylistWindow Список відтворення +Playlist… MediaPlayer-Main Список відтворення… Prev MediaPlayer-Main Попереднє Quit MediaPlayer-Main Вийти Randomize MediaPlayer-PlaylistWindow Випадковий @@ -72,7 +83,7 @@ Redo MediaPlayer-PlaylistWindow Переробити Remove Entries MediaPlayer-RemovePLItemsCmd Видалити записи Remove Entries into Trash MediaPlayer-RemovePLItemsCmd Знищити записи в кошику Remove Entry MediaPlayer-RemovePLItemsCmd Видалити запис -Remove Entry into Trash MediaPlayer-RemovePLItemsCmd Видалити запис в корзині +Remove Entry into Trash MediaPlayer-RemovePLItemsCmd Видалити запис з кошика Revert MediaPlayer-SettingsWindow Повернути Save MediaPlayer-Main Зберегти Save MediaPlayer-PlaylistWindow Зберегти @@ -80,16 +91,20 @@ Save Playlist MediaPlayer-PlaylistWindow Зберегти список відт Save as… MediaPlayer-PlaylistWindow Зберегти як… Save error MediaPlayer-PlaylistWindow Помилка збереження Saving the playlist failed.\n\nError: MediaPlayer-PlaylistWindow Збереження списку відтворення призупинено.\n\nПомилка: +Saving the playlist failed:\n\nError: MediaPlayer-PlaylistWindow Збереження списку відтворення призупинено:\n\nПомилка: Scale movies smoothly (non-overlay mode) MediaPlayer-SettingsWindow Масштаб зображення зглажений (без режиму накладання) +Settings… MediaPlayer-Main Налаштування… Skip to the next track. MediaPlayer-Main Пропустити до наступного треку Skip to the previous track. MediaPlayer-Main Повернутися до попереднього треку Small MediaPlayer-SettingsWindow Малий +Some files could not be moved into Trash. MediaPlayer-RemovePLItemsCmd Деякі файли не можуть бути переміщені в кошик. Start media server MediaPlayer-Main Запустити Медіа сервер Start playing. MediaPlayer-Main Почати відтворення Stop MediaPlayer-Main Зупинити Stop playing. MediaPlayer-Main Зупинити відтворення Stream settings MediaPlayer-Main Настройки потоку Subtitles MediaPlayer-Main Субтитри +The file'%filename' could not be opened.\n\n MediaPlayer-Main Файл'%filename' неможливо відкрити.\n\n There is no decoder installed to handle the file format, or the decoder has trouble with the specific version of the format. MediaPlayer-Main Немає встановленого декодера щоб підтримував файл цього формату, або у декодера є проблема з спеціальною версією формату. Toggle mute. MediaPlayer-Main Вимкнути звук. Toggle pause/play. MediaPlayer-Main Перемикання пауза/відтворення @@ -102,7 +117,7 @@ Undo MediaPlayer-PlaylistWindow Скасувати Use hardware video overlays if available MediaPlayer-SettingsWindow Використати апаратне відеонакладення Якщо доступне Video MediaPlayer-Main Відео Video track MediaPlayer-Main Відео трек -View options MediaPlayer-SettingsWindow Переглянути налаштування +View options MediaPlayer-SettingsWindow Налаштування перегляду Volume MediaPlayer-Main Гучність none Audio track menu нічого none Subtitles menu нічого diff --git a/data/catalogs/apps/midiplayer/sv.catkeys b/data/catalogs/apps/midiplayer/sv.catkeys index 236ba119fa..ceb92dda64 100644 --- a/data/catalogs/apps/midiplayer/sv.catkeys +++ b/data/catalogs/apps/midiplayer/sv.catkeys @@ -9,11 +9,11 @@ Haiku MIDI Player 1.0.0 beta\n\nThis tiny program\nKnows how to play thousands o Igor's lab Main Window Igor's labb Live input: Main Window Livekälla: MidiPlayer System name MidiSpelare -None Main Window Ingen +None Main Window Inget OK Main Window OK Off Main Window Av Play Main Window Spela -Reverb: Main Window Reverb: +Reverb: Main Window Eko: Scope Main Window Visualisering Stop Main Window Stopp Volume: Main Window Volym: diff --git a/data/catalogs/apps/midiplayer/uk.catkeys b/data/catalogs/apps/midiplayer/uk.catkeys index b192dfc000..efa4ebab10 100644 --- a/data/catalogs/apps/midiplayer/uk.catkeys +++ b/data/catalogs/apps/midiplayer/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-MidiPlayer 3885957623 +1 ukrainian x-vnd.Haiku-MidiPlayer 4180509704 Cavern Main Window Печера Closet Main Window Комірка Could not load song Main Window Не вдалося завантажити мелодію @@ -8,6 +8,7 @@ Garage Main Window Гараж Haiku MIDI Player 1.0.0 beta\n\nThis tiny program\nKnows how to play thousands of\nCheesy sounding songs Main Application This is a haiku. First line has five syllables, second has seven and last has five again. Create your own. Haiku MIDI Player 1.0.0 beta\n\nЦя крихітна програма\nвміє відтворювати тисячі\nпростих мелодій Igor's lab Main Window Лабораторія Ігоря Live input: Main Window Прямий вхід: +MidiPlayer System name Програвач Midi None Main Window Жоден OK Main Window Гаразд Off Main Window Вимкнути diff --git a/data/catalogs/apps/musiccollection/uk.catkeys b/data/catalogs/apps/musiccollection/uk.catkeys new file mode 100644 index 0000000000..6f25bf5faf --- /dev/null +++ b/data/catalogs/apps/musiccollection/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.MusicCollection 3521119930 +Music Collection System name Музична колекція diff --git a/data/catalogs/apps/networkstatus/uk.catkeys b/data/catalogs/apps/networkstatus/uk.catkeys index d3a77eb6fc..76e58d4b2d 100644 --- a/data/catalogs/apps/networkstatus/uk.catkeys +++ b/data/catalogs/apps/networkstatus/uk.catkeys @@ -1,14 +1,22 @@ -1 ukrainian x-vnd.Haiku-NetworkStatus 2046228013 +1 ukrainian x-vnd.Haiku-NetworkStatus 853756860 +%ifaceName information:\n NetworkStatusView %ifaceName інформація:\n NetworkStatusView <Бездротова мережа не знайдена> +Address NetworkStatusView Адреса Broadcast NetworkStatusView Передача Configuring NetworkStatusView Конфігурування Could not join wireless network:\n NetworkStatusView Бездротові мережі не під'єднані:\n Install in Deskbar NetworkStatus Встановити у Deskbar +Launching the network preflet failed.\n\nError: NetworkStatusView Під'єднання мережевого придатку призупинене.\n\nПомилка: Netmask NetworkStatusView Нетмаска +NetworkStatus System name Стан мережі +NetworkStatus options:\n\t--deskbar\tautomatically add replicant to Deskbar\n\t--help\t\tprint this info and exit\n NetworkStatus Стан мережі опції:\n\t--deskbar\tавтоматично додати реплікант до Deskbar\n\t--help\t\tвидрукувати це повідомлення і вийти\n NetworkStatus\n\twritten by %1 and Hugo Santos\n\t%2, Haiku, Inc.\n NetworkStatusView Стан мережі\n\tавтор %1 і Hugo Santos\n\t%2, Haiku, Inc.\n No link NetworkStatusView Посилання відсутнє No stateful configuration NetworkStatusView Немає стабільної конфігурації +OK NetworkStatusView Гаразд Open network preferences… NetworkStatusView Відкрити настройки мережі… +Quit NetworkStatusView Вийти Ready NetworkStatusView Готово Run in window NetworkStatus Запустити у вікні Unknown NetworkStatusView Невідомий +You can run NetworkStatus in a window or install it in the Deskbar. NetworkStatus Ви можете переглянути стан мережі у вікні або встановити в Deskbar. diff --git a/data/catalogs/apps/networktime/zh_hans.catkeys b/data/catalogs/apps/networktime/zh_hans.catkeys deleted file mode 100644 index e96f779887..0000000000 --- a/data/catalogs/apps/networktime/zh_hans.catkeys +++ /dev/null @@ -1 +0,0 @@ -1 simplified_chinese x-vnd.Haiku-NetworkTime 0 diff --git a/data/catalogs/apps/powerstatus/uk.catkeys b/data/catalogs/apps/powerstatus/uk.catkeys index f0b5b2d539..aedf42cbd8 100644 --- a/data/catalogs/apps/powerstatus/uk.catkeys +++ b/data/catalogs/apps/powerstatus/uk.catkeys @@ -1,22 +1,45 @@ -1 ukrainian x-vnd.Haiku-PowerStatus 1297803567 +1 ukrainian x-vnd.Haiku-PowerStatus 1335646776 About PowerStatus про +About… PowerStatus Про… Battery charging PowerStatus Батарея заряджається Battery discharging PowerStatus Батарея розряджена Battery info PowerStatus Дані батареї Battery info… PowerStatus Дані батареї… Battery unused PowerStatus Батарея не використовується +Capacity granularity 1: PowerStatus Градація ємності 1: +Capacity granularity 2: PowerStatus Градація ємності 2: +Capacity: PowerStatus Ємність: +Current rate: PowerStatus Біжучий розряд: +Design capacity low warning: PowerStatus Попередження про зниження проектної ємності: +Design capacity warning: PowerStatus Попередження про проектну ємність: Design capacity: PowerStatus Проектна ємність: +Design voltage: PowerStatus Проектна напруга: +Empty battery slot PowerStatus Слот підключення батареї пустий +Extended battery info PowerStatus Розширені дані батареї Install in Deskbar PowerStatus Встановити в Deskbar +Last full charge: PowerStatus Остання повна зарядка: +Model number: PowerStatus Номер моделі: +OEM info: PowerStatus Дані OEM: OK PowerStatus Гаразд Power status box PowerStatus Вікно стану живлення PowerStatus\nwritten by Axel Dörfler, Clemens Zeidler\nCopyright 2006, Haiku, Inc.\n PowerStatus PowerStatus\nавтори Axel Dörfler, Clemens Zeidler\nCopyright 2006, Haiku, Inc.\n Quit PowerStatus Вийти Run in window PowerStatus Запустити у вікні +Serial number: PowerStatus Серійний номер: Show percent PowerStatus Показати процент Show status icon PowerStatus Показати іконку стану Show text label PowerStatus Показати текстові мітки Show time PowerStatus Показати час +Technology: PowerStatus Технологія: +Type: PowerStatus Тип: +You can run PowerStatus in a window or install it in the Deskbar. PowerStatus Ви можете запустити Стан живлення у вікні або встановити його у Deskbar. charging PowerStatus зарядка discharging PowerStatus розрядка +mA PowerStatus mA +mAh PowerStatus mAh +mV PowerStatus mV +mW PowerStatus mW +mWh PowerStatus mWh +no battery PowerStatus батарея відсутня non-rechargeable PowerStatus той що не може перезаряджатись rechargeable PowerStatus та що може перезаряджатись diff --git a/data/catalogs/apps/readonlybootprompt/sv.catkeys b/data/catalogs/apps/readonlybootprompt/sv.catkeys index 13b41a6c24..a51c289b34 100644 --- a/data/catalogs/apps/readonlybootprompt/sv.catkeys +++ b/data/catalogs/apps/readonlybootprompt/sv.catkeys @@ -3,6 +3,6 @@ Custom BootPromptWindow Anpassad Desktop (Live-CD) BootPromptWindow Skrivbord (Live-CD) Keymap BootPromptWindow Tangentbordslayout Language BootPromptWindow Språk -Run Installer BootPromptWindow Kör Installeraren +Run Installer BootPromptWindow Starta Installeraren Thank you for trying out Haiku! We hope you'll like it!\n\nYou can select your preferred language and keyboard layout from the list on the left which will then be used instantly. You can easily change both settings from the Desktop later on on the fly.\n\nDo you wish to run the Installer or continue booting to the Desktop?\n BootPromptWindow For other languages, a note could be added: \"Note: Localization of Haiku applications and other components is an on-going effort. You will frequently encounter untranslated strings, but if you like, you can join in the work at .\" Tack för att du testar Haiku! Vi hoppas att du kommer att gilla det!\n\nDu kan välja ditt föredragna språk och tangentbordslayout från listan till vänster. Du kan enkelt byta båda inställningarna från skrivbordet senare.\n\nVill du fortsätta att köra Installeraren eller starta fortsätta och starta direkt till skrivbordet?\n Welcome to Haiku! BootPromptWindow Välkommen till Haiku! diff --git a/data/catalogs/apps/showimage/sk.catkeys b/data/catalogs/apps/showimage/sk.catkeys index 906fc7a09f..c590d9dbb8 100644 --- a/data/catalogs/apps/showimage/sk.catkeys +++ b/data/catalogs/apps/showimage/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-ShowImage 2105704395 +1 slovak x-vnd.Haiku-ShowImage 2479358163 %SECONDS seconds Menus Don't translate %SECONDS %SECONDS sekúnd Browse Menus Prechádzať Cancel ClosePrompt Zrušiť @@ -49,6 +49,7 @@ ShowImage System name ZobraziťObrázok Slide delay Menus Oneskorenie snímku Slide show Menus Prezentácia Stretch to window Menus Roztiahnuť do okna +The document '%s' (page %d) has been changed. Do you want to close the document? ClosePrompt Dokument „%s“ (stránka %d) bol zmenený. Chcete dokument zatvoriť? The document '%s' has been changed. Do you want to close the document? ClosePrompt Dokument „%s“ bol zmenený. Chcete dokument zatvoriť? The file '%s' could not be written. SaveToFile Súbor „%s“ nebolo možné zapísať. Undo Menus Vrátiť späť diff --git a/data/catalogs/apps/text_search/fi.catkeys b/data/catalogs/apps/text_search/fi.catkeys index 65e986dbb4..af33bac70c 100644 --- a/data/catalogs/apps/text_search/fi.catkeys +++ b/data/catalogs/apps/text_search/fi.catkeys @@ -1,5 +1,5 @@ 1 finnish x-vnd.Haiku.TextSearch 1180598828 -%APP_NAME couldn't open one or more folders. GrepWindow %APP_NAME ei voitu avata yhtä tai useampaa kansiota. +%APP_NAME couldn't open one or more folders. GrepWindow %APP_NAME ei voinut avata yhtä tai useampaa kansiota. %s: Not enough room to escape the filename. Grepper %s: Ei kylliksi tilaa tiedostonimen ohittamiseen. %s: There was a problem running grep. Grepper %s: Pulma grep-ohjelmaa suoritettaessa. Actions GrepWindow Toiminnot diff --git a/data/catalogs/apps/workspaces/uk.catkeys b/data/catalogs/apps/workspaces/uk.catkeys index 8b293f97bc..7b2b1432b6 100644 --- a/data/catalogs/apps/workspaces/uk.catkeys +++ b/data/catalogs/apps/workspaces/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Be-WORK 576959994 +1 ukrainian x-vnd.Be-WORK 3592128290 About Workspaces… Workspaces Про Робочі простори… Always on top Workspaces Завжди поверх усіх Auto-raise Workspaces Автоматичне спливання @@ -7,5 +7,7 @@ Invalid argument: %s\n Workspaces Невірний аргумент: %s\n OK Workspaces Гаразд Quit Workspaces Вийти Show window border Workspaces Показувати рамку вікна +Show window tab Workspaces Показати закладку вікна Usage: %s [options] [workspace]\nwhere \"options\" is one of:\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 --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 --help\t\tdisplay this help and exit\nand \"workspace\" is the number of the Workspace to which to switch (0-31)\n Workspaces Використання: %s [опції] [простір]\nде \"опції\" одне з:\n --notitle\t\показувати без заголовка зі збереженням його меж.\n --noborder\t\те ж саме але без збереження меж.\n --avoidfocus\t\tне давати вікну захоплювати клавіатуру.\n --alwaysontop\t\tрозташовувати вікно спереду\n --notmovable\t\tзаборона переміщення вікна\n --autoraise\t\Вікно простору спливає коли знаходиться біля краю екрану\n --help\t\tпоказати цей текст і вийти\nі \"простір\" номер потрібного простору, переключається в межах (0-31)\n +Workspaces System name Робочі простори Workspaces\nwritten by %1, and %2.\n\nCopyright %3, Haiku.\n\nSend windows behind using the Option key. Move windows to front using the Control key.\n Workspaces Робочі простори\nавтори by %1, and %2.\n\nCopyright %3, Haiku.\n\nВідправляйте вікно у тло кнопкою Option. Рухайте вікна вперед кнопкою CTRL.\n diff --git a/data/catalogs/bin/desklink/uk.catkeys b/data/catalogs/bin/desklink/uk.catkeys new file mode 100644 index 0000000000..6a78c17167 --- /dev/null +++ b/data/catalogs/bin/desklink/uk.catkeys @@ -0,0 +1,14 @@ +1 ukrainian x-vnd.Haiku-desklink 3053930521 +%g dB MediaReplicant %g dB +%ld dB VolumeControl %ld dB +Beep MediaReplicant Біп +Control physical output MediaReplicant Регулятор фізичного виходу +Couldn't launch MediaReplicant Під'єднання відсутнє +Media preferences… MediaReplicant Настройки медіа… +No media server running VolumeControl Не запущено медіа сервер +OK MediaReplicant Гаразд +Open MediaPlayer MediaReplicant Відкрити MediaPlayer +Options MediaReplicant Опції +Sound preferences… MediaReplicant Настройки звуку… +Volume VolumeControl Гучність +desklink MediaReplicant desklink diff --git a/data/catalogs/bin/dstcheck/uk.catkeys b/data/catalogs/bin/dstcheck/uk.catkeys index 127a1c0ca7..62807cade2 100644 --- a/data/catalogs/bin/dstcheck/uk.catkeys +++ b/data/catalogs/bin/dstcheck/uk.catkeys @@ -1,4 +1,6 @@ -1 ukrainian x-vnd.Haiku-cmd-dstconfig 1891332014 +1 ukrainian x-vnd.Haiku-cmd-dstconfig 2337923203 .\n\nIs this the correct time? dstcheck .\n\nЦей час правильний? -Ask me later dstcheck Запитати мене пізніше -Attention!\n\nBecause of the switch from daylight saving time, your computer's clock may be an hour off.\nYour computer thinks it is dstcheck Увага!\n\nЧерез перехід з літнього часу, годинник вашого комп’ютера може бути зміщеним на годину.\nВін думає, що зараз +Ask me later dstcheck Запитати пізніше +Attention!\n\nBecause of the switch from daylight saving time, your computer's clock may be an hour off.\nYour computer thinks it is dstcheck Увага!\n\nЧерез перехід з літнього часу, годинник вашого комп’ютера може бути зміщеним на годину.\nВін думає, що зараз це є +Manually adjust time… dstcheck Ручна зміна часу… +Use this time dstcheck Використовувати цей час diff --git a/data/catalogs/bin/screen_blanker/uk.catkeys b/data/catalogs/bin/screen_blanker/uk.catkeys new file mode 100644 index 0000000000..4c55932b91 --- /dev/null +++ b/data/catalogs/bin/screen_blanker/uk.catkeys @@ -0,0 +1,4 @@ +1 ukrainian x-vnd.Haiku.screenblanker 3643966493 +Enter password: Screensaver password dialog Введіть гасло: +Unlock Screensaver password dialog Розблокувати +Unlock screen saver Screensaver password dialog Розблокувати Зберігач екрану diff --git a/data/catalogs/kits/locale/be.catkeys b/data/catalogs/kits/locale/be.catkeys index aae2117181..30fde58d61 100644 --- a/data/catalogs/kits/locale/be.catkeys +++ b/data/catalogs/kits/locale/be.catkeys @@ -1,4 +1,4 @@ -1 belarusian system 180647795 +1 belarusian x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f ТіБ %3.2f GiB StringForSize %3.2f ГіБ %3.2f KiB StringForSize %3.2f КіБ diff --git a/data/catalogs/kits/locale/cs.catkeys b/data/catalogs/kits/locale/cs.catkeys index e574a8a2a6..1d13761d19 100644 --- a/data/catalogs/kits/locale/cs.catkeys +++ b/data/catalogs/kits/locale/cs.catkeys @@ -1,4 +1,4 @@ -1 czech system 2686335505 +1 czech x-vnd.Haiku-libbe 2686335505 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/da.catkeys b/data/catalogs/kits/locale/da.catkeys index a0e1725169..7834921183 100644 --- a/data/catalogs/kits/locale/da.catkeys +++ b/data/catalogs/kits/locale/da.catkeys @@ -1,4 +1,4 @@ -1 danish system 2677153267 +1 danish x-vnd.Haiku-libbe 2677153267 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/de.catkeys b/data/catalogs/kits/locale/de.catkeys index b6780c6615..92a37564ea 100644 --- a/data/catalogs/kits/locale/de.catkeys +++ b/data/catalogs/kits/locale/de.catkeys @@ -1,4 +1,4 @@ -1 german system 180647795 +1 german x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/es.catkeys b/data/catalogs/kits/locale/es.catkeys index d70030d6e0..666e7e5672 100644 --- a/data/catalogs/kits/locale/es.catkeys +++ b/data/catalogs/kits/locale/es.catkeys @@ -1,4 +1,4 @@ -1 spanish system 2677153267 +1 spanish x-vnd.Haiku-libbe 2677153267 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/fr.catkeys b/data/catalogs/kits/locale/fr.catkeys index 06c95dd05d..d7c9cc6400 100644 --- a/data/catalogs/kits/locale/fr.catkeys +++ b/data/catalogs/kits/locale/fr.catkeys @@ -1,4 +1,4 @@ -1 french system 180647795 +1 french x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f Tio %3.2f GiB StringForSize %3.2f Gio %3.2f KiB StringForSize %3.2f Kio diff --git a/data/catalogs/kits/locale/it.catkeys b/data/catalogs/kits/locale/it.catkeys index d07d918dbb..853cfdc479 100644 --- a/data/catalogs/kits/locale/it.catkeys +++ b/data/catalogs/kits/locale/it.catkeys @@ -1,4 +1,4 @@ -1 italian system 2686335505 +1 italian x-vnd.Haiku-libbe 2686335505 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/ja.catkeys b/data/catalogs/kits/locale/ja.catkeys index 8ff0b315a9..a8bc69f47d 100644 --- a/data/catalogs/kits/locale/ja.catkeys +++ b/data/catalogs/kits/locale/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese system 180647795 +1 japanese x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/ko.catkeys b/data/catalogs/kits/locale/ko.catkeys index 5e6f006f9d..30eaa9c91b 100644 --- a/data/catalogs/kits/locale/ko.catkeys +++ b/data/catalogs/kits/locale/ko.catkeys @@ -1,4 +1,4 @@ -1 korean system 2677153267 +1 korean x-vnd.Haiku-libbe 2677153267 %.2f TiB StringForSize %.2f 테라 이진 바이트 %3.2f GiB StringForSize %3.2f 기가 이진 바이트 %3.2f KiB StringForSize %3.2f 킬로 이진 바이트 diff --git a/data/catalogs/kits/locale/lt.catkeys b/data/catalogs/kits/locale/lt.catkeys index 4196da0b54..f3eb6bb9fd 100644 --- a/data/catalogs/kits/locale/lt.catkeys +++ b/data/catalogs/kits/locale/lt.catkeys @@ -1,4 +1,4 @@ -1 lithuanian system 1448968507 +1 lithuanian x-vnd.Haiku-libbe 1448968507 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/nb.catkeys b/data/catalogs/kits/locale/nb.catkeys index 15608a5fa4..76a915f27a 100644 --- a/data/catalogs/kits/locale/nb.catkeys +++ b/data/catalogs/kits/locale/nb.catkeys @@ -1,4 +1,4 @@ -1 norwegian_bokmål system 320832488 +1 norwegian_bokmål x-vnd.Haiku-libbe 320832488 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/nl.catkeys b/data/catalogs/kits/locale/nl.catkeys index fde66c6bbd..ef727acda2 100644 --- a/data/catalogs/kits/locale/nl.catkeys +++ b/data/catalogs/kits/locale/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch system 1624661606 +1 dutch x-vnd.Haiku-libbe 1624661606 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/pl.catkeys b/data/catalogs/kits/locale/pl.catkeys index 76e202caab..24d1f19c2b 100644 --- a/data/catalogs/kits/locale/pl.catkeys +++ b/data/catalogs/kits/locale/pl.catkeys @@ -1,4 +1,4 @@ -1 polish system 1624661606 +1 polish x-vnd.Haiku-libbe 1624661606 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/pt.catkeys b/data/catalogs/kits/locale/pt.catkeys index 7687339be5..f885157dac 100644 --- a/data/catalogs/kits/locale/pt.catkeys +++ b/data/catalogs/kits/locale/pt.catkeys @@ -1,4 +1,4 @@ -1 portuguese system 1448968507 +1 portuguese x-vnd.Haiku-libbe 1448968507 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/pt_br.catkeys b/data/catalogs/kits/locale/pt_br.catkeys index bb1549c625..203853f771 100644 --- a/data/catalogs/kits/locale/pt_br.catkeys +++ b/data/catalogs/kits/locale/pt_br.catkeys @@ -1,2 +1,2 @@ -1 brazilian_portuguese system 1228184760 +1 brazilian_portuguese x-vnd.Haiku-libbe 1228184760 %d bytes StringForSize %d bytes diff --git a/data/catalogs/kits/locale/ro.catkeys b/data/catalogs/kits/locale/ro.catkeys index 816150101f..db6b53e8aa 100644 --- a/data/catalogs/kits/locale/ro.catkeys +++ b/data/catalogs/kits/locale/ro.catkeys @@ -1,4 +1,4 @@ -1 romanian system 1624661606 +1 romanian x-vnd.Haiku-libbe 1624661606 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/ru.catkeys b/data/catalogs/kits/locale/ru.catkeys index 2a80928bc4..9c58952a06 100644 --- a/data/catalogs/kits/locale/ru.catkeys +++ b/data/catalogs/kits/locale/ru.catkeys @@ -1,4 +1,4 @@ -1 russian system 180647795 +1 russian x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f Тбайт %3.2f GiB StringForSize %3.2f Гбайт %3.2f KiB StringForSize %3.2f Кбайт diff --git a/data/catalogs/kits/locale/sv.catkeys b/data/catalogs/kits/locale/sv.catkeys index 417251ba98..f098f3adf8 100644 --- a/data/catalogs/kits/locale/sv.catkeys +++ b/data/catalogs/kits/locale/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish system 180647795 +1 swedish x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/locale/uk.catkeys b/data/catalogs/kits/locale/uk.catkeys index 24ed293e08..8165a986e4 100644 --- a/data/catalogs/kits/locale/uk.catkeys +++ b/data/catalogs/kits/locale/uk.catkeys @@ -1,15 +1,34 @@ -1 ukrainian system 845452856 +1 ukrainian x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB %3.2f MiB StringForSize %3.2f MiB %d bytes StringForSize %d байт + Menu <пусто> +About %app% AboutMenuItem Про %app% +About %app… Dragger Про %app… About… AboutWindow Про… Blue: ColorControl Синій: +Can't delete this replicant from its original application. Life goes on. Dragger Неможливо видалити реплікант з рідного додатку. Життя продовжується. +Cannot create the replicant for \"%description\".\n%error ZombieReplicantView Неможливо створити реплікант для \"%опису\".\n%помилки +Cannot locate the application for the replicant. No application signature supplied.\n%error ZombieReplicantView Неможливо визначити додаток для репліканту. Незнайдено сигнатуру додатку.\n%помилка Close AboutWindow Закрити Copy TextView Копіювати +Copyright © %years% Haiku, Inc. AboutWindow Copyright © %years% Haiku, Inc. +Cut TextView Вирізати +Error PrintJob Помилка +Error ZombieReplicantView Помилка Green: ColorControl Зелений: +No Pages to print! PrintJob Жодної сторінки для друку! +OK Dragger Гаразд +OK PrintJob Гаразд +OK ZombieReplicantView Гаразд +Paste TextView Вставити +Print Server is not responding. PrintJob Принт сервер недоступний. Red: ColorControl Червоний: Redo TextView Відмінити відміну +Remove replicant Dragger Видалити реплікант +Select All TextView Вибрати все Undo TextView Відмінити +Warning Dragger Увага Written by: AboutWindow Автор: diff --git a/data/catalogs/kits/locale/zh_hans.catkeys b/data/catalogs/kits/locale/zh_hans.catkeys index da48231682..9a47a1388a 100644 --- a/data/catalogs/kits/locale/zh_hans.catkeys +++ b/data/catalogs/kits/locale/zh_hans.catkeys @@ -1,4 +1,4 @@ -1 simplified_chinese system 180647795 +1 simplified_chinese x-vnd.Haiku-libbe 180647795 %.2f TiB StringForSize %.2f TiB %3.2f GiB StringForSize %3.2f GiB %3.2f KiB StringForSize %3.2f KiB diff --git a/data/catalogs/kits/mail/be.catkeys b/data/catalogs/kits/mail/be.catkeys new file mode 100644 index 0000000000..e1a5b4d8e5 --- /dev/null +++ b/data/catalogs/kits/mail/be.catkeys @@ -0,0 +1,10 @@ +1 belarusian x-vnd.Haiku-libmail 161731481 +Connection type: ProtocolConfigView Тып злучэння: +Leave mail on server ProtocolConfigView Пакідаць паведамленні на серверы +Login type: ProtocolConfigView Тып уваходу: +Mail server: ProtocolConfigView Сервер пошты: +Partially download messages larger than ProtocolConfigView Часткова спампоўваць паведамленні большыя за +Password: ProtocolConfigView Пароль: +Remove mail from server when deleted ProtocolConfigView Выдаляць паведамленні з сервера +Select… MailKit Абраць… +Username: ProtocolConfigView Імя карыстальніка: diff --git a/data/catalogs/kits/mail/uk.catkeys b/data/catalogs/kits/mail/uk.catkeys new file mode 100644 index 0000000000..ad403ab52f --- /dev/null +++ b/data/catalogs/kits/mail/uk.catkeys @@ -0,0 +1,10 @@ +1 ukrainian x-vnd.Haiku-libmail 161731481 +Connection type: ProtocolConfigView Тип підключення: +Leave mail on server ProtocolConfigView Зберігати пошту на сервер +Login type: ProtocolConfigView Тип логування: +Mail server: ProtocolConfigView Поштовий сервер: +Partially download messages larger than ProtocolConfigView Завантажувати частково повідомлення більші ніж +Password: ProtocolConfigView Гасло: +Remove mail from server when deleted ProtocolConfigView Видалити пошту з серверу після знищення +Select… MailKit Вибрати… +Username: ProtocolConfigView Користувач: diff --git a/data/catalogs/kits/tracker/de.catkeys b/data/catalogs/kits/tracker/de.catkeys index 7c3b9d31d8..94ab6e33df 100644 --- a/data/catalogs/kits/tracker/de.catkeys +++ b/data/catalogs/kits/tracker/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-libtracker 2699246155 +1 german x-vnd.Haiku-libtracker 3486294898 %BytesPerSecond/s StatusWindow %BytesPerSecond/s %Ld B WidgetAttributeText %Ld B %Ld bytes WidgetAttributeText %Ld Bytes @@ -38,6 +38,7 @@ An item named \"%name\" already exists in this folder. Would you like to replace And FindPanel Und Are you sure you want to delete the selected item(s)? This operation cannot be reverted. FSUtils Sollen die ausgewählten Objekte wirklich gelöscht werden? Diese Aktion kann nicht rückgängig gemacht werden. Are you sure you want to move or copy the selected item(s) to this folder? PoseView Sollen die ausgewählten Dateien wirklich in diesen Ordner kopiert oder bewegt werden? +Arrange by ContainerWindow Icons ordnen nach Ask before delete SettingsView Vor dem Leeren nachfragen At %func \nfind_directory() failed. \nReason: %error TrackerInitialState Bei %func \nfind_directory() fehlgeschlagen \nGrund: %error Attributes ContainerWindow Attribute @@ -301,6 +302,7 @@ Resize to fit QueryContainerWindow Optimale Größe Resize to fit VolumeWindow Optimale Größe Restore ContainerWindow Wiederherstellen Restoring: StatusWindow Wiederherstellen von: +Reverse order ContainerWindow Reihenfolge umkehren Revert TrackerSettingsWindow Rückgängig Save FilePanelPriv Speichern Save FindPanel Speichern diff --git a/data/catalogs/kits/tracker/fi.catkeys b/data/catalogs/kits/tracker/fi.catkeys index cd7ea4c865..6450873cb2 100644 --- a/data/catalogs/kits/tracker/fi.catkeys +++ b/data/catalogs/kits/tracker/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-libtracker 2699246155 +1 finnish x-vnd.Haiku-libtracker 3486294898 %BytesPerSecond/s StatusWindow %BytesPerSecond/s %Ld B WidgetAttributeText %Ld tavua %Ld bytes WidgetAttributeText %Ld tavua @@ -38,6 +38,7 @@ An item named \"%name\" already exists in this folder. Would you like to replace And FindPanel Ja Are you sure you want to delete the selected item(s)? This operation cannot be reverted. FSUtils Oletko varma, että haluat poistaa valitut kohteet? Tätä toimintoa ei voi palauttaa. Are you sure you want to move or copy the selected item(s) to this folder? PoseView Oletko varma, että haluat kopioida tai siirtää valitut kohteet tähän kansioon? +Arrange by ContainerWindow Järjestä: Ask before delete SettingsView Kysy ennen poistoa At %func \nfind_directory() failed. \nReason: %error TrackerInitialState Funktio %func kohteessa\nfind_directory() epäonnistui. \nSyy: %error Attributes ContainerWindow Attribuutit @@ -301,6 +302,7 @@ Resize to fit QueryContainerWindow Muuta koko sopimaan Resize to fit VolumeWindow Muunna koko sopimaan Restore ContainerWindow Palauta Restoring: StatusWindow Palautetaan: +Reverse order ContainerWindow Käännä järjestys Revert TrackerSettingsWindow Palauta Save FilePanelPriv Tallenna Save FindPanel Tallenna diff --git a/data/catalogs/kits/tracker/sk.catkeys b/data/catalogs/kits/tracker/sk.catkeys index e0f57abb12..9541822529 100644 --- a/data/catalogs/kits/tracker/sk.catkeys +++ b/data/catalogs/kits/tracker/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-libtracker 2178365750 +1 slovak x-vnd.Haiku-libtracker 2574176493 %BytesPerSecond/s StatusWindow %BytesPerSecond/s %Ld B WidgetAttributeText %Ld B %Ld bytes WidgetAttributeText %Ld bajtov @@ -137,7 +137,6 @@ Error copying folder \"%name\":\n\t%error\n\nWould you like to continue? FSUtils Error creating link to \"%name\". FSUtils Chyba pri vytváraní odkazu „%name“ Error deleting items FSUtils Chyba pri mazaní položiek Error emptying Trash! FSUtils Chyba pri vyprázdňovaní Koša! -Error in regular expression:\n\n'%errstring' PoseView Chyba v regulárnom výraze:\n\n'%errstring' Error moving \"%name\" FSUtils Chyba pri presúvaní „%name“ Error moving \"%name\" to Trash. (%error) FSUtils Chyba pri presúvaní „%name“ do Koša. (%error) diff --git a/data/catalogs/kits/tracker/sv.catkeys b/data/catalogs/kits/tracker/sv.catkeys index 3416d8776e..b9c815424b 100644 --- a/data/catalogs/kits/tracker/sv.catkeys +++ b/data/catalogs/kits/tracker/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-libtracker 2699246155 +1 swedish x-vnd.Haiku-libtracker 3486294898 %BytesPerSecond/s StatusWindow %BytesPerSecond/s %Ld B WidgetAttributeText %Ld B %Ld bytes WidgetAttributeText %Ld byte @@ -38,6 +38,7 @@ An item named \"%name\" already exists in this folder. Would you like to replace And FindPanel Och Are you sure you want to delete the selected item(s)? This operation cannot be reverted. FSUtils Är du säker på att du vill radera de valda objekten? Denna operation kan inte ångras. Are you sure you want to move or copy the selected item(s) to this folder? PoseView Är du säker på att du vill flytta eller kopiera dom valda objekt(en) till denna mapp? +Arrange by ContainerWindow Sortera efter Ask before delete SettingsView Fråga innan borttagning At %func \nfind_directory() failed. \nReason: %error TrackerInitialState I %func \nfind_directory() misslyckades. \nOrsak: %error Attributes ContainerWindow Attribut @@ -301,6 +302,7 @@ Resize to fit QueryContainerWindow Anpassa Resize to fit VolumeWindow Skala till passform Restore ContainerWindow Återställ Restoring: StatusWindow Återställer: +Reverse order ContainerWindow Omvänd ordning Revert TrackerSettingsWindow Återställ Save FilePanelPriv Spara Save FindPanel Spara diff --git a/data/catalogs/preferences/appearance/be.catkeys b/data/catalogs/preferences/appearance/be.catkeys index 5412fbb051..9387a02948 100644 --- a/data/catalogs/preferences/appearance/be.catkeys +++ b/data/catalogs/preferences/appearance/be.catkeys @@ -1,8 +1,11 @@ -1 belarusian x-vnd.Haiku-Appearance 3187486915 +1 belarusian x-vnd.Haiku-Appearance 3577998894 +About DecorSettingsView Пра Праграму +About Decerator DecorSettingsView Пра Дэкаратар Antialiasing APRWindow Згладжванне Antialiasing menu AntialiasingSettingsView Меню згладжвання Antialiasing type: AntialiasingSettingsView Тып згладжвання Appearance System name Афармленне +Choose Decorator DecorSettingsView Абраць Дэкаратар Colors APRWindow Колеры Control background Colors tab Фон кнопак Control border Colors tab Аблямоўка кнопак @@ -23,6 +26,7 @@ Menu item text Colors tab Тэкст пунктаў меню Monospaced fonts only AntialiasingSettingsView Толькі монашырынныя шрыфты Navigation base Colors tab Базавы колер навігацыі Navigation pulse Colors tab Колер падсветкі навігацыі +OK DecorSettingsView Так Off AntialiasingSettingsView Выкл. On AntialiasingSettingsView Укл. Panel background Colors tab Фон панэлі @@ -39,5 +43,7 @@ Subpixel based anti-aliasing in combination with glyph hinting is not available Success Colors tab Паспяхова Tooltip background Colors tab Фон падказкі Tooltip text Colors tab Тэкст падказак +Window Decorator APRWindow Дэкаратар Вакон +Window Decorator: DecorSettingsView Дэкаратар Вакон: Window tab Colors tab Ўкладка вакна Window tab text Colors tab Тэкст загалоўку акна diff --git a/data/catalogs/preferences/appearance/de.catkeys b/data/catalogs/preferences/appearance/de.catkeys index 38d28dae98..525d07d5c3 100644 --- a/data/catalogs/preferences/appearance/de.catkeys +++ b/data/catalogs/preferences/appearance/de.catkeys @@ -1,8 +1,11 @@ -1 german x-vnd.Haiku-Appearance 3187486915 +1 german x-vnd.Haiku-Appearance 3577998894 +About DecorSettingsView Über +About Decerator DecorSettingsView Über Dekorator Antialiasing APRWindow Kantenglättung Antialiasing menu AntialiasingSettingsView Kantenglättungs-Menü Antialiasing type: AntialiasingSettingsView Kantenglättungstyp: Appearance System name Erscheinungsbild +Choose Decorator DecorSettingsView Dekorator wählen Colors APRWindow Farben Control background Colors tab Steuerelement - Hintergrund Control border Colors tab Steuerelement - Rahmen @@ -23,6 +26,7 @@ Menu item text Colors tab Menü - Text Monospaced fonts only AntialiasingSettingsView Nur nicht-proportionale Schriften Navigation base Colors tab Navigation - Grundfarbe Navigation pulse Colors tab Navigation - Leuchtfarbe +OK DecorSettingsView OK Off AntialiasingSettingsView Aus On AntialiasingSettingsView Ein Panel background Colors tab Oberfläche - Hintergrund @@ -39,5 +43,7 @@ Subpixel based anti-aliasing in combination with glyph hinting is not available Success Colors tab Erfolg Tooltip background Colors tab Tooltip - Hintergrund Tooltip text Colors tab Tooltip - Text +Window Decorator APRWindow Dekorator +Window Decorator: DecorSettingsView Fenster-Dekorator: Window tab Colors tab Reiter Window tab text Colors tab Reiter - Text diff --git a/data/catalogs/preferences/appearance/uk.catkeys b/data/catalogs/preferences/appearance/uk.catkeys index 04d37c387b..48dfd32ce2 100644 --- a/data/catalogs/preferences/appearance/uk.catkeys +++ b/data/catalogs/preferences/appearance/uk.catkeys @@ -1,7 +1,11 @@ -1 ukrainian x-vnd.Haiku-Appearance 1227622574 +1 ukrainian x-vnd.Haiku-Appearance 3577998894 +About DecorSettingsView Про +About Decerator DecorSettingsView Про Декоратор Antialiasing APRWindow Зглажування Antialiasing menu AntialiasingSettingsView Меню зглажування Antialiasing type: AntialiasingSettingsView Тип зглажування: +Appearance System name Оформлення +Choose Decorator DecorSettingsView Вибір декоратора Colors APRWindow Кольори Control background Colors tab Тло елементу Control border Colors tab Межа елемента @@ -22,6 +26,7 @@ Menu item text Colors tab Текст пункта меню Monospaced fonts only AntialiasingSettingsView Тільки моноширинні шрифти Navigation base Colors tab Основа навігації Navigation pulse Colors tab Навігація рulse +OK DecorSettingsView Згода Off AntialiasingSettingsView Слабе On AntialiasingSettingsView Увімкнути Panel background Colors tab Панель @@ -38,5 +43,7 @@ Subpixel based anti-aliasing in combination with glyph hinting is not available Success Colors tab Успіх Tooltip background Colors tab Тло підказки Tooltip text Colors tab Текст підказки +Window Decorator APRWindow Декоратор вікна +Window Decorator: DecorSettingsView Декоратор вікна: Window tab Colors tab Заголовок вікна Window tab text Colors tab Текст заголовка вікна diff --git a/data/catalogs/preferences/backgrounds/uk.catkeys b/data/catalogs/preferences/backgrounds/uk.catkeys index 534ebd1016..9e067a1db9 100644 --- a/data/catalogs/preferences/backgrounds/uk.catkeys +++ b/data/catalogs/preferences/backgrounds/uk.catkeys @@ -1,6 +1,7 @@ -1 ukrainian x-vnd.Haiku-Backgrounds 4220509773 +1 ukrainian x-vnd.Haiku-Backgrounds 3513602073 All workspaces Main View На всі робочі простори Apply Main View Використати +Backgrounds System name Тло Center Main View Відцентрувати Current workspace Main View Поточний робочий простір Default Main View По замовчуванню diff --git a/data/catalogs/preferences/bluetooth/uk.catkeys b/data/catalogs/preferences/bluetooth/uk.catkeys index fe4d49d12e..12e9ecdeeb 100644 --- a/data/catalogs/preferences/bluetooth/uk.catkeys +++ b/data/catalogs/preferences/bluetooth/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-BluetoothPrefs 4253957200 +1 ukrainian x-vnd.Haiku-BluetoothPrefs 4055730587 15 secs Settings view 15 сек. 61 secs Settings view 61 сек. About Bluetooth… Window Про Bluetooth… @@ -7,6 +7,7 @@ Add… Remote devices Додати… Always ask Settings view Завжди питати As blocked Remote devices Як заблокований Authenticate Extended local device view Справдити +Bluetooth System name Bluetooth Check that the Bluetooth capabilities of your remote device are activated. Press 'Inquiry' to start scanning. The needed time for the retrieval of the names is unknown, although should not take more than 3 seconds per device. Afterwards you will be able to add them to your main list, where you will be able to pair with them. Inquiry panel Переконайтесь, що функція Bluetooth віддаленого пристрою активована. Натисніть «Запит» для початку сканування. Час для отримання імен не повинен перевищувати 3 секунди. Після цього ви зможете додати їх до головного списку, де потім з’єднуватися з ними. Connections & channels… Window Список під'єднань і каналів… Default inquiry time: Settings view Час запиту по замовчуванню: diff --git a/data/catalogs/preferences/cpufrequency/uk.catkeys b/data/catalogs/preferences/cpufrequency/uk.catkeys index 519bdc87d2..2c20666d13 100644 --- a/data/catalogs/preferences/cpufrequency/uk.catkeys +++ b/data/catalogs/preferences/cpufrequency/uk.catkeys @@ -1,11 +1,13 @@ -1 ukrainian x-vnd.Haiku-CPUFrequencyPref 407096520 +1 ukrainian x-vnd.Haiku-CPUFrequencyPref 3079996868 CPU frequency status view CPU Frequency View Статистика частоти ЦП +CPUFrequency System name Частота процесора CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n Status view Частота процесора\n\Автор Клеменс Зейдлер\n\tCopyright 2009, Haiku, Inc.\n Defaults Pref Window По замовчуванню Dynamic performance Status view Динамічна продуктивність Dynamic stepping CPU Frequency View Динамічна зміна High performance Status view Висока продуктивність Install replicant into Deskbar CPU Frequency View Встановити реплікант в Deskbar +Integration time [ms]: CPU Frequency View Час інтеграції [мс]: Launching the CPU frequency preflet failed.\n\nError: Status view Програму Частота процесора не вдалося запустити.\n\nПомилка: Low energy Status view Мале споживання Ok Status view Гаразд @@ -15,3 +17,4 @@ Revert Pref Window Повернути Set state Status view Встановити стан Step up by CPU usage Color Step View Крок вгору по продуктивності ЦП: Stepping policy CPU Frequency View Настройка кроку зміни частоти ЦП +Stepping policy: CPU Frequency View Настройка кроку зміни частоти ЦП: diff --git a/data/catalogs/preferences/datatranslations/uk.catkeys b/data/catalogs/preferences/datatranslations/uk.catkeys index 5d9461ae29..ff476ddcc0 100644 --- a/data/catalogs/preferences/datatranslations/uk.catkeys +++ b/data/catalogs/preferences/datatranslations/uk.catkeys @@ -1,14 +1,18 @@ -1 ukrainian x-vnd.Haiku-DataTranslations 3458095697 +1 ukrainian x-vnd.Haiku-DataTranslations 3820343452 An item named '%name' already exists in the Translators folder! Shall the existing translator be overwritten? DataTranslations Елемент з назвою '%name' повністю присутній у папці Перетворювачів! Переписати існуючий Перетворювач? Cancel DataTranslations Відміна Could not install %s:\n%s DataTranslations Неможливо встановити %s:\n%s +DataTranslations System name Перетворення даних +DataTranslations - Error DataTranslations Перетворення даних - Помилка DataTranslations - Note DataTranslations Перетворення даних — Заувага Info DataTranslations інформація Info: DataTranslations Інформація: Name: DataTranslations І’мя: +Name: %s \nVersion: %ld.%ld.%ld\n\nInfo:\n%s\n\nPath:\n%s\n DataTranslations Ім'я: %s \nВерсія: %ld.%ld.%ld\n\nІнфо:\n%s\n\nШлях:\n%s\n OK DataTranslations Гаразд Overwrite DataTranslations Перезаписати Path: DataTranslations Шлях: The item '%name' does not appear to be a Translator and will not be installed. DataTranslations Елемент '%name' не є перетворювачем і його не буде встановлено. The new translator has been installed successfully. DataTranslations Новий транслятор був успішно встановлений. +Use this control panel to set default values for translators, to be used when no other settings are specified by an application. DataTranslations Використовуйте цю панель для встановлення параметрів по замовчуванню для перетворювачів, особливо коли вони не визначені додатком. Version: DataTranslations Версія: diff --git a/data/catalogs/preferences/deskbar/uk.catkeys b/data/catalogs/preferences/deskbar/uk.catkeys new file mode 100644 index 0000000000..93d6b76ba5 --- /dev/null +++ b/data/catalogs/preferences/deskbar/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.Haiku-DeskbarPreferences 2340471461 +Deskbar System name Deskbar diff --git a/data/catalogs/preferences/filetypes/sk.catkeys b/data/catalogs/preferences/filetypes/sk.catkeys index 75a1cea48e..5c1370a62e 100644 --- a/data/catalogs/preferences/filetypes/sk.catkeys +++ b/data/catalogs/preferences/filetypes/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-FileTypes 3046973565 +1 slovak x-vnd.Haiku-FileTypes 473999706 %1 application type Application Type Window %1 typ aplikácie %ld Application type%s could be removed. Application Types Window %ld Typ aplikácie %s možno ostrániť. %s file type FileType Window typ súboru %s @@ -49,6 +49,7 @@ Default application FileType Window Predvolená aplikácia Description FileTypes Window Popis Description: Application Types Window Popis: Description: FileTypes Window Popis: +Development Application Type Window Vývoj Development Application Types Window Vývojové Display as: Attribute Window Tracker offers different display modes for attributes. Zobraziť ako: Do you want to save the changes? Application Type Window Chcete uložiť zmeny? @@ -74,6 +75,7 @@ FileTypes request FileTypes Požiadavka Typy súborov FileTypes request FileTypes Window Požiadavka Typy súborov FileTypes request Preferred App Menu Požiadavka Typy súborov Final Application Type Window Finálne +Final Application Types Window Finálne Gamma Application Type Window Gama Gamma Application Types Window Gama Golden master Application Type Window Hlavný originál @@ -141,6 +143,7 @@ Signature: Application Types Window Podpis: Single launch Application Type Window Jednoduché spustenie Special: Attribute Window Špeciálne: Supported types Application Type Window Podporované typy +The application \"%s\" does not support this file type.\nAre you sure you want to set it anyway? Preferred App Menu Aplikácia „%s“ nepodporuje tento typ súboru.\nSte si istý, že ju chcete nastaviť napriek tomu? This file type already exists New File Type Window Tento typ súboru už existuje Type name: FileTypes Window Názov typu: Type: Attribute Window Typ: diff --git a/data/catalogs/preferences/filetypes/uk.catkeys b/data/catalogs/preferences/filetypes/uk.catkeys index e56d7fc30f..c5b73ee1fc 100644 --- a/data/catalogs/preferences/filetypes/uk.catkeys +++ b/data/catalogs/preferences/filetypes/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-FileTypes 15913470 +1 ukrainian x-vnd.Haiku-FileTypes 473999706 %1 application type Application Type Window %1 тип додатку %ld Application type%s could be removed. Application Types Window %ld Додаток type%s Неможливо видалити. %s file type FileType Window %s тип файлу @@ -12,15 +12,18 @@ Add icon… Icon View Додати іконку… Add new group New File Type Window Додати нову групу Add type New File Type Window Додати тип Add… Application Type Window Додати… +Add… FileTypes Window Додати… Alignment: Attribute Window Вирівнювання: Alpha Application Type Window Альфа Alpha Application Types Window Aльфа Application flags Application Type Window Флаги додатку Application type Application Type Window Тип додатку Application types Application Types Window Типи додатків +Application types… FileTypes Window Типи додатків… Args only Application Type Window Тільки аргументи Attribute Attribute Window Атрибут Attribute name: Attribute Window Ім'я атрибута: +Background app Application Type Window Додаток Тло Beta Application Type Window Бета Beta Application Types Window Бета Cancel Application Type Window Відмінити @@ -67,6 +70,7 @@ File could not be opened Preferred App Menu Файл неможливо від File recognition FileTypes Window Розпізнання файлу File type FileType Window Тип файлу FileTypes FileTypes Типи Файлів +FileTypes System name Типи файлів FileTypes request FileTypes Запит Типів Файлів FileTypes request FileTypes Window Запит Типів Файлів FileTypes request Preferred App Menu Запит Типів Файлів @@ -98,6 +102,7 @@ New resource file… FileTypes Window Новий файл ресурсів… None FileTypes Window Немає OK FileTypes Гаразд Open file FileTypes Відкрити файл +Open… FileTypes Window Відкрити… Path: Application Types Window Шлях: Preferred application FileType Window Бажаний додаток Preferred application FileTypes Window Бажаний додаток @@ -114,6 +119,9 @@ Removing a super type cannot be reverted.\nAll file types that belong to this su Removing uninstalled application types Application Types Window Видалення типів для невстановлених додатків Right Attribute Window Attribute column alignment in Tracker Вправо Rule: FileTypes Window Правило: +Same as… FileType Window The same APPLICATION as ... Такий як… Заувага: такий додаток як ... +Same as… FileType Window The same TYPE as ... Такий як… Заувага: такий тип як ... +Same as… FileTypes Window Такий як… Save Application Type Window Зберегти Save into resource file… Application Type Window Зберегти інформацію про джерело файлу… Save request Application Type Window Зберегти запит @@ -121,8 +129,9 @@ Select preferred application FileType Window Вибрати бажаний до Select preferred application FileTypes Window Вибрати бажаний додаток Select same preferred application as FileType Window Вибрати за бажаний додаток Select same preferred application as FileTypes Window Вибрати такий самий бажаний додаток як -Select same type as FileType Window Вибрати такий самий тип як +Select same type as FileType Window Вибрати такий тип як Select… FileType Window Вибрати… +Select… FileTypes Window Вибрати… Set Preferred Application Preferred App Menu Встановити бажаний додаток Settings FileTypes Window Налаштування Short description: Application Type Window Короткий опис: diff --git a/data/catalogs/preferences/fonts/uk.catkeys b/data/catalogs/preferences/fonts/uk.catkeys index a251598f19..9c6e6461c8 100644 --- a/data/catalogs/preferences/fonts/uk.catkeys +++ b/data/catalogs/preferences/fonts/uk.catkeys @@ -1,7 +1,9 @@ -1 ukrainian x-vnd.Haiku-Fonts 2902081521 +1 ukrainian x-vnd.Haiku-Fonts 4164233892 Bold font: Font view Виділений шрифт: Defaults Main window По замовчуванню Fixed font: Font view Моноширний шрифт: +Fonts System name Шрифти +Fonts\n\tCopyright 2004-2005, Haiku.\n\n main Шрифти\n\tCopyright 2004-2005, Haiku.\n\n Menu font: Font view Шрифт меню: OK main Гаразд Plain font: Font view Простий шрифт: diff --git a/data/catalogs/preferences/keyboard/uk.catkeys b/data/catalogs/preferences/keyboard/uk.catkeys index 58c37f7b0f..03f05c5249 100644 --- a/data/catalogs/preferences/keyboard/uk.catkeys +++ b/data/catalogs/preferences/keyboard/uk.catkeys @@ -1,8 +1,9 @@ -1 ukrainian x-vnd.Haiku-Keyboard 1078858058 +1 ukrainian x-vnd.Haiku-Keyboard 1711838804 Defaults KeyboardWindow По замовчуванню Delay until key repeat KeyboardView Затримка при повторі Fast KeyboardView Швидко Key repeat rate KeyboardView Швидкість повтору клавіші +Keyboard System name Клавіатура Long KeyboardView Довго OK KeyboardApplication Гаразд Revert KeyboardWindow Повернути diff --git a/data/catalogs/preferences/keymap/uk.catkeys b/data/catalogs/preferences/keymap/uk.catkeys index ae94a8f3f4..8c59a684d1 100644 --- a/data/catalogs/preferences/keymap/uk.catkeys +++ b/data/catalogs/preferences/keymap/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-Keymap 3858687220 +1 ukrainian x-vnd.Haiku-Keymap 1259868356 (Current) Keymap window (Активна) Acute trigger Keymap window Акюте Circumflex trigger Keymap window Ціркумфлекс @@ -6,6 +6,7 @@ Diaeresis trigger Keymap window Діарезіс File Keymap window Файл Font Keymap window Шрифт Grave trigger Keymap window Апостроф +Keymap System name Розкладка Layout Keymap window Макет Open… Keymap window Відкрити… Quit Keymap window Вихід diff --git a/data/catalogs/preferences/locale/uk.catkeys b/data/catalogs/preferences/locale/uk.catkeys index 5325f95906..bb106f2951 100644 --- a/data/catalogs/preferences/locale/uk.catkeys +++ b/data/catalogs/preferences/locale/uk.catkeys @@ -1,24 +1,31 @@ -1 ukrainian x-vnd.Haiku-Locale 558426720 +1 ukrainian x-vnd.Haiku-Locale 1488345554 12 hour TimeFormatSettings 12 годин 24 hour TimeFormatSettings 24 години Available languages Locale Preflet Window Доступні мови +Cancel Locale Preflet Window Відміна Currency TimeFormatSettings Валюта Date TimeFormatSettings Дата Defaults Locale Preflet Window По замовчуванню +Deskbar and Tracker need to be restarted for this change to take effect. Would you like to restart them now? Locale Preflet Window Deskbar і Tracker потребують перезавантаження для вступу змін в силу. Ви бажаєте перезавантажитись? Formatting Locale Preflet Window Форматування Full format: TimeFormatSettings Повний формат: Language Locale Preflet Window Мова Locale Locale Preflet Локаль Locale Locale Preflet Window Локаль +Locale System name Локаль +Long format: TimeFormatSettings Звичний формат: Medium format: TimeFormatSettings Середній формат: Negative: TimeFormatSettings Негатив: Numbers TimeFormatSettings Номери OK Locale Preflet Window Гаразд +Options Locale Preflet Window Опції Positive: TimeFormatSettings Позитив: Preferred languages Locale Preflet Window Мови, що переважають +Restart Locale Preflet Window Перезавантаження Revert Locale Preflet Window Повернути Short format: TimeFormatSettings Скорочений формат: Time TimeFormatSettings Час +Translate application and folder names in Deskbar and Tracker. Locale Preflet Window Перекласти додатки і назви папок в Deskbar і Tracker. Unable to find the available languages! You can't use this preflet! Locale Preflet Window Неможливо знайти доступні мови! Ви не можете використовувати цю функцію! Use month/day-names from preferred language TimeFormatSettings Використовувати назви місяця/дня для вибраної мови already chosen LanguageListView повністю закритий diff --git a/data/catalogs/preferences/mail/be.catkeys b/data/catalogs/preferences/mail/be.catkeys index 51bf0492fa..8a4627f840 100644 --- a/data/catalogs/preferences/mail/be.catkeys +++ b/data/catalogs/preferences/mail/be.catkeys @@ -1,26 +1,38 @@ -1 belarusian x-vnd.Haiku-Mail 2328315862 +1 belarusian x-vnd.Haiku-Mail 3957822883 Account name: Config Views Імя акаунту Account name: E-Mail Імя акаунта: +Account settings AutoConfigWindow Наладкі рахунка Account settings Config Views Наладкі акаунту Accounts Config Window Акаунты Add Config Window Дадаць Add filter Config Views Дадаць фільтр Always Config Window Заўсёды Apply Config Window Прымяніць +Back AutoConfigWindow Назад Check every Config Window Правяраць кожныя Choose Protocol E-Mail Выбраць пратакол +Create new account AutoConfigWindow Стварыць новы рахунак E-mail System name Е-Пошта E-mail address: E-Mail Адрас E-mail Edit mailbox menu… Config Window Правіць меню паштовай скрыні... +Enter a valid e-mail address. AutoConfigWindow Увядзіце адрас е-пошты. Error Config Window Памылка Error retrieving general settings: %s\n Config Window Памылка пры атрыманні агульных наладак: %s\n +Finish AutoConfigWindow Скончыць +Incoming Config Window Уваходны +Incoming E-Mail Уваходны Incoming mail filters Config Views Уваходныя фільтры пошты Login name: E-Mail Імя карыстача: Mail checking Config Window Праверка пошты Miscellaneous Config Window Розныя +Never Config Window show status window Ніколі +Next AutoConfigWindow Далей +OK AutoConfigWindow ОК OK Config Views ОК OK Config Window ОК Only when dial-up is connected Config Window Толькі пры падключаным дайл-апе +Outgoing Config Window Выходны +Outgoing E-Mail Выходны Outgoing mail filters Config Views Фільтры выходнай пошты Password: E-Mail Пароль: Real name: Config Views Рэальнае імя: @@ -39,10 +51,10 @@ While sending Config Window Пры адапраўленні While sending and receiving Config Window Пры адпраўцы і атрыманні \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nАгульныя опцыі немагчыма адмяніць.\n\nПамылка пры атрыманні агульных опцый:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nСтварыце акаунт з дапамогай кнопкі Дадаць.\n\nВыдаліце акаунт кнопкай Выдаліць.\n\nВыберыце элемент у спісе, каб змяніць яго параметры. +\t\t· E-mail filters Config Window \t\t· Фільтры е-пошты +\t\t· Incoming Config Window \t\t· Уваходны +\t\t· Outgoing Config Window \t\t· Выходны days Config Window дзен hours Config Window гадзін minutes Config Window хвілін -never Config Window ніколі -· E-mail filters Config Window · Фільтры пошты -· Incoming Config Window · Прыходзячыя -· Outgoing Config Window · Зыходзячыя +never Config Window mail checking frequency ніколі diff --git a/data/catalogs/preferences/mail/cs.catkeys b/data/catalogs/preferences/mail/cs.catkeys index 37e8eeedef..1e334f48f1 100644 --- a/data/catalogs/preferences/mail/cs.catkeys +++ b/data/catalogs/preferences/mail/cs.catkeys @@ -1,4 +1,4 @@ -1 czech x-vnd.Haiku-Mail 1290248466 +1 czech x-vnd.Haiku-Mail 3715332373 Account name: Config Views Název účtu: Account settings Config Views Nastavení účtu Accounts Config Window Úcty @@ -28,7 +28,3 @@ While sending and receiving Config Window Během odesílání a přijímání days Config Window dny hours Config Window hodiny minutes Config Window minut/y -never Config Window nikdy -· E-mail filters Config Window · filtry zpráv -· Incoming Config Window · Příchozí -· Outgoing Config Window · Odchozí diff --git a/data/catalogs/preferences/mail/de.catkeys b/data/catalogs/preferences/mail/de.catkeys index 5acd0d6d58..d162f74256 100644 --- a/data/catalogs/preferences/mail/de.catkeys +++ b/data/catalogs/preferences/mail/de.catkeys @@ -1,4 +1,4 @@ -1 german x-vnd.Haiku-Mail 1746145370 +1 german x-vnd.Haiku-Mail 3957822883 Account name: Config Views Kontoname: Account name: E-Mail Kontoname: Account settings AutoConfigWindow Kontoeinstellungen @@ -13,7 +13,7 @@ Check every Config Window Abrufen alle Choose Protocol E-Mail Protokoll wählen Create new account AutoConfigWindow Neues Konto anlegen E-mail System name E-Mail-Dienst -E-mail address: E-Mail E-Mail-Adresse +E-mail address: E-Mail E-Mail-Adresse: Edit mailbox menu… Config Window Mailbox-Menü bearbeiten... Enter a valid e-mail address. AutoConfigWindow Eine gültige E-Mail-Adresse angeben. Error Config Window Fehler @@ -25,6 +25,7 @@ Incoming mail filters Config Views Filter für eingehende E-Mail Login name: E-Mail Login: Mail checking Config Window E-Mail abfragen Miscellaneous Config Window Verschiedenes +Never Config Window show status window Nie Next AutoConfigWindow Weiter OK AutoConfigWindow OK OK Config Views OK @@ -50,10 +51,10 @@ While sending Config Window Beim Senden While sending and receiving Config Window Beim Senden und Empfangen \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nDie allgemeinen Einstellungen konnten nicht zurückgenommen werden.\n\nFehler beim Abrufen der allgemeinen Einstellungen:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nNeues Konto erstellen über den \"Hinzu\" Button.\n\nZum Löschen, Konto auswählen und \"Entfernen\" klicken.\n\nKonto auswählen, um dessen Einstellungen zu ändern. +\t\t· E-mail filters Config Window \t\t· E-Mail-Filter +\t\t· Incoming Config Window \t\t· Eingang +\t\t· Outgoing Config Window \t\t· Ausgang days Config Window Tage hours Config Window Stunden minutes Config Window Minuten -never Config Window nie -· E-mail filters Config Window · E-Mail-Filter -· Incoming Config Window · Eingang -· Outgoing Config Window · Ausgang +never Config Window mail checking frequency nie diff --git a/data/catalogs/preferences/mail/fi.catkeys b/data/catalogs/preferences/mail/fi.catkeys index c00eb175a5..a5473a7a1b 100644 --- a/data/catalogs/preferences/mail/fi.catkeys +++ b/data/catalogs/preferences/mail/fi.catkeys @@ -1,4 +1,4 @@ -1 finnish x-vnd.Haiku-Mail 1746145370 +1 finnish x-vnd.Haiku-Mail 3957822883 Account name: Config Views Tilin nimi: Account name: E-Mail Tilinimi: Account settings AutoConfigWindow Tiliasetukset @@ -25,6 +25,7 @@ Incoming mail filters Config Views Tulevan postin suodattimet Login name: E-Mail Kirjautumisnimi: Mail checking Config Window Sähköpostin tarkistus Miscellaneous Config Window Sekalaiset +Never Config Window show status window Ei koskaan Next AutoConfigWindow Seuraava OK AutoConfigWindow Valmis OK Config Views Valmis @@ -50,10 +51,10 @@ While sending Config Window Lähetettäessä While sending and receiving Config Window Lähetettäessä ja vastaanotettaessa \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nYleisasetuksia ei voitu palauttaa.\n\nVirhe noudettaessa yleisasetuksia:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nLuo uusi tili ”Lisää”-painikkeella.\n\nPoista tili ”Poista”-painikkella valitusta kohdasta.\n\nValitse kohde luettelosta sen asetusten muuttamiseksi. +\t\t· E-mail filters Config Window \t\t· Sähköpostisuodattimet +\t\t· Incoming Config Window \t\t· Tuleva +\t\t· Outgoing Config Window \t\t· Lähtevä days Config Window päivä hours Config Window tunti minutes Config Window minuutti -never Config Window älä tarkista -· E-mail filters Config Window · Sähköpostisuodattimet -· Incoming Config Window · Tuleva -· Outgoing Config Window · Lähtevä +never Config Window mail checking frequency ei koskaan diff --git a/data/catalogs/preferences/mail/fr.catkeys b/data/catalogs/preferences/mail/fr.catkeys index cef93b4190..42dcb2e55a 100644 --- a/data/catalogs/preferences/mail/fr.catkeys +++ b/data/catalogs/preferences/mail/fr.catkeys @@ -1,4 +1,4 @@ -1 french x-vnd.Haiku-Mail 936504879 +1 french x-vnd.Haiku-Mail 3361588786 Account name: Config Views Nom du compte : Account settings Config Views Réglages du compte Accounts Config Window Comptes @@ -31,7 +31,3 @@ While sending and receiving Config Window Pendant l'envoi et la réception days Config Window jours hours Config Window heures minutes Config Window minutes -never Config Window jamais -· E-mail filters Config Window . Filtres E-mail -· Incoming Config Window . Réception -· Outgoing Config Window . Envoi diff --git a/data/catalogs/preferences/mail/it.catkeys b/data/catalogs/preferences/mail/it.catkeys index 6c249e3621..f59fd482b6 100644 --- a/data/catalogs/preferences/mail/it.catkeys +++ b/data/catalogs/preferences/mail/it.catkeys @@ -1,4 +1,4 @@ -1 italian x-vnd.Haiku-Mail 3850363888 +1 italian x-vnd.Haiku-Mail 1980480499 Account name: Config Views Nome account: Account settings Config Views Impostazioni account Accounts Config Window Account @@ -27,7 +27,3 @@ While sending and receiving Config Window Durante l'invio e la ricezione days Config Window giorni hours Config Window ore minutes Config Window minuti -never Config Window mai -· E-mail filters Config Window E-mail filtri -· Incoming Config Window In entrata -· Outgoing Config Window In uscita diff --git a/data/catalogs/preferences/mail/ja.catkeys b/data/catalogs/preferences/mail/ja.catkeys index 4e4cdb71ae..f20ddacebe 100644 --- a/data/catalogs/preferences/mail/ja.catkeys +++ b/data/catalogs/preferences/mail/ja.catkeys @@ -1,4 +1,4 @@ -1 japanese x-vnd.Haiku-Mail 954305167 +1 japanese x-vnd.Haiku-Mail 3957822883 Account name: Config Views アカウント名: Account name: E-Mail アカウント名: Account settings AutoConfigWindow アカウント設定 @@ -10,6 +10,7 @@ Always Config Window 常に Apply Config Window 適用 Back AutoConfigWindow 前へ Check every Config Window メールを +Choose Protocol E-Mail プロトコルを選択してください Create new account AutoConfigWindow 新規アカウント作成 E-mail System name メール E-mail address: E-Mail E-mail アドレス @@ -24,6 +25,7 @@ Incoming mail filters Config Views 受信メールフィルター Login name: E-Mail ログイン名: Mail checking Config Window メールチェック Miscellaneous Config Window その他 +Never Config Window show status window 表示しない Next AutoConfigWindow 次へ OK AutoConfigWindow OK OK Config Views OK @@ -49,10 +51,10 @@ While sending Config Window 送信中に While sending and receiving Config Window 送受信中に \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \n一般設定をもとに戻せませんでした。\n\n読み取り時に次のエラーが発生しました:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\n追加ボタンで新規アカウントを作成してください。\n\n削除ボタンで選択したアカウントを削除してください。\n\nリストのアイテムを選択して、設定を変更してください。 +\t\t· E-mail filters Config Window \t\t· メールフィルタ +\t\t· Incoming Config Window \t\t· 受信 +\t\t· Outgoing Config Window \t\t· 送信 days Config Window 日毎にチェック hours Config Window 時間毎にチェック minutes Config Window 分毎にチェック -never Config Window 手動でチェック -· E-mail filters Config Window · メールフィルタ -· Incoming Config Window · 受信 -· Outgoing Config Window · 送信 +never Config Window mail checking frequency 手動でチェック diff --git a/data/catalogs/preferences/mail/nb.catkeys b/data/catalogs/preferences/mail/nb.catkeys index 797d8994b9..67803cbc19 100644 --- a/data/catalogs/preferences/mail/nb.catkeys +++ b/data/catalogs/preferences/mail/nb.catkeys @@ -1,4 +1,4 @@ -1 norwegian_bokmål x-vnd.Haiku-Mail 777369824 +1 norwegian_bokmål x-vnd.Haiku-Mail 3202453731 Account name: Config Views Kontonavn Account settings Config Views Kontoinnstillinger Accounts Config Window Kontoer @@ -27,7 +27,3 @@ While sending and receiving Config Window Under sending og mottak days Config Window dager hours Config Window timer minutes Config Window minutter -never Config Window aldri -· E-mail filters Config Window E-postfiltre -· Incoming Config Window Innkommende -· Outgoing Config Window Utgående diff --git a/data/catalogs/preferences/mail/nl.catkeys b/data/catalogs/preferences/mail/nl.catkeys index a325b383ff..e94c01cf8a 100644 --- a/data/catalogs/preferences/mail/nl.catkeys +++ b/data/catalogs/preferences/mail/nl.catkeys @@ -1,4 +1,4 @@ -1 dutch x-vnd.Haiku-Mail 2264289764 +1 dutch x-vnd.Haiku-Mail 3653676147 Account name: Config Views Accountnaam: Account name: E-Mail Accountnaam: Account settings Config Views Accountinstellingen @@ -41,4 +41,3 @@ While sending and receiving Config Window Tijdens versturen en ontvangen days Config Window dagen hours Config Window uren minutes Config Window minuten -never Config Window nooit diff --git a/data/catalogs/preferences/mail/pl.catkeys b/data/catalogs/preferences/mail/pl.catkeys index 45280be353..bc7f7b27da 100644 --- a/data/catalogs/preferences/mail/pl.catkeys +++ b/data/catalogs/preferences/mail/pl.catkeys @@ -1,4 +1,4 @@ -1 polish x-vnd.Haiku-Mail 2264289764 +1 polish x-vnd.Haiku-Mail 3653676147 Account name: Config Views Nazwa konta: Account name: E-Mail Nazwa konta: Account settings Config Views Ustawienia konta @@ -41,4 +41,3 @@ While sending and receiving Config Window Podczas wysyłania i odbierania days Config Window dni hours Config Window godzin minutes Config Window minut -never Config Window nigdy diff --git a/data/catalogs/preferences/mail/pt_br.catkeys b/data/catalogs/preferences/mail/pt_br.catkeys index 5844ef0d18..dbc1f0ab17 100644 --- a/data/catalogs/preferences/mail/pt_br.catkeys +++ b/data/catalogs/preferences/mail/pt_br.catkeys @@ -1,4 +1,4 @@ -1 brazilian_portuguese x-vnd.Haiku-Mail 1492060636 +1 brazilian_portuguese x-vnd.Haiku-Mail 2881447019 Account name: Config Views Nome da conta Account settings Config Views Configurações da conta Accounts Config Window Contas @@ -32,4 +32,3 @@ While sending and receiving Config Window Enquanto envia e recebe days Config Window dias hours Config Window horas minutes Config Window minutos -never Config Window nunca diff --git a/data/catalogs/preferences/mail/ro.catkeys b/data/catalogs/preferences/mail/ro.catkeys index ddb5fe81e2..26880ff7d4 100644 --- a/data/catalogs/preferences/mail/ro.catkeys +++ b/data/catalogs/preferences/mail/ro.catkeys @@ -1,4 +1,4 @@ -1 romanian x-vnd.Haiku-Mail 2470242049 +1 romanian x-vnd.Haiku-Mail 3859628432 Account name: Config Views Nume cont: Account name: E-Mail Nume cont: Account settings Config Views Configurări cont @@ -39,4 +39,3 @@ While sending and receiving Config Window În timp ce se trimite și se recepț days Config Window zile hours Config Window ore minutes Config Window minute -never Config Window niciodată diff --git a/data/catalogs/preferences/mail/ru.catkeys b/data/catalogs/preferences/mail/ru.catkeys index 8cc5cd2ca6..d468d81596 100644 --- a/data/catalogs/preferences/mail/ru.catkeys +++ b/data/catalogs/preferences/mail/ru.catkeys @@ -1,4 +1,4 @@ -1 russian x-vnd.Haiku-Mail 2328315862 +1 russian x-vnd.Haiku-Mail 458432473 Account name: Config Views Имя аккаунта: Account name: E-Mail Имя аккаунта: Account settings Config Views Настройки аккаунта @@ -42,7 +42,3 @@ While sending and receiving Config Window во время отправки и days Config Window дней hours Config Window часов minutes Config Window минут -never Config Window не проверять -· E-mail filters Config Window · Почтовые фильтры -· Incoming Config Window · Входящие -· Outgoing Config Window · Исходящие diff --git a/data/catalogs/preferences/mail/sk.catkeys b/data/catalogs/preferences/mail/sk.catkeys index 20de970057..c63c89f7a3 100644 --- a/data/catalogs/preferences/mail/sk.catkeys +++ b/data/catalogs/preferences/mail/sk.catkeys @@ -1,4 +1,4 @@ -1 slovak x-vnd.Haiku-Mail 3450803213 +1 slovak x-vnd.Haiku-Mail 4171229277 Account name: Config Views Názov účtu: Account name: E-Mail Názov účtu: Account settings AutoConfigWindow Nastavenie účtu @@ -21,10 +21,13 @@ Error retrieving general settings: %s\n Config Window Chyba pri získavaní vš Finish AutoConfigWindow Dokončiť Incoming Config Window Prichádzajúce Incoming E-Mail Prichádzajúce +Incoming mail filters Config Views Filtre prichádzajúcej pošty Login name: E-Mail Prihlasovacie meno: Mail checking Config Window Kontrola pošty Miscellaneous Config Window Rozličné +Next AutoConfigWindow Ďalej OK AutoConfigWindow OK +OK Config Views OK OK Config Window OK Only when dial-up is connected Config Window Iba ak je vytočené spojenie Outgoing Config Window Odchádzajúce @@ -42,13 +45,11 @@ Server Name: E-Mail Názov servera: Settings Config Window Nastavenie Show connection status window: Config Window Zobraziť okno stavu spojenia: Start mail services on startup Config Window Spustiť služby pošty pri štarte +The filter could not be moved. Deleting filter. Config Views Filter nebolo možné presunúť. Filter sa zmaže. While sending Config Window Počas odosielania While sending and receiving Config Window Počas odosielania a prijímania \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nVšeobecné nastavenia nebolo možné vrátiť.\n\nChyba pri získavaní všeobecných nastavení:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nNový účet vytvoríte tlačidlom Pridať.\n\nÚčet odstránite tlačidlom odstrániť na vybranej položke.\n\nNastavenia položky zmeníte jej vybraním v zozname. days Config Window dní +hours Config Window hodín minutes Config Window minút -never Config Window nikdy -· E-mail filters Config Window · Filtre pošty -· Incoming Config Window · Prichádzajúce -· Outgoing Config Window · Odchádzajúce diff --git a/data/catalogs/preferences/mail/sv.catkeys b/data/catalogs/preferences/mail/sv.catkeys index 4d002f895e..8eb256b772 100644 --- a/data/catalogs/preferences/mail/sv.catkeys +++ b/data/catalogs/preferences/mail/sv.catkeys @@ -1,4 +1,4 @@ -1 swedish x-vnd.Haiku-Mail 1746145370 +1 swedish x-vnd.Haiku-Mail 3957822883 Account name: Config Views Kontonamn: Account name: E-Mail Kontonamn: Account settings AutoConfigWindow Kontoinställningar @@ -25,6 +25,7 @@ Incoming mail filters Config Views Inkommande e-postfilter Login name: E-Mail Inloggningsnamn: Mail checking Config Window Kontrollera e-post Miscellaneous Config Window Diverse +Never Config Window show status window Aldrig Next AutoConfigWindow Nästa OK AutoConfigWindow OK OK Config Views OK @@ -50,10 +51,10 @@ While sending Config Window När sändning sker While sending and receiving Config Window När sändning och mottagning sker \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nGrundinställningarna kunde inte återställas.\n\nEtt fel uppstod när grundinställningarna skulle återställas:\n%s\n \n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nSkapa ett nytt konto via Lägg till-knappen.\n\nTa bort ett konto med Ta bort-knappen vid den valda objektet.\n\nVälj ett listobjekt för att ändra dess inställningar. +\t\t· E-mail filters Config Window \t\t· E-postfilter +\t\t· Incoming Config Window \t\t· Inkommande +\t\t· Outgoing Config Window \t\t· Utgående days Config Window dagar hours Config Window timmar minutes Config Window minuter -never Config Window aldrig -· E-mail filters Config Window · E-postfilter -· Incoming Config Window · Inkommande -· Outgoing Config Window · Utgående +never Config Window mail checking frequency aldrig diff --git a/data/catalogs/preferences/mail/uk.catkeys b/data/catalogs/preferences/mail/uk.catkeys index 46b29a41b2..7d9858569e 100644 --- a/data/catalogs/preferences/mail/uk.catkeys +++ b/data/catalogs/preferences/mail/uk.catkeys @@ -1,24 +1,38 @@ -1 ukrainian x-vnd.Haiku-Mail 2363284004 +1 ukrainian x-vnd.Haiku-Mail 3957822883 Account name: Config Views Ім'я аккаунта: Account name: E-Mail Ім'я акаунту: +Account settings AutoConfigWindow Настройка аакунта Account settings Config Views Настройка аккаунта Accounts Config Window Аккаунти Add Config Window Додати Add filter Config Views Додати фільтр Always Config Window Завжди Apply Config Window Прийняти +Back AutoConfigWindow Назад Check every Config Window Перевіряти кожні Choose Protocol E-Mail Вибрати протокол +Create new account AutoConfigWindow Створити новий аккаунт +E-mail System name Пошта E-mail address: E-Mail Адреса E-mail : Edit mailbox menu… Config Window Редагувати почтове меню… +Enter a valid e-mail address. AutoConfigWindow Введіть дійсну поштову адресу. Error Config Window Помилка Error retrieving general settings: %s\n Config Window Помилка при відновленні основних настройок: %s\n +Finish AutoConfigWindow Фініш +Incoming Config Window Вхідні +Incoming E-Mail Вхідні Incoming mail filters Config Views Вхідний поштовий фільтр Login name: E-Mail Логін: Mail checking Config Window Перевірка пошти Miscellaneous Config Window Змішаний +Never Config Window show status window Ніколи +Next AutoConfigWindow Наступне +OK AutoConfigWindow Гаразд OK Config Views Гаразд OK Config Window Гаразд +Only when dial-up is connected Config Window Тільки при включеному діалапі +Outgoing Config Window Вихідні +Outgoing E-Mail Вихідні Outgoing mail filters Config Views Фільтри вихідної пошти Password: E-Mail Пароль: Real name: Config Views Справжнє ім'я: @@ -36,7 +50,11 @@ The filter could not be moved. Deleting filter. Config Views Фільтр не While sending Config Window Поки відправляється While sending and receiving Config Window При відправці і отриманні \nThe general settings couldn't be reverted.\n\nError retrieving general settings:\n%s\n Config Window \nОсновні налаштування неможливо повернути.\n\nПомилка при відновленні налаштувань:\n%s\n +\n\nCreate a new account with the Add button.\n\nRemove an account with the Remove button on the selected item.\n\nSelect an item in the list to change its settings. Config Window \n\nСтворіть новий аккаунт натиснувши кнопку Додати .\n\nВидаліть аккаунт при допомозі кнопки Видалити на вибраному пункті\n\nВиберіть пункт зі списку при необхідності змініть його налаштувань. +\t\t· E-mail filters Config Window \t\t· поштовий фільтр +\t\t· Incoming Config Window \t\t· Вхідні +\t\t· Outgoing Config Window \t\t· Вхідні days Config Window днів hours Config Window годин minutes Config Window хвилин -never Config Window ніколи +never Config Window mail checking frequency ніколи diff --git a/data/catalogs/preferences/mail/zh_hans.catkeys b/data/catalogs/preferences/mail/zh_hans.catkeys index b1025a1587..582b85697f 100644 --- a/data/catalogs/preferences/mail/zh_hans.catkeys +++ b/data/catalogs/preferences/mail/zh_hans.catkeys @@ -1,4 +1,4 @@ -1 simplified_chinese x-vnd.Haiku-Mail 2923655424 +1 simplified_chinese x-vnd.Haiku-Mail 1053772035 Account name: Config Views 用户名： Account name: E-Mail 用户名： Account settings Config Views 用户设置 @@ -42,7 +42,3 @@ While sending and receiving Config Window 在发送和接收时 days Config Window 天 hours Config Window 小时 minutes Config Window 分 -never Config Window 从不 -· E-mail filters Config Window 邮件过滤器 -· Incoming Config Window 接收 -· Outgoing Config Window 发送 diff --git a/data/catalogs/preferences/media/uk.catkeys b/data/catalogs/preferences/media/uk.catkeys index 7f4efb1c6b..3abb1a861c 100644 --- a/data/catalogs/preferences/media/uk.catkeys +++ b/data/catalogs/preferences/media/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-Media 293613603 +1 ukrainian x-vnd.Haiku-Media 1473363280 Media views <немає> Audio input: Media views Вхід звуку: Audio mixer Media Window Аудіо міксер @@ -11,6 +11,7 @@ Couldn't add volume control in Deskbar: %s\n Media views Неможливо д Couldn't remove volume control in Deskbar: %s\n Media views Неможливо видалити регулятор гучності з Deskbar: %s\n Defaults Media views По замовчуванню Done shutting down. Media Window Відбувається закриття. +Media System name Mедіа OK Media Window Гаразд Quit Media Window Вихід Ready for use… Media Window Готовий для використання… diff --git a/data/catalogs/preferences/mouse/uk.catkeys b/data/catalogs/preferences/mouse/uk.catkeys index 8ccc1922e5..97a6100ccf 100644 --- a/data/catalogs/preferences/mouse/uk.catkeys +++ b/data/catalogs/preferences/mouse/uk.catkeys @@ -1,10 +1,11 @@ -1 ukrainian x-vnd.Haiku-Mouse 1036956709 +1 ukrainian x-vnd.Haiku-Mouse 1033564338 ...by Andrew Edward McCall MouseApplication ...автор Andrew Edward McCall 1-Button SettingsView Однокнопочна 2-Button SettingsView Двухкнопочна 3-Button SettingsView Трикнопочна Accept first click SettingsView Сприймати перший клік Click to focus SettingsView Клацніть для встановлення фокуса +Click to focus and raise SettingsView натиснути для фокусування і спливання Defaults MouseWindow За замовчуванням Dig Deal MouseApplication Чудово Double-click speed SettingsView Швидкість подвійного кліку @@ -13,6 +14,7 @@ Fast SettingsView Швидко Focus follows mouse SettingsView Фокус слідкує за вказівником Focus mode: SettingsView Режим фокуса: Instant warp SettingsView Миттєве переміщення +Mouse System name Мишка Mouse acceleration SettingsView Прискорення вказівника Mouse speed SettingsView Швидкість переміщення вказівника Mouse type: SettingsView Тип миші: diff --git a/data/catalogs/preferences/network/uk.catkeys b/data/catalogs/preferences/network/uk.catkeys index 2185d31d27..64bf23d022 100644 --- a/data/catalogs/preferences/network/uk.catkeys +++ b/data/catalogs/preferences/network/uk.catkeys @@ -1,7 +1,8 @@ -1 ukrainian x-vnd.Haiku-Network 826313819 +1 ukrainian x-vnd.Haiku-Network 2324385456 EthernetSettingsView <немає жодної бездротової мережі> Adapter: EthernetSettingsView Адаптер: Apply EthernetSettingsView Застосовувати +Auto-configuring failed: EthernetSettingsView Автоматична настройка не вдалася: Choose automatically EthernetSettingsView Вибрати автоматично DHCP EthernetSettingsView DHCP DNS #1: EthernetSettingsView DNS #1: @@ -12,6 +13,7 @@ Gateway: EthernetSettingsView Шлюз: IP address: EthernetSettingsView IP адреса: Mode: EthernetSettingsView Режим: Netmask: EthernetSettingsView Маска: +Network System name Мережа Network: EthernetSettingsView Мережа: OK EthernetSettingsView Гаразд Revert EthernetSettingsView Повернутися diff --git a/data/catalogs/preferences/notifications/uk.catkeys b/data/catalogs/preferences/notifications/uk.catkeys index 985fe8e688..c85ed60281 100644 --- a/data/catalogs/preferences/notifications/uk.catkeys +++ b/data/catalogs/preferences/notifications/uk.catkeys @@ -1,4 +1,4 @@ -1 ukrainian x-vnd.Haiku-Notifications 3646488837 +1 ukrainian x-vnd.Haiku-Notifications 3818404871 Above icon DisplayView Про іконку Allowed NotificationView Дозволити An error occurred saving the preferences.\nIt's possible you are running out of disk space. GeneralView Виникла помилка збереження настройок.\nМожливо, що закінчилось місце на диску. @@ -8,6 +8,7 @@ Can't enable notifications at startup time, you probably don't have write permis Can't save preferences, you probably don't have write access to the boot settings directory. GeneralView Неможливо зберегти настройки, бо Ви не маєте доступу до директорії налаштувань загрузки. Can't save preferenes, you probably don't have write access to the settings directory or the disk is full. DisplayView Настройки зберегти не вдалося, можливо у Вас немає дозволу на запис для директорії настройок або диск повний. Cannot disable notifications because the server can't be reached. GeneralView Неможливо відмінити повідомлення, бо сервер недоступний. +Cannot enable notifications because the server cannot be found.\nThis means your InfoPopper installation was not successfully completed. GeneralView Неможливо включити повідомлення бо сервер не знайдено.\nЦе означає, що ваш InfoPopper встановлений не повністю. Disable notifications GeneralView Вимкнути повідомлення Display PrefletView Дисплей Enable notifications GeneralView Включити повідомлення @@ -27,15 +28,18 @@ Mini icon DisplayView Міні іконки No NotificationView Ні Notifications GeneralView Повідомлення Notifications NotificationView Повідомлення +Notifications System name Notifications Notifications cannot be stopped, because the server can't be reached. GeneralView Повідомлення не можуть бути зупинені, бо сервер недоступний. OK DisplayView Гаразд OK GeneralView Гаразд OK NotificationView Гаразд Progress NotificationView Хід Revert PrefletWin Повернути +Right of icon DisplayView Справа від значка Save PrefletWin Зберегти Search: NotificationView Пошук: The notifications server cannot be found, this means your InfoPopper installation was not successfully completed. GeneralView Невдалося знайти сервер повідомлень, Це означає, що установка InfoPopper Вами була завершена невдало. +The notifications server cannot be found.\nA possible cause is an installation not done correctly GeneralView Сервер повідомлень не знайдено.\nМожливо через некоректне встановлення There was a problem saving the preferences.\nIt's possible you don't have write access to the settings directory. DisplayView Виникли проблеми в збереженні настройок.\nМожливо у Вас немає дозволу на запис в директорію настройок. There was a problem saving the preferences.\nIt's possible you don't have write access to the settings directory. GeneralView Виникла проблема в збережені настройок.\nМожливо у Вас немає доступу на запис до директорії налаштувань. There was a problem saving the preferences.\nIt's possible you don't have write access to the settings directory. NotificationView Виникла проблема в збереженні настройок.\nМожливо у Вас немає доступу на запис до директорії налаштувань. diff --git a/data/catalogs/preferences/time/be.catkeys b/data/catalogs/preferences/time/be.catkeys index 4f1d5643b8..5d0b2cb39c 100644 --- a/data/catalogs/preferences/time/be.catkeys +++ b/data/catalogs/preferences/time/be.catkeys @@ -1,11 +1,10 @@ -1 belarusian x-vnd.Haiku-Time 453699369 +1 belarusian x-vnd.Haiku-Time 265526963 Time <іншае> Add Time Дадаць Could not contact server Time Няма далучэння да сервера Could not create socket Time Немагчыма стварыць сеткавы сокет. Current time: Time Сапраўдны час: Date and time Time Дата і Час -Etc Time І г. д. GMT Time GMT Hardware clock set to: Time Гадзіннік кампутара усталяваны на: Local time Time Лакальны час diff --git a/data/catalogs/preferences/time/de.catkeys b/data/catalogs/preferences/time/de.catkeys index 35c6893bbe..c9ac3d0107 100644 --- a/data/catalogs/preferences/time/de.catkeys +++ b/data/catalogs/preferences/time/de.catkeys @@ -1,17 +1,27 @@ 1 german x-vnd.Haiku-Time 453699369 Time Add Time Hinzu +Africa Time Afrika +America Time Amerika +Antarctica Time Antarktis +Arctic Time Arktis +Asia Time Asien +Atlantic Time Atlantik +Australia Time Australien Could not contact server Time Server konnte nicht erreicht werden Could not create socket Time Socket konnte nicht erzeugt werden Current time: Time Aktuelle Zeit: Date and time Time Datum und Zeit Etc Time Etc +Europe Time Europa GMT Time GMT Hardware clock set to: Time Hardware-Uhr gestellt auf: +Indian Time Indischer Ozean Local time Time Lokale Zeit Message receiving failed Time Nachricht wurde nicht erhalten Network time Time Netzwerkzeit OK Time OK +Pacific Time Pazifik Preview time: Time Vorschau-Zeit: Received invalid time Time Ungültige Zeit erhalten Remove Time Entfernen diff --git a/data/catalogs/preferences/time/fi.catkeys b/data/catalogs/preferences/time/fi.catkeys index 4f5d9c197e..a3a17bbf23 100644 --- a/data/catalogs/preferences/time/fi.catkeys +++ b/data/catalogs/preferences/time/fi.catkeys @@ -1,17 +1,26 @@ -1 finnish x-vnd.Haiku-Time 453699369 +1 finnish x-vnd.Haiku-Time 3739720453 Time Add Time Lisää +Africa Time Afrikka +America Time Amerikka +Antarctica Time Etelänapamanner +Arctic Time Pohjoinen napaseutu +Asia Time Aasia +Atlantic Time Atlantin valtameri +Australia Time Australia Could not contact server Time Ei voitu ottaa yhteyttä palvelimeen Could not create socket Time Ei voitu luoda pistoketta Current time: Time Nykyinen aika: Date and time Time Päivämäärä ja aika -Etc Time Jne +Europe Time Eurooppa GMT Time Greenwichin aika Hardware clock set to: Time Laitteistokellon ajaksi asetettu: +Indian Time Intia Local time Time Paikallinen aika Message receiving failed Time Viestin vastaanotto epäonnistui Network time Time Verkkoaika OK Time Valmis +Pacific Time Tyyni valtameri Preview time: Time Esikatseluaika: Received invalid time Time Vastaanotettiin virheellinen aika Remove Time Poista diff --git a/data/catalogs/preferences/time/ru.catkeys b/data/catalogs/preferences/time/ru.catkeys index f62e44f605..4b821fd2f2 100644 --- a/data/catalogs/preferences/time/ru.catkeys +++ b/data/catalogs/preferences/time/ru.catkeys @@ -1,13 +1,14 @@ -1 russian x-vnd.Haiku-Time 2002728485 +1 russian x-vnd.Haiku-Time 2447986513 Time <Другой> Add Time Добавить Could not contact server Time Ну удалось связаться с сервером Could not create socket Time Не удалось создать сокет Current time: Time Текущее время: Date and time Time Дата и время -Etc Time И т.д. GMT Time GMT +Hardware clock set to: Time Часы настроены на: Local time Time Местное время +Message receiving failed Time Не удалось получить данные Network time Time Синхронизация времени OK Time ОК Preview time: Time Предварительное время: @@ -28,5 +29,6 @@ Time Time Время Time & Date, writen by:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2008, Haiku. Time Time & Date, разработал:\n\n\tAndrew Edward McCall\n\tMike Berg\n\tJulun\n\tPhilippe Saint-Pierre\n\nCopyright 2004-2008, Haiku. Time zone Time Часовой пояс Try all servers Time Пробовать все сервера +Waiting for answer failed Time Истекло время ожидания \nNow: Time \nСейчас: about Time о программе diff --git a/data/catalogs/preferences/time/sk.catkeys b/data/catalogs/preferences/time/sk.catkeys index cb65adf976..b4ef8de25d 100644 --- a/data/catalogs/preferences/time/sk.catkeys +++ b/data/catalogs/preferences/time/sk.catkeys @@ -1,11 +1,10 @@ -1 slovak x-vnd.Haiku-Time 453699369 +1 slovak x-vnd.Haiku-Time 265526963 Time Add Time Pridať Could not contact server Time Nepodarilo sa kontaktovať server Could not create socket Time Nepodarilo sa vytvoriť socket Current time: Time Aktuálny čas: Date and time Time Dátum a čas -Etc Time Etc GMT Time GMT Hardware clock set to: Time Hardvérové hodiny nastavené na: Local time Time Lokálny čas diff --git a/data/catalogs/preferences/time/sv.catkeys b/data/catalogs/preferences/time/sv.catkeys index d310e6f075..8591d1884f 100644 --- a/data/catalogs/preferences/time/sv.catkeys +++ b/data/catalogs/preferences/time/sv.catkeys @@ -1,17 +1,26 @@ -1 swedish x-vnd.Haiku-Time 453699369 +1 swedish x-vnd.Haiku-Time 3739720453 Time Add Time Lägg till +Africa Time Afrika +America Time Amerika +Antarctica Time Antarktis +Arctic Time Arktis +Asia Time Asien +Atlantic Time Atlanten +Australia Time Australien Could not contact server Time Kunde inte kontakta servern Could not create socket Time Kunde inte skapa en socket Current time: Time Aktuell tid: Date and time Time Datum och tid -Etc Time Etc +Europe Time Europa GMT Time GMT standardtid Hardware clock set to: Time Hårdvaruklockans tid: +Indian Time Indien Local time Time Lokal tid Message receiving failed Time Kunde inte ta emot meddelandet Network time Time Internettid OK Time OK +Pacific Time Stilla havet Preview time: Time Förhandsvisa tid: Received invalid time Time Tog emot en ogiltig tid Remove Time Ta bort diff --git a/data/catalogs/preferences/time/uk.catkeys b/data/catalogs/preferences/time/uk.catkeys index 9fb370c726..9e15f10006 100644 --- a/data/catalogs/preferences/time/uk.catkeys +++ b/data/catalogs/preferences/time/uk.catkeys @@ -1,7 +1,6 @@ -1 ukrainian x-vnd.Haiku-Time 4087029862 +1 ukrainian x-vnd.Haiku-Time 3898857456 Time <Інше> Current time: Time Поточний час: -Etc Time І т.д. OK Time Гаразд Preview time: Time Попередній час: Revert Time Повернути diff --git a/data/catalogs/preferences/tracker/uk.catkeys b/data/catalogs/preferences/tracker/uk.catkeys new file mode 100644 index 0000000000..561ef646c5 --- /dev/null +++ b/data/catalogs/preferences/tracker/uk.catkeys @@ -0,0 +1,2 @@ +1 ukrainian x-vnd.Haiku-TrackerPreferences 1627828833 +Tracker System name Tracker diff --git a/data/catalogs/servers/debug/fr.catkeys b/data/catalogs/servers/debug/fr.catkeys new file mode 100644 index 0000000000..1333c11daa --- /dev/null +++ b/data/catalogs/servers/debug/fr.catkeys @@ -0,0 +1,4 @@ +1 french x-vnd.Haiku-debug_server 1035915338 +OK DebugServer OK +Debug DebugServer Déboguer +The application:\n\n %app\n\nhas encountered an error which prevents it from continuing. Haiku will terminate the application and clean up. DebugServer L'application :\n\n %app\n\na rencontré une erreur l'empêchant de continuer. Haiku va fermer l'application et libérer ses ressources. diff --git a/data/catalogs/servers/mail/be.catkeys b/data/catalogs/servers/mail/be.catkeys new file mode 100644 index 0000000000..31e1502a25 --- /dev/null +++ b/data/catalogs/servers/mail/be.catkeys @@ -0,0 +1,26 @@ +1 belarusian x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f kb (%d / %d паведамленняў) +%d / %d messages StatusWindow %d / %d паведамленняў +%num new message DeskbarView %num новае паведамленне +%num new message for %name\n MailDaemon %num новых паведамленняў для %name\n +%num new message. MailDaemon %num новае паведамленне. +%num new messages DeskbarView %num новых паведамленняў +%num new messages for %name\n MailDaemon %num новых паведамленняў для %name\n +%num new messages. MailDaemon %num новых паведамленняў. + DeskbarView <няма рахункаў> +Check for mail now DeskbarView Праверыць пошту +Check for mails only DeskbarView Толькі праверыць пошту +Check mail now StatusWindow Праверыць пошту +Create new message… DeskbarView Стварыць новае паведамленне… +Fetching mail for %name Notifier Атрымліваю пошту для %name +Mail Status MailDaemon Статус Пошты +Mail daemon status log MailDaemon Пратакол паштовай службы +New Messages MailDaemon Новыя паведамленні +No new messages DeskbarView Няма новых паведамленняў +No new messages MailDaemon Няма новых паведамленняў +No new messages. MailDaemon Няма новых паведамленняў. +No new messages. StatusWindow Няма новых паведамленняў. +Preferences… DeskbarView Наладкі… +Send pending mails DeskbarView Даслаць паведамленні што чакаюць +Sending mail for %name Notifier Дасылаю пошту для %name +Shutdown mail services DeskbarView Спыніць паштовыя службы diff --git a/data/catalogs/servers/mail/de.catkeys b/data/catalogs/servers/mail/de.catkeys index 8e1732a6f8..6a5855448e 100644 --- a/data/catalogs/servers/mail/de.catkeys +++ b/data/catalogs/servers/mail/de.catkeys @@ -1,4 +1,6 @@ -1 german x-vnd.Be-POST 2900218551 +1 german x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f KiB (%d / %d Nachrichten) +%d / %d messages StatusWindow %d / %d Nachrichten %num new message DeskbarView %num neue Nachricht %num new message for %name\n MailDaemon %num neue Nachricht für %name\n %num new message. MailDaemon %num neue Nachricht. @@ -7,9 +9,10 @@ %num new messages. MailDaemon %num neue Nachrichten. DeskbarView Check for mail now DeskbarView E-Mails jetzt abrufen -Check for mails only DeskbarView E-Mails nur abrufen +Check for mails only DeskbarView E-Mails nur abrufen für Check mail now StatusWindow E-Mails jetzt abrufen Create new message… DeskbarView Nachricht verfassen… +Fetching mail for %name Notifier E-Mails für %name abrufen Mail Status MailDaemon E-Mail-Status Mail daemon status log MailDaemon E-Mail-Dienst Statusmeldungen New Messages MailDaemon Neue Nachrichten @@ -19,4 +22,5 @@ No new messages. MailDaemon Keine neuen Nachrichten. No new messages. StatusWindow Keine neuen Nachrichten. Preferences… DeskbarView Einstellungen… Send pending mails DeskbarView E-Mails senden +Sending mail for %name Notifier E-Mails von %name senden Shutdown mail services DeskbarView E-Mail-Dienst ausschalten diff --git a/data/catalogs/servers/mail/fi.catkeys b/data/catalogs/servers/mail/fi.catkeys index 7bf1b6b699..abf13db36e 100644 --- a/data/catalogs/servers/mail/fi.catkeys +++ b/data/catalogs/servers/mail/fi.catkeys @@ -1,4 +1,6 @@ -1 finnish x-vnd.Be-POST 2900218551 +1 finnish x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f kilotavua (%d / %d viestiä) +%d / %d messages StatusWindow %d / %d viestiä %num new message DeskbarView %num uusi viesti %num new message for %name\n MailDaemon %num uusi viesti käyttäjälle %name\n %num new message. MailDaemon %num uusi viesti. @@ -10,6 +12,7 @@ Check for mail now DeskbarView Tarkista sähköposti nyt Check for mails only DeskbarView Tarkista vain sähköpostit Check mail now StatusWindow Tarkista sähköposti nyt Create new message… DeskbarView Luo uusi viesti... +Fetching mail for %name Notifier Noudetaan sähköpostia vastaanottajalle %name Mail Status MailDaemon Sähköpostitila Mail daemon status log MailDaemon Sähköpostitaustaohjelman tilaloki New Messages MailDaemon Uudet viestit @@ -19,4 +22,5 @@ No new messages. MailDaemon Ei uusia viestejä. No new messages. StatusWindow Ei uusia viestejä. Preferences… DeskbarView Asetukset... Send pending mails DeskbarView Lähetä odottamassa olevat sähköpostit +Sending mail for %name Notifier Lähetetään sähköpostia vastaanottajalle %name Shutdown mail services DeskbarView Sulje sähköpostipalvelut diff --git a/data/catalogs/servers/mail/ja.catkeys b/data/catalogs/servers/mail/ja.catkeys index b599ee141d..e8cab84660 100644 --- a/data/catalogs/servers/mail/ja.catkeys +++ b/data/catalogs/servers/mail/ja.catkeys @@ -1,4 +1,6 @@ -1 japanese x-vnd.Be-POST 2900218551 +1 japanese x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f kb (%d / %d メッセージ) +%d / %d messages StatusWindow %d / %d メッセージ %num new message DeskbarView %num 通の新着メッセージがあります %num new message for %name\n MailDaemon %name より %num 通のメッセージが届きました\n %num new message. MailDaemon %num 通の新着メッセージがあります。 @@ -10,6 +12,7 @@ Check for mail now DeskbarView 今すぐメールをチェック Check for mails only DeskbarView メール受信のみ Check mail now StatusWindow 今すぐメールをチェック Create new message… DeskbarView 新規メッセージ作成 +Fetching mail for %name Notifier %name からのメールを受信中 Mail Status MailDaemon メールの状況 Mail daemon status log MailDaemon メールデーモン状況ログ New Messages MailDaemon 新着メッセージ @@ -19,4 +22,5 @@ No new messages. MailDaemon 新着メッセージはありません。 No new messages. StatusWindow 新着メッセージはありません。 Preferences… DeskbarView メールの設定 Send pending mails DeskbarView 保留メールを送信 +Sending mail for %name Notifier %name へのメールを送信中 Shutdown mail services DeskbarView 終了 diff --git a/data/catalogs/servers/mail/sv.catkeys b/data/catalogs/servers/mail/sv.catkeys index 2db40177e7..55d80ac4c9 100644 --- a/data/catalogs/servers/mail/sv.catkeys +++ b/data/catalogs/servers/mail/sv.catkeys @@ -1,4 +1,6 @@ -1 swedish x-vnd.Be-POST 2900218551 +1 swedish x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f kb (%d / %d meddelanden) +%d / %d messages StatusWindow %d / %d meddelanden %num new message DeskbarView %num nytt meddelande %num new message for %name\n MailDaemon %num nytt meddelande för %name\n %num new message. MailDaemon %num nytt meddelande. @@ -10,6 +12,7 @@ Check for mail now DeskbarView Kontrollera e-post nu Check for mails only DeskbarView Kontrollera bara e-post Check mail now StatusWindow Kontrollera e-post nu Create new message… DeskbarView Skapa nytt meddelande... +Fetching mail for %name Notifier Hämtar e-post för %name Mail Status MailDaemon E-post status Mail daemon status log MailDaemon Statuslog för e-postdemon New Messages MailDaemon nya meddelanden @@ -19,4 +22,5 @@ No new messages. MailDaemon inga nya meddelanden. No new messages. StatusWindow inga nya meddelanden. Preferences… DeskbarView Inställningar... Send pending mails DeskbarView Skicka väntande meddelanden +Sending mail for %name Notifier Skickar e-post för %name Shutdown mail services DeskbarView Stäng av e-posttjänsterna diff --git a/data/catalogs/servers/mail/uk.catkeys b/data/catalogs/servers/mail/uk.catkeys new file mode 100644 index 0000000000..9cd3cf01b0 --- /dev/null +++ b/data/catalogs/servers/mail/uk.catkeys @@ -0,0 +1,26 @@ +1 ukrainian x-vnd.Be-POST 1358359182 +%.1f / %.1f kb (%d / %d messages) StatusWindow %.1f / %.1f kb (%d / %d повідомлень) +%d / %d messages StatusWindow %d / %d повідомлень +%num new message DeskbarView %num нове повідомлення +%num new message for %name\n MailDaemon %num нове повідомлення для %name\n +%num new message. MailDaemon %num нове повідомлення. +%num new messages DeskbarView %num нових повідомлень +%num new messages for %name\n MailDaemon %num нових повідомлень для %name\n +%num new messages. MailDaemon %num нових повідомлень. + DeskbarView <акаунти відсутні> +Check for mail now DeskbarView Перевірити пошту зараз +Check for mails only DeskbarView Перевірити тільки пошту +Check mail now StatusWindow Перевірити пошту зараз +Create new message… DeskbarView Створити нове повідомлення… +Fetching mail for %name Notifier Отримання пошти для %name +Mail Status MailDaemon Стан пошти +Mail daemon status log MailDaemon Лог стану почтового демона +New Messages MailDaemon Нові повідомлення +No new messages DeskbarView Немає нових повідомлень +No new messages MailDaemon Немає нових повідомлень +No new messages. MailDaemon Немає нових повідомлень. +No new messages. StatusWindow Немає нових повідомлень. +Preferences… DeskbarView Настройки… +Send pending mails DeskbarView Відправити чергову пошту +Sending mail for %name Notifier Відправка пошти для %name +Shutdown mail services DeskbarView Закрити поштові сервіси diff --git a/data/catalogs/servers/mount/ru.catkeys b/data/catalogs/servers/mount/ru.catkeys index 9113c408e5..efbb009f74 100644 --- a/data/catalogs/servers/mount/ru.catkeys +++ b/data/catalogs/servers/mount/ru.catkeys @@ -1,7 +1,7 @@ 1 russian x-vnd.Haiku-mount_server 1422362183 Cancel AutoMounter Отмена Could not unmount disk \"%s\":\n\t%s AutoMounter Невозможно отключить диск \"%s\":\n\t%s -Could not unmount disk \"%s\":\n\t%s\n\nShould unmounting be forced?\n\nNote: If an application is currently writing to the volume, unmounting it now might result in loss of data.\n AutoMounter Невозможно отключить диск \"%s\":\n\t%s\n\nОтключить принудительно?\n\nВнимание: если какое-либо приложение в данный момент записывает данные на этот раздел, то его отключение может привести к потере данных.\n +Could not unmount disk \"%s\":\n\t%s\n\nShould unmounting be forced?\n\nNote: If an application is currently writing to the volume, unmounting it now might result in loss of data.\n AutoMounter Невозможно отключить диск \"%s\":\n\t%s\n\nОтключить этот диск принудительно?\n\nВнимание: если какое-нибудь приложение в данный момент записывает данные на этот раздел, то отключение диска может привести к потере данных.\n Error mounting volume:\n\n%s AutoMounter Ошибка подключения раздела:\n\n%s Force unmount AutoMounter Отключить принудительно It is suggested to mount all additional Haiku volumes in read-only mode. This will prevent unintentional data loss because of errors in Haiku. AutoMounter Рекомендуется подключать дополнительные разделы Haiku в режиме только для чтения. Это предотвратит возможную потерю данных из-за потенциальных ошибок в Haiku. diff --git a/data/catalogs/servers/mount/uk.catkeys b/data/catalogs/servers/mount/uk.catkeys index 166ac8a500..dfbc17cf73 100644 --- a/data/catalogs/servers/mount/uk.catkeys +++ b/data/catalogs/servers/mount/uk.catkeys @@ -1,8 +1,10 @@ -1 ukrainian x-vnd.Haiku-mount_server 676706323 +1 ukrainian x-vnd.Haiku-mount_server 1422362183 Cancel AutoMounter Відмінити Could not unmount disk \"%s\":\n\t%s AutoMounter Неможливо відмонтувати диск \"%s\":\n\t%s +Could not unmount disk \"%s\":\n\t%s\n\nShould unmounting be forced?\n\nNote: If an application is currently writing to the volume, unmounting it now might result in loss of data.\n AutoMounter Неможливо відмонтувати диск \"%s\":\n\t%s\n\nПрискорити відмонтування?\n\nПримітка: Якщо додаток продовжить запис на розділ можлива втрата даних.\n Error mounting volume:\n\n%s AutoMounter Помилка підмонтування розділу:\n\n%s Force unmount AutoMounter Швидке відмонтування +It is suggested to mount all additional Haiku volumes in read-only mode. This will prevent unintentional data loss because of errors in Haiku. AutoMounter Рекомендується підмонтовувати всі доступні томи Haiku тільки в режимі для читання. Це вбереже від втрати даних при помилках у Haiku. Mount error AutoMounter Помилка підмонтування Mount read-only AutoMounter Змонтувати тільки для читання Mount read/write AutoMounter Підмонтувати дл запису/читання @@ -11,4 +13,5 @@ Mounting volume '%s'\n\n AutoMounter Підмонтування розділу Mounting volume \n\n AutoMounter Монтування тому <безіменний том>\n\n OK AutoMounter Гаразд Previous volumes mounted. AutoMounter Попередні томи підмонтовані +The file system on this volume is not the Haiku file system. It is strongly suggested to mount it in read-only mode. This will prevent unintentional data loss because of errors in Haiku. AutoMounter Файлова система на цьому томі не є файловою системою Haiku. Рекомендуємо підмонтування у режимі тільки для читання, це поможе вберегти дані при виникненні помилок в Haiku. Unmount error AutoMounter Помилка відмонтування diff --git a/data/catalogs/servers/registrar/sv.catkeys b/data/catalogs/servers/registrar/sv.catkeys index dbcb72bb08..b7cd79ed73 100644 --- a/data/catalogs/servers/registrar/sv.catkeys +++ b/data/catalogs/servers/registrar/sv.catkeys @@ -1,23 +1,23 @@ 1 swedish application/x-vnd.Haiku-Registrar 2599857937 %action%? ShutdownProcess %action%? -Application \"%appName%\" has aborted the shutdown process. ShutdownProcess Applikationen "%appName%" avbröt nerstängningen. +Application \"%appName%\" has aborted the shutdown process. ShutdownProcess Programmet "%appName%" avbröt avstängningen. Asking \"%appName%\" to quit. ShutdownProcess Ber "%appName%" att avsluta. -Asking background applications to quit. ShutdownProcess Ber bakgrunds applikationerna att avsluta. +Asking background applications to quit. ShutdownProcess Ber bakgrundsprogrammen att avsluta. Asking other processes to quit. ShutdownProcess Ber alla processer att avsluta. Cancel ShutdownProcess Avbryt -Cancel shutdown ShutdownProcess Avbryt nerstängning +Cancel shutdown ShutdownProcess Avbryt avstängning Do you really want to restart the system? ShutdownProcess Vill du verkligen starta om systemet? -Do you really want to shut down the system? ShutdownProcess Är du säker på att du vill avsluta systemet? +Do you really want to shut down the system? ShutdownProcess Är du säker på att du vill stänga av Haiku? It's now safe to turn off the computer. ShutdownProcess Nu är det säkert att slå av datorn. -Kill application ShutdownProcess Avsluta applikation +Kill application ShutdownProcess Avsluta program OK ShutdownProcess OK Restart ShutdownProcess Starta om Restart system ShutdownProcess Starta om Restarting… ShutdownProcess Startar om... Shut down ShutdownProcess Stäng av -Shutdown aborted ShutdownProcess Avslutningen avbröts +Shutdown aborted ShutdownProcess Avstängningen avbröts Shutdown status ShutdownProcess Avslutar Haiku Shutting down… ShutdownProcess Stänger av... -System is shut down ShutdownProcess Systemet är avslutat -The application \"%appName%\" might be blocked on a modal panel. ShutdownProcess Applikationen "%appName%" kan vara blockerad av en dialogruta. +System is shut down ShutdownProcess Systemet är avstängt +The application \"%appName%\" might be blocked on a modal panel. ShutdownProcess Programmet "%appName%" kan vara blockerad av en dialogruta. Tidying things up a bit. ShutdownProcess Städar upp lite. diff --git a/data/catalogs/tools/translation/inspector/uk.catkeys b/data/catalogs/tools/translation/inspector/uk.catkeys index d79c5c12c4..fd25d7dcb3 100644 --- a/data/catalogs/tools/translation/inspector/uk.catkeys +++ b/data/catalogs/tools/translation/inspector/uk.catkeys @@ -1,18 +1,32 @@ -1 ukrainian x.vnd.OBOS-Inspector 2081327042 +1 ukrainian x.vnd.OBOS-Inspector 2075781936 Active Translators ImageWindow Активні транслятори Active Translators InspectorApp Активні транслятори Bummer ImageWindow Помилка File ImageWindow Файл First Page ImageWindow Перша сторінка +Image: %1\nColor Space: %2 (%3)\nDimensions: %4 x %5\nBytes per Row: %6\nTotal Bytes: %7\n\nIdentify Info:\nID String: %8\nMIME Type: %9\nType: '%10' (%11)\nTranslator ID: %12\nGroup: '%13' (%14)\nQuality: %15\nCapability: %16\n\nExtension Info:\n ImageView Образ: %1\nКолір простору: %2 (%3)\nDРозміри: %4 x %5\nБіти в стрічці: %6\nВсього бітів: %7\n\nідентифікаційна інформація:\nID Стрічка: %8\nТипMIME: %9\nТип: '%10' (%11)\nТранслятор ID: %12\nГрупа: '%13' (%14)\nЯкість: %15\nЄмність: %16\n\nІнформація про розширення:\n +Info ImageWindow Інформація +Info Win InspectorApp This is a quite narrow info window and title 'Info Win' is therefore shortened. Info Win +Last Page ImageWindow Остання сторінка Next Page ImageWindow Наступна сторінка No image available to save. ImageWindow Немає доступних для збереження образів. Number of Documents: %1\n\nTranslator Used:\nName: %2\nInfo: %3\nVersion: %4\n ImageView Кількість документів: %1\n\nВикористати транслятор:\nName: %2\nІнфо: %3\nВерсія: %4\n +OK ImageView Гаразд +OK ImageWindow Гаразд +Open... ImageWindow Відкрити… Previous Page ImageWindow Попередня сторінка +Quit ImageWindow Вийти Save feature not implemented yet. ImageWindow Функція збереження не реалізована. +Save... ImageWindow Зберегти… Selected Document: %1\n\nTranslator Used:\nName: %2\nInfo: %3\nVersion: %4\n ImageView Вибрати документ: %1\n\nВикористати транслятор:\nІ'мя: %2\nІнформація: %3\nВерсія: %4\n Sorry, unable to load the image. ImageView Прикро , неможливо завантажити образ. Sorry, unable to write the image file. ImageView Прикро, неможливо записати файл образу. System Translators ActiveTranslatorsWindow Системні транслятори Unknown ImageView Невідомий User Translators ActiveTranslatorsWindow Транслятори користувача +View ImageWindow Вигляд +Window ImageWindow Вікно \nInput Formats: ImageView \nВхідні формати: +\nOutput Formats: ImageView \nВихідні формати: +\nTranslator Used:\nName: %1\nInfo: %2\nVersion: %3\n ImageView \nВикористати транслятор:\nІ'мя: %1\nІнформація: %2\nВерсія: %3\n +\nType: '%1' (%2)\nGroup: '%3' (%4)\nQuality: %5\nCapability: %6\nMIME Type: %7\nName: %8\n ImageView \nТип: '%1' (%2)\nГрупа: '%3' (%4)\nЯкість: %5\nЄмність: %6\nТип MIME: %7\nІ'мя: %8\n diff --git a/data/common/boot/post_install/mime_update.sh b/data/common/boot/post_install/mime_update.sh index fb8e137dcf..8917f72d19 100755 --- a/data/common/boot/post_install/mime_update.sh +++ b/data/common/boot/post_install/mime_update.sh @@ -1,7 +1,7 @@ #!/bin/sh _progress () { - notify --type progress --app mimeset \ + notify --type progress --group "MIME type updater" \ --timeout ${3:-30} \ --icon /boot/system/apps/DiskProbe \ --messageID $0_$$ \ @@ -15,8 +15,8 @@ _progress 0.0 "desktop files" for f in $(/bin/finddir B_DESKTOP_DIRECTORY 2>/dev/null\ || echo "/boot/home/Desktop")/*; do - if [ -f $f ]; then - mimeset -f $f + if [ -f "$f" ]; then + mimeset -f "$f" fi done diff --git a/data/develop/makefile b/data/develop/makefile index 6a6caebb63..51681517d5 100644 --- a/data/develop/makefile +++ b/data/develop/makefile @@ -1,4 +1,4 @@ -## BeOS Generic Makefile v2.4 ## +## BeOS Generic Makefile v2.5 ## ## Fill in this file to specify the project being created, and the referenced ## makefile-engine will do all of the hard work for you. This handles both @@ -56,6 +56,9 @@ RSRCS= # libXXX.so or libXXX.a you can simply specify XXX # library: libbe.so entry: be # +# - for version-independent linking of standard C++ libraries please add +# $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names +# # - for localization support add following libs: # locale localestub # diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine index 21be2f9a9f..279d0f05fb 100644 --- a/data/develop/makefile-engine +++ b/data/develop/makefile-engine @@ -1,8 +1,8 @@ -## BeOS and Haiku Generic Makefile Engine v2.4.0 +## BeOS and Haiku Generic Makefile Engine v2.5.0 ## Does all the hard work for the Generic Makefile ## which simply defines the project parameters -## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3, 2.4 +## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3, 2.4, 2.5 # determine wheather running on x86 or ppc MACHINE=$(shell uname -m) @@ -43,20 +43,20 @@ endif C++ := g++ # SETTING: set the CFLAGS for each binary type - ifeq ($(TYPE), DRIVER) + ifeq ($(strip $(TYPE)), DRIVER) CFLAGS += -D_KERNEL_MODE=1 -no-fpic else CFLAGS += endif # SETTING: set the proper optimization level - ifeq ($(OPTIMIZE), FULL) + ifeq ($(strip $(OPTIMIZE)), FULL) OPTIMIZER = -O3 else - ifeq ($(OPTIMIZE), SOME) + ifeq ($(strip $(OPTIMIZE)), SOME) OPTIMIZER = -O1 else - ifeq ($(OPTIMIZE), NONE) + ifeq ($(strip $(OPTIMIZE)), NONE) OPTIMIZER = -O0 else # OPTIMIZE not set so set to full @@ -66,7 +66,7 @@ endif endif # SETTING: set proper debugger flags - ifeq ($(DEBUGGER), TRUE) + ifeq ($(strip $(DEBUGGER)), TRUE) DEBUG += -g OPTIMIZER = -O0 endif @@ -74,10 +74,10 @@ endif CFLAGS += $(OPTIMIZER) $(DEBUG) # SETTING: set warning level - ifeq ($(WARNINGS), ALL) + ifeq ($(strip $(WARNINGS)), ALL) CFLAGS += -Wall -Wno-multichar -Wno-ctor-dtor-privacy else - ifeq ($(WARNINGS), NONE) + ifeq ($(strip $(WARNINGS)), NONE) CFLAGS += -w endif endif @@ -89,13 +89,13 @@ endif LDFLAGS += $(DEBUG) # SETTING: set linker flags for each binary type - ifeq ($(TYPE), APP) + ifeq ($(strip $(TYPE)), APP) LDFLAGS += -Xlinker -soname=_APP_ else - ifeq ($(TYPE), SHARED) + ifeq ($(strip $(TYPE)), SHARED) LDFLAGS += -nostart -Xlinker -soname=$(NAME) else - ifeq ($(TYPE), DRIVER) + ifeq ($(strip $(TYPE)), DRIVER) LDFLAGS += -nostdlib /boot/develop/lib/x86/_KERNEL_ \ /boot/develop/lib/x86/haiku_version_glue.o endif @@ -142,17 +142,21 @@ SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file)))) VPATH := VPATH += $(addprefix :, $(subst ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS)))) -# SETTING: build the local and system include paths +# SETTING: build the local and system include paths, compose C++ libs ifeq ($(CPU), x86) LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path))) ifeq ($(CC_VER), 2) INCLUDES = $(LOC_INCLUDES) INCLUDES += -I- INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -I, $(path))) + + STDCPPLIBS = stdc++.r4 else INCLUDES = -iquote./ INCLUDES += $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -iquote, $(path))) INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -isystem, $(path))) + + STDCPPLIBS = stdc++ supc++ endif else ifeq ($(CPU), ppc) @@ -191,7 +195,7 @@ LDFLAGS += $(LINKER_FLAGS) # SETTING: use the archive tools if building a static library # otherwise use the linker -ifeq ($(TYPE), STATIC) +ifeq ($(strip $(TYPE)), STATIC) BUILD_LINE = ar -cru "$(TARGET)" $(OBJS) else BUILD_LINE = $(LD) -o "$@" $(OBJS) $(LDFLAGS) @@ -310,7 +314,7 @@ $(CATALOGS_DIR)/%.catalog : $(CATKEYS_DIR)/%.catkeys # rule to preprocess program sources into file ready for collecting catkeys $(OBJ_DIR)/$(NAME).pre : $(SRCS) - -cat $(SRCS) | $(CC) -E $(INCLUDES) $(CFLAGS) -DB_COLLECTING_CATKEYS - > $(OBJ_DIR)/$(NAME).pre + -cat $(SRCS) | $(CC) -E -x c++ $(INCLUDES) $(CFLAGS) -DB_COLLECTING_CATKEYS - > $(OBJ_DIR)/$(NAME).pre # rules to collect localization catkeys catkeys : $(CATKEYS_DIR)/en.catkeys @@ -346,7 +350,7 @@ USER_BIN_PATH = /boot/home/config/add-ons/kernel/drivers/bin USER_DEV_PATH = /boot/home/config/add-ons/kernel/drivers/dev driverinstall :: default -ifeq ($(TYPE), DRIVER) +ifeq ($(strip $(TYPE)), DRIVER) copyattr --data $(TARGET) $(USER_BIN_PATH)/$(NAME) mkdir -p $(USER_DEV_PATH)/$(DRIVER_PATH) ln -sf $(USER_BIN_PATH)/$(NAME) $(USER_DEV_PATH)/$(DRIVER_PATH)/$(NAME) diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index e6faaa76fa..8dc3db38a9 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -164,6 +164,11 @@ if [ "$SAFEMODE" != "yes" ]; then launch $SERVERS/notification_server "" fi +# Launch Power Daemon +if [ "$SAFEMODE" != "yes" ]; then + launch $SERVERS/power_daemon "" +fi + # Check for daylight saving time launch system/bin/dstcheck diff --git a/data/system/data/KeyboardLayouts/Apple Aluminium b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium Extended International similarity index 73% rename from data/system/data/KeyboardLayouts/Apple Aluminium rename to data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium Extended International index dba6cde165..68c96bb948 100644 --- a/data/system/data/KeyboardLayouts/Apple Aluminium +++ b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium Extended International @@ -1,4 +1,4 @@ -name = Apple aluminium +name = Apple Aluminium Extended International # Size shortcuts default-size = 10,10 @@ -15,9 +15,8 @@ $f = 10,20 $two = 20,10 # Key rows -[ 0,0; 4,5:-; d$fn:0x01; $fn:+12; d$fn:0x00; 5,6:-; 10,6:0x04+2; 5,6:-; - 10,6:+4 ] -[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; d:+3; $b:-; d:+1; d:0x6a; d:0x23+1 ] +[ 0,0; 4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ] +[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ] [ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ] [ 0,26; 4,5:led-caps; # integrated into caps key d17,10:0x3b; :+11; :0x33; 50,10:-; :0x48-0x4a; d:0x3a ] diff --git a/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium International b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium International new file mode 100644 index 0000000000..38758b8bf1 --- /dev/null +++ b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminium International @@ -0,0 +1,27 @@ +name = Apple Aluminium International + +# Size shortcuts +default-size = 10,10 +$back = 17,10 +$fn = 10.5,6 +$lshift = 13,10 +$b = 2,12 +$d = 15,10 +$e = l12,20,8 +$f = 10,20 +$two = 20,10 +$last = 10,12 +$cmd = 14,12 +$arrow = 10,6 + +# Key rows +[ 0,0; 4,5:-; d$fn:0x01; $fn:+12; ] +[ 0,6; 4,5:-; :0x11+12; d$back:+; ] +[ 0,16; 4,5:-; d$d:0x26; :+12; d$e:0x47; ] +[ 0,26; 4,5:led-caps; # integrated into caps key + d17,10:0x3b; :+11; :0x33; ] +[ 0,36; 4,5:-; d$lshift:0x4b; :0x69; :0x4c+9; d24,10:+1; ] +[ 0,46; 4,5:-; d$last:-; # fn key + d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67; + d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ] +[ 121,52; d$arrow:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum (US) b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum (US) new file mode 100644 index 0000000000..976c71c12f --- /dev/null +++ b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum (US) @@ -0,0 +1,24 @@ +name = Apple Aluminum (US) + +# Size shortcuts +default-size = 10,10 +$back = 17,10 +$fn = 10.5,6 +$b = 2,12 +$f = 10,20 +$two = 20,10 +$last = 10,12 +$cmd = 14,12 +$arrow = 10,6 + +# Key rows +[ 0,0; 4,5:-; d$fn:0x01; $fn:+12; ] +[ 0,6; 4,5:-; :0x11+12; d$back:+; ] +[ 0,16; 4,5:-; d17,10:0x26; :+13; ] +[ 0,26; 4,5:led-caps; # integrated into caps key + d19,10:0x3b; :+11; d18,10:0x47; ] +[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; ] +[ 0,46; 4,5:-; d$last:-; # fn key + d$last:0x5c; d$last:0x5d; d$cmd:0x66; 49,12:0x5e; d$cmd:0x67; + d$last:0x5f; $arrow:-; d$arrow:0x57; $arrow:-; ] +[ 121,52; d$arrow:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum Extended (US) b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum Extended (US) new file mode 100644 index 0000000000..c2a753b9ec --- /dev/null +++ b/data/system/data/KeyboardLayouts/Apple Aluminum/Apple Aluminum Extended (US) @@ -0,0 +1,23 @@ +name = Apple Aluminum Extended (US) + +# Size shortcuts +default-size = 10,10 +$back = 17,10 +$fn = 10.5,6 +$shift = 24,10 +$ctrl = 14,10 +$alt = 12,10 +$cmd = 14,10 +$b = 5,10 +$f = 10,20 +$two = 20,10 + +# Key rows +[ 0,0; 4,5:-; d$fn:0x01; $fn:+12; 15.5,6:-; 10,6:0x70068; 10,6:+2; 5,6:-; 10,6:+4; ] +[ 0,6; 4,5:-; :0x11+12; d$back:+; $b:-; :-; d:0x20; d:+1; $b:-; d:+1; d:0x6a; d:0x23+1 ] +[ 0,16; 4,5:-; 0,16; 4,5:-; d17,10:0x26; :+13; $b:-; d:0x34-0x36; $b:-; :+3; d:0x25 ] +[ 0,26; 4,5:led-caps; # integrated into caps key + d19,10:0x3b; :+11; d18,10:0x47; 40,10:-; :0x48-0x4a; d:0x3a ] +[ 0,36; 4,5:-; d24,10:0x4b; :+10; d23,10:+1; 15,10:-; d:+1; 15,10:-; :+3; d$f:+1 ] +[ 0,46; 4,5:-; d$ctrl:0x5c; d$alt:0x5d; d$cmd:0x66; 67,10:0x5e; d$cmd:0x67; + d$alt:0x5f; d$ctrl:0x60; $b:-; d:+3; $b:-; $two:+1; :+1 ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad (US) b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad (US) new file mode 100644 index 0000000000..5dc834fc13 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad (US) @@ -0,0 +1,27 @@ +name = ThinkPad (US) + +# Size shortcuts +default-size = 18,18 +$s = 17,10 +$gap = 6,10 +$sgap = 5,10 +$backspace = 38,18 +$tab = 28,18 +$caps = 32,18 +$enter = d42,18 +$lshift = 41,18 +$rshift = 51,18 +$lctrl = 23,18 +$option = 13,18 +$space = 95,18 + +# Key rows +[ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ] +[ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ] +[ 0,20; :0x11+12; $backspace:+1; ] +[ 0,38; $tab:0x26; :+12; 28,18:+1; ] +[ 0,56; $caps:0x3b; :+11; $enter:0x47; ] +[ 0,74; $lshift:0x4b; :0x4c+9; $rshift:+1 ] +[ 0,92; :-; $lctrl:0x5c; $option:0x66; :0x5d; $space:+1; + :+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ] +[ 221,102; $s:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/IBM Laptop International b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad International similarity index 80% rename from data/system/data/KeyboardLayouts/IBM Laptop International rename to data/system/data/KeyboardLayouts/ThinkPad/ThinkPad International index b595f9c934..f98e71dea0 100644 --- a/data/system/data/KeyboardLayouts/IBM Laptop International +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad International @@ -1,4 +1,4 @@ -name = IBM Laptop International +name = ThinkPad International # Size shortcuts default-size = 18,18 @@ -17,10 +17,10 @@ $space = 95,18 # Key rows [ 0,0; $s:0x01; 148,10:-; $s:0x0e+2; $sgap:-; $s:0x1f+2; ] [ 0,10; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; $sgap:-; $s:0x34+2; ] -[ 0,20; :0x11+12; $backspace:+1 ] +[ 0,20; :0x11+12; $backspace:+1; ] [ 0,38; $tab:0x26; :+12; $enter:0x47; ] [ 0,56; $caps:0x3b; :+11; :0x33 ] [ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ] -[ 0,92; :0x99; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1; +[ 0,92; :-; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1; :+1; :0x68; :0x60; $s:0x9a; $s:0x57; $s:0x9b ] [ 221,102; $s:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s (US) b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s (US) new file mode 100644 index 0000000000..aad37c6d72 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s (US) @@ -0,0 +1,28 @@ +name = ThinkPad T400s (US) + +# Size shortcuts +default-size = 18,18 +$s = 16,10 +$sdouble = 16,20 +$gap = 4,10 +$backspace = 38,18 +$tab = 28,18 +$caps = 32,18 +$enter = d42,18 +$lshift = 41,18 +$rshift = 51,18 +$lctrl = 23,18 +$option = 13,18 +$space = 95,18 +$arrow = 17,10 + +# Key rows +[ 0,0; $sdouble:0x01; 140,10:-; $s:0x0e+2; $s:0x1f; $gap:-; $sdouble:0x34; $s:0x20+1; ] +[ 0,10; 20,10:-; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; 20,10:-; $s:0x35+1; ] +[ 0,20; :0x11+12; $backspace:+1; ] +[ 0,38; $tab:0x26; :+12; 28,18:+1; ] +[ 0,56; $caps:0x3b; :+11; $enter:0x47; ] +[ 0,74; $lshift:0x4b; :0x4c+9; $rshift:+1 ] +[ 0,92; :-; $lctrl:0x5c; $option:0x66; :0x5d; $space:+1; + :+1; :0x68; :0x60; $arrow:0x9a; $arrow:0x57; $arrow:0x9b ] +[ 221,102; $arrow:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s International b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s International new file mode 100644 index 0000000000..ca0d5b6998 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad T400s International @@ -0,0 +1,27 @@ +name = ThinkPad T400s International + +# Size shortcuts +default-size = 18,18 +$s = 16,10 +$sdouble = 16,20 +$gap = 4,10 +$backspace = 38,18 +$tab = 28,18 +$caps = 32,18 +$enter = dl28,36,22 +$l-shift-ctrl = 23,18 +$r-shift = 51,18 +$option = 13,18 +$space = 95,18 +$arrow = 17,10 + +# Key rows +[ 0,0; $sdouble:0x01; 140,10:-; $s:0x0e+2; $s:0x1f; $gap:-; $sdouble:0x34; $s:0x20+1; ] +[ 0,10; 20,10:-; $s:0x02+3; $gap:-; $s:+4; $gap:-; $s:+4; 20,10:-; $s:0x35+1; ] +[ 0,20; :0x11+12; $backspace:+1; ] +[ 0,38; $tab:0x26; :+12; $enter:0x47; ] +[ 0,56; $caps:0x3b; :+11; :0x33 ] +[ 0,74; $l-shift-ctrl:0x4b; :0x69; :0x4c+9; $r-shift:+1 ] +[ 0,92; :-; $l-shift-ctrl:0x5c; $option:0x66; :0x5d; $space:+1; + :+1; :0x68; :0x60; $arrow:0x9a; $arrow:0x57; $arrow:0x9b ] +[ 221,102; $arrow:0x61+2; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 (US) b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 (US) new file mode 100644 index 0000000000..88c2e4e902 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 (US) @@ -0,0 +1,28 @@ +name = ThinkPad X1 (US) + +# Size shortcuts +default-size = 18,18 +$s = 15,10 +$s2 = 23.5,10 +$backspace = 38,18 +$tab = 28,18 +$caps = 32,18 +$enter = d42,18 +$lshift = 42,18 +$rshift = 50,18 +$lctrl = 24,20 +$bottom = 18,20 +$space = 90,20 +$sarrow = 16,10 +$arrow = 18,10 + +# Key rows +[ 0,0; $s2:0x01; $s:+12; $s:0x20; $s:0x35; $s:0x1f; $s2:0x34; ] +[ 0,10; :0x11+12; $backspace:+1; ] +[ 0,28; $tab:0x26; :+12; 28,18:+1; ] +[ 0,46; $caps:0x3b; :+11; $enter:0x47; ] +[ 0,64; $lshift:0x4b; :0x4c+9; $rshift:+1 ] +[ 0,82; $bottom:-; $lctrl:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1; + $bottom:+1; $bottom:0x0e; $bottom:0x60; $sarrow:0x21; $arrow:0x57; + $sarrow:0x36; ] +[ 222,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 International b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 International new file mode 100644 index 0000000000..f00efe05ec --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X1 International @@ -0,0 +1,28 @@ +name = ThinkPad X1 International + +# Size shortcuts +default-size = 18,18 +$s = 15,10 +$s2 = 23.5,10 +$backspace = 38,18 +$tab = 28,18 +$caps = 32,18 +$enter = dl28,36,22 +$lshift = 24,18 +$rshift = 50,18 +$lctrl = 24,20 +$bottom = 18,20 +$space = 90,20 +$sarrow = 16,10 +$arrow = 18,10 + +# Key rows +[ 0,0; $s2:0x01; $s:+12; $s:0x20; $s:0x35; $s:0x1f; $s2:0x34; ] +[ 0,10; :0x11+12; $backspace:+1; ] +[ 0,28; $tab:0x26; :+12; $enter:0x47; ] +[ 0,46; $caps:0x3b; :+11; :0x33 ] +[ 0,64; $lshift:0x4b; :0x69; :0x4c+9; $rshift:+1 ] +[ 0,82; $bottom:-; $lctrl:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1; + $bottom:+1; $bottom:0x0e; $bottom:0x60; $sarrow:0x21; $arrow:0x57; + $sarrow:0x36; ] +[ 222,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e (US) b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e (US) new file mode 100644 index 0000000000..ebf9a24273 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e (US) @@ -0,0 +1,26 @@ +name = ThinkPad X100e (US) + +# Size shortcuts +default-size = 19,18 +$s = 15.5,10 +$gap = 2.125,10 +$backspace = 25,18 +$tab = 25,18 +$caps = 32,18 +$enter = d31,18 +$shift = 41,18 +$bottom = 19,20 +$space = 105,20 +$sarrow = 17,10 +$arrow = 19,10 + +# Key rows +[ 0,0; $s:0x01; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:0x1f; + $s:0x34; $s:0x20; $s:0x35; ] +[ 0,10; :0x11+12; $backspace:+1; ] +[ 0,28; $tab:0x26; :+13; ] +[ 0,46; $caps:0x3b; :+11; $enter:0x47; ] +[ 0,64; $shift:0x4b; :0x4c+9; $shift:+1 ] +[ 0,82; $bottom:-; $bottom:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1; + $bottom:+1; $bottom:0x60; 17,9:0x21; $arrow:0x57; 17,9:0x36; ] +[ 219,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ] diff --git a/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e International b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e International new file mode 100644 index 0000000000..8161f73977 --- /dev/null +++ b/data/system/data/KeyboardLayouts/ThinkPad/ThinkPad X100e International @@ -0,0 +1,29 @@ +name = ThinkPad X100e International + +# Size shortcuts +default-size = 19,18 +$s = 15.5,10 +$gap = 2.125,10 +$backspace = 25,18 +$tab = 27,18 +$caps = 33,18 +$small = 16,18 +$enter = dl23,36,15 +$lshift = 22,18 +$rshift = 41,18 +$bottom = 19,20 +$space = 105,20 +$sarrow = 17,10 +$arrow = 19,10 + +# Key rows +[ 0,0; $s:0x01; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:+4; $gap:-; $s:0x1f; + $s:0x34; $s:0x20; $s:0x35; ] +[ 0,10; :0x11+12; $backspace:+1; ] +[ 0,28; $tab:0x26; :+10; $small:+1; $small:+1; $enter:0x47; ] +[ 0,46; $caps:0x3b; :+10; $small:+1; $small:0x33; ] +[ 0,64; $lshift:0x4b; :0x69; :0x4c+9; $rshift:+1; ] +[ 0,82; $bottom:-; $bottom:0x5c; $bottom:0x66; $bottom:0x5d; $space:+1; + $bottom:+1; $bottom:0x60; 17,9:0x21; $arrow:0x57; + 17,9:0x36; ] +[ 219,92; $sarrow:0x61; $arrow:0x62; $sarrow:0x63; ] diff --git a/src/apps/cortex/addons/LoggingConsumer/LICENSE.Be b/data/system/data/licenses/Be Sample Code License similarity index 100% rename from src/apps/cortex/addons/LoggingConsumer/LICENSE.Be rename to data/system/data/licenses/Be Sample Code License diff --git a/docs/develop/ports/m68k/TODO b/docs/develop/ports/m68k/TODO new file mode 100644 index 0000000000..a75d4dadbe --- /dev/null +++ b/docs/develop/ports/m68k/TODO @@ -0,0 +1,4 @@ +- fix the VM stuff that broke after the Great VM Overhaul(tm). +- optimization: remove M68KPagingStructures[*]::UpdateAllPageDirs() and just allocate all the kernel page root entries at boot and be done with it. It's not very big anyway. +- possibly other optimizations in the VM code due to not supporting SMP? + diff --git a/docs/develop/ports/m68k/atari/atariexe.txt b/docs/develop/ports/m68k/atari/atariexe.txt new file mode 100644 index 0000000000..4061c2eead --- /dev/null +++ b/docs/develop/ports/m68k/atari/atariexe.txt @@ -0,0 +1,57 @@ +Subject: Atari ST executables +From: DaFi + +The specs for Atari ST executables (was listed as requested on www.wotsit.demon.co.uk/wanted.htm)... + +applies for TOS, PRG, TTP, PRX, GTP, APP, ACC, ACX (different suffixes indicate different behavior of the program, i.e. TOS and TTP may not use the GEM GUI, while all the others may; only TTP and GTP can be called with parameters; ACC may be installed as desktop accessories; PRX and ACX mean the programs were disabled. + +file structure: +[2] WORD PRG_magic - magic value 0x601a +[4] LONG PRG_tsize - size of text segment +[4] LONG PRG_dsize - size of data segment +[4] LONG PRG_bsize - size of bss segment +[4] LONG PRG_ssize - size of symbol table +[4] LONG PRG_res1 - reserved +[4] LONG PRGFLAGS - bit vector that defines additional process characteristics, as follows: + Bit 0 PF_FASTLOAD - if set, only the BSS area is cleared, otherwise, + the programs whole memory is cleared before loading + Bit 1 PF_TTRAMLOAD - if set, the program will be loaded into TT RAM + Bit 2 PF_TTRAMMEM - if set, the program will be allowed to allocate + memory from TT RAM + Bit 4 AND 5 as a two bit value with the following meanings: + 0 PF_PRIVATE - the processes entire memory space is considered private + 1 PF_GLOBAL - the processes memory will be r/w-allowed for others + 2 PF_SUPER - the memory will be r/w for itself and any supervisor proc + 3 PF_READ - the memory will be readable by others +[2] WORD ABSFLAG - is NON-ZERO, if the program does not need to be relocated + is ZERO, if the program needs to be relocated + note: since some TOS versions handle files with ABSFLAG>0 incorrectly, + this value should be set to ZERO also for programs that need to be + relocated, and the FIXUP_offset should be set to 0. + +From there on... (should be offset 0x1c) +[PRG_tsize] TEXT segment +[PRG_dsize] DATA segment +[PRG_ssize] Symbol table + +[4] LONG FIXUP_offset - first LONG that needs to be relocated (offset to beginning of file) + +From there on till the end of the file... +FIXUP table, with entries as follows: +[1] BYTE value - with value as follows: + value=0 end of list + value=1 advance 254 bytes + value=2 to value=254 (only even values!) advance this many bytes and + relocate the LONG found there +Thats it. You made it through to EOF. + +A final note about fixing up (relocating) an executable: (pseudo-code) +The long value FIXUP_offset tells you your start adress. Lets call it "adr". So, now, that +you have adr, read the first byte of the table. +(*) loop +- if its 0, stop relocating -> youre done! +- if its 1, add 254 to adr and read the next byte, jump back to the asterisk (*) +- if its any other even value, add the value to your adr, then relocate the LONG at adr. + (i.e. add the adress of the LONG to its value) + +dafi diff --git a/docs/develop/ports/ppc/mac/urls.txt b/docs/develop/ports/ppc/mac/urls.txt new file mode 100644 index 0000000000..b0cf634ba3 --- /dev/null +++ b/docs/develop/ports/ppc/mac/urls.txt @@ -0,0 +1,9 @@ +http://www.debian.org/releases/stable/powerpc/ch05s01.html.en +http://www.kernelthread.com/mac/osx/arch_boot.html +http://playground.sun.com/1275/mejohnson/ +http://homepages.gold.ac.uk/suzanne/startup.html +http://www.netbsd.org/ports/macppc/SystemDisk-tutorial/ +http://www.netneurotic.net/mac/openfirmware.html +http://www.netbsd.org/ports/macppc/faq.html +http://mail-index.netbsd.org/port-macppc/1999/03/21/0001.html +http://mail-index.netbsd.org/port-macppc/1999/06/25/0006.html diff --git a/docs/user/Doxyfile b/docs/user/Doxyfile index 8e8b4a8e5c..3681a59e82 100644 --- a/docs/user/Doxyfile +++ b/docs/user/Doxyfile @@ -1,203 +1,240 @@ -# Doxyfile 1.5.2 +# Doxyfile 1.7.3 # This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project +# doxygen (www.doxygen.org) for a project. # -# All text after a hash (#) is considered a comment and will be ignored +# All text after a hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] # For lists items can also be appended using: # TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") +# Values that contain spaces should be placed between quotes (" "). #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of -# possible encodings. +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. PROJECT_NAME = "The Haiku Book" -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or # if some version control system is used. PROJECT_NUMBER = pre-R1 -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location +# Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. OUTPUT_DIRECTORY = ../../generated/doxygen -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. CREATE_SUBDIRS = NO -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). # Set to NO to disable this. BRIEF_MEMBER_DESC = YES -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. REPEAT_BRIEF = YES -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" # "represents" "a" "an" "the" -ABBREVIATE_BRIEF = +ABBREVIATE_BRIEF = -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief # description. ALWAYS_DETAILED_SEC = NO -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment # operators of the base classes will not be shown. INLINE_INHERITED_MEMB = YES -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set # to NO the shortest path that makes the file name unique will be used. FULL_PATH_NAMES = NO -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = +STRIP_FROM_PATH = -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that # are normally passed to the compiler using the -I flag. -STRIP_FROM_INC_PATH = +STRIP_FROM_INC_PATH = -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system # doesn't support long names like on DOS, Mac, or CD-ROM. SHORT_NAMES = NO -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) JAVADOC_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it # re-implements. INHERIT_DOCS = YES -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will # be part of the file/class/namespace that contains it. SEPARATE_MEMBER_PAGES = NO -# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 4 -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". # You can put \n's in the value part of an alias to insert newlines. -ALIASES = +ALIASES = "key{1}=\1" -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list # of all members will be omitted, etc. OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this +# tag. The format is ext=language, where ext is a file extension, and language +# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, +# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make +# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C +# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions +# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration # diagrams that involve STL classes more complete and accurate. BUILTIN_STL_SUPPORT = NO @@ -207,420 +244,531 @@ BUILTIN_STL_SUPPORT = NO CPP_CLI_SUPPORT = NO -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default # all members of a group must be documented explicitly. DISTRIBUTE_GROUP_DOC = NO -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using # the \nosubgrouping command. SUBGROUPING = YES +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES EXTRACT_ALL = NO -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. EXTRACT_PRIVATE = NO -# If the EXTRACT_STATIC tag is set to YES all static members of a file +# If the EXTRACT_STATIC tag is set to YES all static members of a file # will be included in the documentation. EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = NO -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. # If set to NO (the default) only methods in the interface are included. EXTRACT_LOCAL_METHODS = NO -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. # This option has no effect if EXTRACT_ALL is enabled. -HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_MEMBERS = YES -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various # overviews. This option has no effect if EXTRACT_ALL is enabled. -HIDE_UNDOC_CLASSES = NO +HIDE_UNDOC_CLASSES = YES -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = YES -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the # function's detailed documentation block. HIDE_IN_BODY_DOCS = NO -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. INTERNAL_DOCS = NO -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. CASE_SENSE_NAMES = YES -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the # documentation. If set to YES the scope will be hidden. HIDE_SCOPE_NAMES = NO -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation # of that file. SHOW_INCLUDE_FILES = NO -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] # is inserted in the documentation for inline members. INLINE_INFO = YES -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in # declaration order. SORT_MEMBER_DOCS = YES -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in # declaration order. SORT_BRIEF_DOCS = YES -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = YES + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the +# Note: This option applies only to the class list, not to the # alphabetical list. SORT_BY_SCOPE_NAME = NO -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even if there is only one candidate or it is obvious which candidate to choose by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. GENERATE_TODOLIST = NO -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test # commands in the documentation. GENERATE_TESTLIST = NO -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. GENERATE_BUGLIST = NO -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= NO -# The ENABLED_SECTIONS tag can be used to enable conditional +# The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. -ENABLED_SECTIONS = +ENABLED_SECTIONS = -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer # command in the documentation regardless of this setting. MAX_INITIALIZER_LINES = 30 -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the # list will mention the files that were used to generate the documentation. SHOW_USED_FILES = NO -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. SHOW_DIRECTORIES = NO -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output # is used as the file version. See the manual for examples. -FILE_VERSION_FILTER = +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. The create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The QUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. QUIET = YES -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank # NO is used. WARNINGS = YES -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will # automatically be disabled. WARN_IF_UNDOCUMENTED = YES -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that # don't exist or using markup commands wrongly. WARN_IF_DOC_ERROR = YES -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of # documentation. WARN_NO_PARAMDOC = NO -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) WARN_FORMAT = "$file:$line: $text" -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = +WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories # with spaces. INPUT = . \ - app \ + app \ drivers \ - interface \ - locale \ + interface \ + locale \ + media \ midi \ midi2 \ + storage \ support \ - ../../headers/os/app \ + ../../headers/os/app \ ../../headers/os/drivers/fs_interface.h \ ../../headers/os/drivers/USB3.h \ ../../headers/os/drivers/USB_spec.h \ - ../../headers/os/interface/AbstractLayout.h \ - ../../headers/os/interface/Box.h \ - ../../headers/os/interface/GridLayout.h \ - ../../headers/os/interface/GroupLayout.h \ - ../../headers/os/interface/Layout.h \ - ../../headers/os/interface/LayoutBuilder.h \ - ../../headers/os/interface/LayoutItem.h \ - ../../headers/os/interface/TwoDimensionalLayout.h \ + ../../headers/os/interface \ ../../headers/os/locale \ + ../../headers/os/media \ ../../headers/os/midi2 \ + ../../headers/os/storage \ ../../headers/os/support \ ../../headers/posix/syslog.h -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. -# See http://www.gnu.org/software/libiconv for the list of possible encodings. +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. INPUT_ENCODING = UTF-8 -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl FILE_PATTERNS = *.dox \ *.h \ *.c \ *.cpp -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. RECURSIVE = NO -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded # from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* EXCLUDE_PATTERNS = */libkernelppp/_KPPP* -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, -# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test -EXCLUDE_SYMBOLS = +EXCLUDE_SYMBOLS = -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left # blank all files are included. -EXAMPLE_PATTERNS = +EXAMPLE_PATTERNS = -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. EXAMPLE_RECURSIVE = NO -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see # the \image command). IMAGE_PATH = . \ + interface \ midi2 -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. -INPUT_FILTER = +INPUT_FILTER = -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. -FILTER_PATTERNS = +FILTER_PATTERNS = -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source # files to browse (i.e. when SOURCE_BROWSER is set to YES). FILTER_SOURCE_FILES = NO +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also # VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = NO -# Setting the INLINE_SOURCES tag to YES will include the body +# Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. INLINE_SOURCES = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code # fragments. Normal C and C++ comments will always remain visible. STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES @@ -628,20 +776,21 @@ REFERENCES_RELATION = YES # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from # functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# link to the source code. +# Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = NO -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You # will need version 4.8.6 or higher. USE_HTAGS = NO -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for # which an include is specified. Set to NO to disable this. VERBATIM_HEADERS = NO @@ -650,279 +799,508 @@ VERBATIM_HEADERS = NO # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project # contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) COLS_IN_ALPHA_INDEX = 5 -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that # should be ignored while generating the index headers. -IGNORE_PREFIX = +IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will # generate HTML output. GENERATE_HTML = YES -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `html' will be used as the default path. HTML_OUTPUT = html -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank # doxygen will generate files with .html extension. HTML_FILE_EXTENSION = .html -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a # standard header. HTML_HEADER = header.html -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a # standard footer. HTML_FOOTER = footer.html -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! HTML_STYLESHEET = book.css -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the stylesheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to # NO a bullet list will be used. HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output directory. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run # the HTML help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that # it should be included in the master .chm file (NO). GENERATE_CHI = NO -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. BINARY_TOC = NO -# The TOC_EXPAND flag can be set to YES to add extra items for group members +# The TOC_EXPAND flag can be set to YES to add extra items for group members # to the contents of the HTML help documentation and to the tree view. TOC_EXPAND = NO -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. DISABLE_INDEX = NO -# This tag can be used to set the number of enum values (range [1..20]) +# This tag can be used to set the number of enum values (range [0,1..20]) # that doxygen will group on one line in the generated HTML documentation. +# Note that a value of 0 will completely suppress the enum values from appearing in the overview section. ENUM_VALUES_PER_LINE = 1 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. GENERATE_TREEVIEW = NO -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree # is shown. TREEVIEW_WIDTH = 250 +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the mathjax.org site, so you can quickly see the result without installing +# MathJax, but it is strongly recommended to install a local copy of MathJax +# before deployment. + +MATHJAX_RELPATH = http://www.mathjax.org/mathjax + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvantages are that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. GENERATE_LATEX = NO -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `latex' will be used as the default path. LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be # invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_LATEX = NO -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and # executive. If left blank a4wide will be used. PAPER_TYPE = a4wide -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX # packages that should be included in the LaTeX output. -EXTRA_PACKAGES = +EXTRA_PACKAGES = -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a # standard header. Notice: only use this tag if you know what you are doing! -LATEX_HEADER = +LATEX_HEADER = -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. PDF_HYPERLINKS = NO -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. USE_PDFLATEX = NO -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. # This option is also used when generating formulas in HTML. LATEX_BATCHMODE = NO -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) # in the output. LATEX_HIDE_INDICES = NO +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with # other RTF readers or editors. GENERATE_RTF = NO -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `rtf' will be used as the default path. RTF_OUTPUT = rtf -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to # save some trees in general. COMPACT_RTF = NO -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. # Note: wordpad (write) and others do not support links. RTF_HYPERLINKS = NO -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide # replacements, missing definitions are set to their default value. -RTF_STYLESHEET_FILE = +RTF_STYLESHEET_FILE = -# Set optional variables used in the generation of an rtf document. +# Set optional variables used in the generation of an rtf document. # Syntax is similar to doxygen's config file. -RTF_EXTENSIONS_FILE = +RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will # generate man pages GENERATE_MAN = NO -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `man' will be used as the default path. MAN_OUTPUT = man -# The MAN_EXTENSION tag determines the extension that is added to +# The MAN_EXTENSION tag determines the extension that is added to # the generated man pages (default is the subroutine's section .3) MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -931,33 +1309,33 @@ MAN_LINKS = NO # configuration options related to the XML output #--------------------------------------------------------------------------- -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of # the code including all documentation. GENERATE_XML = YES -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be # put in front of it. If left blank `xml' will be used as the default path. XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that # enabling this will significantly increase the size of the XML output. XML_PROGRAMLISTING = YES @@ -966,10 +1344,10 @@ XML_PROGRAMLISTING = YES # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO @@ -978,313 +1356,350 @@ GENERATE_AUTOGEN_DEF = NO # configuration options related to the Perl module output #--------------------------------------------------------------------------- -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the # moment. GENERATE_PERLMOD = NO -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able # to generate PDF and DVI output from the Perl module output. PERLMOD_LATEX = NO -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. PERLMOD_PRETTY = YES -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same # Makefile don't overwrite each other's variables. -PERLMOD_MAKEVAR_PREFIX = +PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- -# Configuration options related to the preprocessor +# Configuration options related to the preprocessor #--------------------------------------------------------------------------- -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include # files. ENABLE_PREPROCESSING = YES -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled # way by setting EXPAND_ONLY_PREDEF to YES. MACRO_EXPANSION = NO -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the # PREDEFINED and EXPAND_AS_DEFINED tags. EXPAND_ONLY_PREDEF = NO -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files # in the INCLUDE_PATH (see below) will be search if a #include is found. SEARCH_INCLUDES = YES -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = +INCLUDE_PATH = -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = +INCLUDE_FILE_PATTERNS = -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator # instead of the = operator. -# Beep.h and SupportDefs.h require __cplusplus to be defined. -# SupportDefs.h defines some things that are also defined in types.h. There's -# check whether or not types.h has already been included. There is no need -# to put these definitions in our docs. - PREDEFINED = __cplusplus \ _SYS_TYPES_H -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition that overrules the definition found in the source code. -EXPAND_AS_DEFINED = +EXPAND_AS_DEFINED = -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all references to function-like macros +# that are alone on a line, have an all uppercase name, and do not end with a +# semicolon, because these will confuse the parser if not removed. SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool # does not have to be run to correct the links. # Note that each tag file must have a unique name # (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen +# If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = -# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. -GENERATE_TAGFILE = +GENERATE_TAGFILE = -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes # will be listed. ALLEXTERNALS = NO -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES -# The PERL_PATH should be the absolute path and name of the perl script +# The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). PERL_PATH = /boot/home/config/bin/perl #--------------------------------------------------------------------------- -# Configuration options related to the dot tool +# Configuration options related to the dot tool #--------------------------------------------------------------------------- -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option also works with HAVE_DOT disabled, but it is recommended to +# install and use dot, since it yields more powerful graphs. CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to -# be found in the default search path. +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. -MSCGEN_PATH = +MSCGEN_PATH = -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) HAVE_DOT = NO -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is +# allowed to run in parallel. When set to 0 (the default) doxygen will +# base this on the number of processors available in the system. You can set it +# explicitly to a value larger than 0 to get control over the balance +# between CPU load and processing speed. + +DOT_NUM_THREADS = 0 + +# By default doxygen will write a font called Helvetica to the output +# directory and reference it in all dot files that doxygen generates. +# When you want a differently looking font you can specify the font name +# using DOT_FONTNAME. You need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the # the CLASS_DIAGRAMS tag to NO. CLASS_GRAPH = YES -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and # class references variables) of the class with other documented classes. COLLABORATION_GRAPH = YES -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen # will generate a graph for groups, showing the direct groups dependencies GROUP_GRAPHS = YES -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling # Language. UML_LOOK = NO -# If set to YES, the inheritance and collaboration graphs will show the +# If set to YES, the inheritance and collaboration graphs will show the # relations between templates and their instances. TEMPLATE_RELATIONS = YES -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with # other documented files. INCLUDE_GRAPH = NO -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or # indirectly include this file. INCLUDED_BY_GRAPH = NO -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. CALLER_GRAPH = NO -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will generate a graphical hierarchy of all classes instead of a textual one. GRAPHICAL_HIERARCHY = YES -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories # in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, svg, gif or svg. # If left blank png will be used. DOT_IMAGE_FORMAT = png -# The tag DOT_PATH can be used to specify the path where the dot tool can be +# The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found in the path. -DOT_PATH = +DOT_PATH = -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the # \dotfile command). -DOTFILE_DIRS = +DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen will always -# show the root nodes and its direct children regardless of this setting. +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the +# \mscfile command). + +MSCFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. DOT_MULTI_TARGETS = NO -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and # arrows in the dot generated graphs. GENERATE_LEGEND = YES -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate # the various graphs. DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff --git a/docs/user/app/Application.dox b/docs/user/app/Application.dox new file mode 100644 index 0000000000..f64f2399b2 --- /dev/null +++ b/docs/user/app/Application.dox @@ -0,0 +1,551 @@ +/* + * Copyright 2011, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * John Scipione, jscipione@gmail.com + * + * Corresponds to: + * /trunk/headers/os/app/Application.h rev 42794 + * /trunk/src/kits/app/Application.cpp rev 42794 + */ + + +/*! + \file Application.h + \brief Provides the BApplication class. +*/ + + +/*! + \class BApplication + \ingroup app + \ingroup libbe + \brief A container object for an application. + + A BApplication establishes a connection between the application and the + Application Server. + + The most common task performed by a BApplication object is to handle + messages sent to it. The BApplication object also is used + to get information about your application such as the number of windows + it has, its signature, executable location, and launch flags. + + The BApplication object is automatically assigned to the global \c be_app + variable. The \c be_app variable allows you to refer to your BApplication + object from anywhere in the code. + + To use a BApplication you first construct the object and then begin its + message loop by calling the Run() method. The Run() method + continues until the application is told to quit. Once Run() returns you + should then delete the BApplication object to free its memory usage. + + Typically, you initialize the BApplication object in the programs main() + function. A typical main() function looks something like this: + + \code +#include Application.h + +main() +{ + /* Vendor is your vendor name, application is your application name */ + BApplication app("application/x-vnd.vendor-application"); + app->Run(); + delete app; + + return 0; +} + \endcode +*/ + + +/*! + \fn BApplication::BApplication(const char *signature) + \brief Initialize a BApplication with the passed in \a signature. + + The new BApplication is, by default, not running yet. If you have + everything set up properly call Run() to start the application. + + You should call InitCheck() to check for constructor initialization + errors. + + \param signature The \a signature of the application. +*/ + + +/*! + \fn BApplication::BApplication(const char *signature, status_t *_error) + \brief Initialize a BApplication with the passed in \a signature and a + pointer to an error message. + + Any error that occurs while constructing the BApplication will be + set to the \a _error pointer. If \a _error points to a \c status_t + error then you should not call Run(). + + Alternately, you can call InitCheck() to check for constructor + initialization errors. + + \param signature The \a signature of the application. + \param _error A pointer to a \c status_t set by the BApplication + constructor. +*/ + +/*! + \fn status_t BApplication::InitCheck() const + \brief Returns the status of the constructor. + + \returns If initialization succeeded returns \c B_OK, otherwise returns an + error status. +*/ + + +/*! + \name Archiving +*/ + + +//! @{ + + +/*! + \fn BApplication::BApplication(BMessage *data) + \brief Initialize a BApplication object from a message. + + The message must contain the signature of the application you wish to + initialize in the "mime_sig" variable. + + \param data The message to initialize the BApplication from. +*/ + + +/*! + \fn status_t BApplication::Archive(BMessage *data, bool deep) const + \brief Archive the BApplication object into a BMessage. + + \sa BArchivable::Archive() +*/ + + +/*! + \fn BArchivable* BApplication::Instantiate(BMessage* data) + \brief Restores the BApplication object from a BMessage. + + \sa BArchivable::Instantiate() +*/ + + +//! @} + + +/*! + \fn BApplication::~BApplication() + \brief Destructor Method +*/ + + +/*! + \name Message Loop Control +*/ + + +//! @{ + + +/*! + \fn thread_id BApplication::Run() + \brief Starts the message loop in the thread that it is called from, + and doesn't return until the message loop stops. Run() does not spawn + a new thread. + + \returns the thread_id of the thread that the BApplication is called from. +*/ + + +/*! + \fn void BApplication::Quit() + \brief Tells the thread to finish processing the message queue, disallowing + any new messages. + + Quit() doesn't kill the looper thread. After Quit() returns, it doesn't wait + for the message queue to empty. Run() will be then able to return. + + Quit() doesn't delete the BApplication object after Run() is called. You + should delete the BApplication object yourself one Run() returns. + However Quit() does delete the object if it's called before the message loop + starts i.e. before Run() is called. +*/ + + +//! @} + + +/*! + \name Hook Methods +*/ + + +//! @{ + + +/*! + \fn bool BApplication::QuitRequested() + \brief Hook method that gets invoked when the BApplication receives a + \c B_QUIT_REQUESTED message. + + BApplication sends a QuitRequested() message to each of its BWindow objects. + If all of the BWindow s return \c true then the windows are + each destroyed (through BWindow::Quit()) and QuitRequested() returns + \c true. If any of the BWindow returns \c false, the BWindow s + are not destroyed and QuitRequested() returns \c false. + + \retval true The application quit. + \retval false The application failed to quit. +*/ + + +/*! + \fn void BApplication::ReadyToRun() + \brief Hook method that's invoked when the BApplication receives a + \c B_READY_TO_RUN message. + + The ReadyToRun() method is automatically called by the Run() method. It is + sent after the initial \c B_REFS_RECEIVED and \c B_ARGV_RECEIVED messages + (if any) have already been handled. ReadyToRun() is the only message that + every running application is guaranteed to receive. + + The default version of ReadyToRun() is empty. You should override the + ReadyToRun() method to do whatever you want to do. If you haven't + constructed any windows in your application yet then this would be a good + place to do so. +*/ + + +/*! + \fn void BApplication::ArgvReceived(int32 argc, char **argv) + \brief Hook method that gets invoked when the application receives a + \c B_ARGV_RECEIVED message. + + If command line arguments are specified when the application is launched + from the the shell, or if \c argv/argc values are passed to + BRoster::Launch(), then this method is executed. + + \warning ArgvReceived() is not called if no command line arguments are + specified, or if BRoster::Launch() was called without any \c argv/argc + values. + + The arguments passed to ArgvReceived() are the constructed in the same way + as those passed to command line programs. The number of command line + arguments is passed in \a argc and the arguments themselves are passed as an + array of strings in \a argv. The first \a argv string is the name of the + program and the rest of the strings are the command line arguments. + + BRoster::Launch() adds the program name to the front of the \a argv array + and increments the \a argc value. + + The \c B_ARGV_RECEIVED message (if sent) is sent only once, just + before the \c B_READY_TO_RUN message is sent. However, if you try to + relaunch an application that is already running and the application is set + to \c B_EXCLUSIVE_LAUNCH or \c B_SINGLE_LAUNCH then the application will + generate a \c B_ARGV_RECEIVED message and send it to the already running + instance. Thus in this case the \c B_ARGV_RECEIVED message can show + up at any time. +*/ + + +/*! + \fn void BApplication::AppActivated(bool active) + \brief Hook method that gets invoked when the application receives + \c B_APP_ACTIVATED message. + + The message is sent whenever the application changes its active application + status. The active flag set to is \c true when the application becomes + active and is set to \c false when the application becomes inactive. + + The application becomes activated in response to a user action such as + clicking on or unhiding one of its windows. The application can have its + active status set programmatically by calling either the BWindow::Activate() + or BRoster::ActivateApp() methods. + + This method is called after ReadyToRun() provided the application is + displaying a window that can be set active. +*/ + + +/*! + \fn void BApplication::RefsReceived(BMessage *message) + \brief Hook method that gets invoked when the application receives a + \c B_REFS_RECEIVED message. + + The message is sent in response to a user action such as a user + drag-and-dropping a file on your app's icon or opening a file that the + application is set to handle. You can use the IsLaunching() method to + discern whether the message arrived when the application is launched or + after the application has already been running. + + The default implementation is empty. You can override this method to do + something with the received refs. Typically you create BEntry or BFile + objects from the passed in refs. + + \param message contains a single field named "be:refs" that contains one or + more entry_ref (\c B_REF_TYPE) items, one for each file sent. +*/ + + +/*! + \fn void BApplication::AboutRequested() + \brief Hook method that gets invoked when the BApplication receives a + \c B_ABOUT_REQUESTED message. + + You should override this method to pop an alert to provide information + about the application. + + The default implementation pops a basic alert dialog. +*/ + + +//! @} + + +/*! + \name Cursor +*/ + + +//! @{ + + +/*! + \fn BApplication::ShowCursor() + \brief Restores the cursor. +*/ + + +/*! + \fn void BApplication::HideCursor() + \brief Hides the cursor from the screen. +*/ + + +/*! + \fn void BApplication::ObscureCursor() + \brief Hides the cursor until the mouse is moved. +*/ + + +/*! + \fn bool BApplication::IsCursorHidden() const + \brief Returns whether or not the cursor is hidden. + + \returns \c true if the cursor is hidden, \c false if not. +*/ + + +/*! + \fn void BApplication::SetCursor(const void *cursor) + \brief Sets the \a cursor to be used when the application is active. + + You can pass one of the pre-defined cursor constants such as + \c B_HAND_CURSOR or \c B_I_BEAM_CURSOR or you can create your own pass + in your own cursor image. The cursor data format is described in the BCursor + class. + + \param cursor The cursor data to set the cursor to. +*/ + + +/*! + \fn void BApplication::SetCursor(const BCursor *cursor, bool sync) + \brief Sets the \a cursor to be used when the application is active + with \a sync immediately option. + + The default BCursors to use are \c B_CURSOR_SYSTEM_DEFAULT for the hand + cursor and \c B_CURSOR_I_BEAM for the I-beam cursor. + + \param cursor A BCursor object to set the \a cursor to. + \param sync synchronize the cursor immediately. +*/ + + +//! @} + + +/*! + \name Info +*/ + + +//! @{ + + +/*! + \fn int32 BApplication::CountWindows() const + \brief Returns the number of windows created by the application. + + \returns the number of windows created by the application. +*/ + + +/*! + \fn BWindow* BApplication::WindowAt(int32 index) const + \brief Returns the BWindow object at the specified index in the + application's window list. + + If index is out of range, this function returns \c NULL. + + \warning Locking the BApplication object doesn't lock the window list. + + \param index The \a index of the desired BWindow. + + \returns The BWindow object at the specified \a index or \c NULL + if the \a index is out of range. +*/ + + +/*! + \fn int32 BApplication::CountLoopers() const + \brief Returns the number of BLoopers created by the application. + + \warning This method may return \c B_ERROR. + + \returns The number of BLoopers in the application. +*/ + + +/*! + \fn BLooper* BApplication::LooperAt(int32 index) const + \brief Returns the BLooper object at the specified index in the + application's looper list. + + If index is out of range, this function returns \c NULL. + + \returns The BLooper object at the specified \a index or \c NULL + if the \a index is out of range. +*/ + + +//! @} + + +/*! + \name Status +*/ + + +//! @{ + + +/*! + \fn bool BApplication::IsLaunching() const + \brief Returns whether or not the application is in the process of + launching. + + \returns \c true if the application is launching, \c false if the + application is already running. +*/ + + +/*! + \fn status_t BApplication::GetAppInfo(app_info *info) const + \brief Fills out the \a info parameter with information about the + application. + + This is equivalent to + be_roster->GetRunningAppInfo(be_app->Team(), info); + + \returns \c B_NO_INIT on an error or \c B_OK if all goes well. + + \sa BRoster::GetAppInfo() +*/ + + +/*! + \fn BResources* BApplication::AppResources() + \brief Returns a BResources object for the application. +*/ + + +//! @} + + +/*! + \name Message Mechanics +*/ + + +//! @{ + + +/*! + \fn void BApplication::MessageReceived(BMessage *message) + \sa BHandler::MessageReceived() +*/ + + +/*! + \fn void BApplication::DispatchMessage(BMessage *message, + BHandler *handler) + \sa BLooper::DispatchMessage() +*/ + + +//! @} + + +/*! + \name Pulse +*/ + + +//! @{ + + +/*! + \fn void BApplication::Pulse() + \brief Hook method that gets invoked when the BApplication receives a + \c B_PULSE message. + + An action is performed each time app_server calls the Pulse() method. + The pulse rate is set by SetPulseRate(). You can implement Pulse() to do + anything you want. The default version does nothing. The pulse granularity + is no better than once per 100,000 microseconds. + + \sa SetPulseRate() +*/ + + +/*! + \fn void BApplication::SetPulseRate(bigtime_t rate) + \brief Sets the interval that the \c B_PULSE messages are sent. + + If the \a rate is set to 0 then the \c B_PULSE messages are not sent. + The pulse rate can be no faster than once per 100,000 microseconds or so. + + \param rate The rate \a B_PULSE messages are sent to the application. +*/ + + +//! @} + + +/*! + \name Scripting +*/ + + +//! @{ + + +/*! + \fn BHandler* BApplication::ResolveSpecifier(BMessage *message, int32 index, + BMessage *specifier, int32 what, const char *property) + \sa BHandler::ResolveSpecifier() +*/ + + +/*! + \fn status_t BApplication::GetSupportedSuites(BMessage *data) + \sa BHandler::GetSupportedSuites() +*/ + + +//! @} diff --git a/docs/user/app/Clipboard.dox b/docs/user/app/Clipboard.dox new file mode 100644 index 0000000000..3cc3e89df0 --- /dev/null +++ b/docs/user/app/Clipboard.dox @@ -0,0 +1,343 @@ +/* + * Copyright 2011, Haiku, Inc. All Rights Reserved. + * Distributed under the terms of the MIT License. + * + * Authors: + * Gabe Yoder, gyoder@stny.rr.com + * John Scipione, jscipione@gmail.com + * + * Corresponds to: + * /trunk/headers/os/app/Clipboard.h rev 42274 + * /trunk/src/kits/app/Clipboard.cpp rev 42274 + */ + + +/*! + \file Clipboard.h + \brief Provides the BClipboard class. +*/ + + +/*! + \var be_clipboard + \brief Global system clipboard object. +*/ + + +/*! + \class BClipboard + \ingroup app + \brief Used for short-term data storage between documents and + applications via copy and paste operations. + + Clipboards are differentiated by their name. In order for two + applications to share a clipboard they simply have to create a + BClipboard object with the same name. However, it is rarely necessary + to create your own clipboard, instead you can use the \c be_clipboard + system clipboard object. + + \remark To access the system clipboard without a BApplication object, + create a BClipboard object with the name "system". You should avoid + creating a custom clipboard with the name "system" for your own use. + + To access the clipboard data call the Data() method. The BMessage object + returned by the Data() method has the following properties: + - The \c what value is unused. + - The clipboard data is stored in a message field typed as + \c B_MIME_TYPE. + - The MIME type of the data is used as the name of the field that + holds the data. + - Each field in the data message contains the same data with a + different format. + + To read and write to the clipboard you must first lock the BClipboard + object. If you fail to lock the BClipboard object then the Data() method + will return \c NULL instead of a pointer to a BMessage object. + + Below is an example of reading a string from the system clipboard. +\code +const char *string; +int32 stringLen; +if (be_clipboard->Lock()) { + // Get the clipboard BMessage + BMessage *clip = be_clipboard->Data(); + + // Read the string from the clipboard data message + clip->FindData("text/plain", B_MIME_TYPE, (const void **)&string, + &stringLen); + + be_clipboard->Unlock(); +} else + fprintf(stderr, "could not lock clipboard.\n"); +\endcode + + Below is an example of writing a string to the system clipboard. +\code +const char* string = "Some clipboard data"; + +if (be_clipboard->Lock()) { + // Clear the clipboard data + be_clipboard->Clear(); + + // Get the clipboard data message + BMessage *clip = be_clipboard->Data(); + + // Write string data to the clipboard data message + clip->AddData("text/plain", B_MIME_TYPE, string, strlen(string)); + + // Commit the data to the clipboard + status = be_clipboard->Commit(); + if (status != B_OK) + fprintf(stderr, "could not commit data to clipboard.\n"); + + be_clipboard->Unlock(); +} else + fprintf(stderr, "could not lock clipboard.\n"); +\endcode +*/ + + +/*! + \fn BClipboard::BClipboard(const char *name, bool transient = false) + \brief Create a BClipboard object with the given \a name. + + If the \a name parameter is \c NULL then the "system" BClipboard object + is constructed instead. + + \param name The \a name of the clipboard. + \param transient If \c true, lose data after a reboot (currently unused). +*/ + + +/*! + \fn BClipboard::~BClipboard() + \brief Destroys the BClipboard object. The clipboard data is not destroyed. +*/ + + +/*! + \fn const char* BClipboard::Name() const + \brief Returns the name of the BClipboard object. + + \returns The name of the clipboard. +*/ + + +/*! + \name Commit Count Methods +*/ + + +//! @{ + + +/*! + \fn uint32 BClipboard::LocalCount() const + \brief Returns the (locally cached) number of commits to the clipboard. + + The returned value is the number of successful Commit() invocations for + the clipboard represented by this object, either invoked on this object + or another (even from another application). This method returns a locally + cached value, which might already be obsolete. For an up-to-date value + use SystemCount(). + + \return The number of commits to the clipboard. + + \sa SystemCount() +*/ + + +/*! + \fn uint32 BClipboard::SystemCount() const + \brief Returns the number of commits to the clipboard. + + The returned value is the number of successful Commit() invocations for + the clipboard represented by this object, either invoked on this object + or another (even from another application). This method retrieves the + value directly from the system service managing the clipboards, so it is + more expensive, but more up-to-date than LocalCount(), which returns a + locally cached value. + + \return The number of commits to the clipboard. + + \sa LocalCount() +*/ + + +//! @} + + +/*! + \name Monitoring Methods +*/ + + +//! @{ + + +/*! + \fn status_t BClipboard::StartWatching(BMessenger target) + \brief Start watching the BClipboard object for changes. + + When a change in the clipboard occurs, most like as the result of a cut + or copy action, a \a B_CLIPBOARD_CHANGED message is sent to \a target. + + \retval B_OK Everything went fine. + \retval B_BAD_VALUE \a target is invalid. + \retval B_ERROR An error occured. + + \sa StopWatching() +*/ + + +/*! + \fn status_t BClipboard::StopWatching(BMessenger target) + \brief Stop watching the BClipboard object for changes. + + \retval B_OK Everything went fine. + \retval B_BAD_VALUE \a target is invalid. + \retval B_ERROR An error occurred. + + \sa StartWatching() +*/ + + +//! @} + + +/*! + \name Locking Methods +*/ + + +//! @{ + + +/*! + \fn bool BClipboard::Lock() + \brief Locks the clipboard so that no other tread can read from it or + write to it. + + You should call Lock() before reading or writing to the clipboard. + + \returns \c true if the clipboard was locked, \c false otherwise. + + \sa Unlock() +*/ + + +/*! + \fn void BClipboard::Unlock() + \brief Unlocks the clipboard. + + \sa Lock() +*/ + + +/*! + \fn bool BClipboard::IsLocked() const + \brief Returns whether or not the clipboard is locked. + + \returns \c true if the clipboard is locked, \c false if it is unlocked. +*/ + + +//! @} + + +/*! + \name Clipboard Data Transaction Methods +*/ + + +//! @{ + + +/*! + \fn status_t BClipboard::Clear() + \brief Clears out all data from the clipboard. + + You should call Clear() before adding new data to the BClipboard object. + + \retval B_OK Everything went find. + \retval B_NOT_ALLOWED The clipboard is not locked. + \retval B_NO_MEMORY Ran out of memory initializing the data message. + \retval B_ERROR Another error occurred. +*/ + + +/*! + \fn status_t BClipboard::Commit() + \brief Commits the clipboard data to the BClipboard object. + + \retval B_OK Everything went find. + \retval B_NOT_ALLOWED The clipboard is not locked. + \retval B_ERROR Another error occurred. +*/ + + +/*! + \fn status_t BClipboard::Commit(bool failIfChanged) + \brief Commits the clipboard data to the BClipboard object with the + option to fail if there is a change to the clipboard data. + + \param failIfChanged Whether or not to fail to commit the changes + if there is a change in the clipboard data. + + \retval B_OK Everything went find. + \retval B_NOT_ALLOWED The clipboard is not locked. + \retval B_ERROR Another error occurred. +*/ + + +/*! + \fn status_t BClipboard::Revert() + \brief Reverts the clipboard data. + + The method should be used in the case that you have made a change to the + clipboard data message and then decide to revert the change instead of + committing it. + + \retval B_OK Everything went find. + \retval B_NOT_ALLOWED The clipboard is not locked. + \retval B_NO_MEMORY Ran out of memory initializing the data message. + \retval B_ERROR Another error occurred. +*/ + + +//! @} + + +/*! + \name Clipboard Data Message Methods +*/ + + +//! @{ + + +/*! + \fn BMessenger BClipboard::DataSource() const + \brief Gets a BMessenger object targeting the application that last + modified the clipboard. + + The clipboard object does not need to be locked to call this method. + + \returns A BMessenger object that targets the application that last + modified the clipboard. +*/ + + +/*! + \fn BMessage* BClipboard::Data() const + \brief Gets a pointer to the BMessage object that holds the clipboard + data. + + If the BClipboard object is not locked this method returns \c NULL. + + \returns A pointer to the BMessage object that holds the clipboard + data or \c NULL if the clipboard is not locked. +*/ + + +//! @} diff --git a/docs/user/app/Handler.dox b/docs/user/app/Handler.dox index 0fcf051f32..87f7e84a0b 100644 --- a/docs/user/app/Handler.dox +++ b/docs/user/app/Handler.dox @@ -207,15 +207,15 @@ /*! \fn void BHandler::MessageReceived(BMessage *message) \brief Handle a message that has been received by the associated looper. - - This method is reimplemented in your subclasses. If the messages that have + + This method is reimplemented by subclasses. If the messages that have been received by a looper pass through the filters, then they end up in the MessageReceived() methods. - - The example shows a very common way to handle message. Usually, this - involves parsing the BMessage::what constant and then perform an action - based on that. - + + The example below shows a very common way to handle message. Usually, + this involves parsing the BMessage::what constant and then perform an + action based on that. + \code void ShowImageApp::MessageReceived(BMessage *message) @@ -239,14 +239,14 @@ ShowImageApp::MessageReceived(BMessage *message) } \endcode - If your handler cannot process this message, you should pass it on to the - base class. Eventually, it will reach the default implementation, which - will reply with a \c B_MESSAGE_NOT_UNDERSTOOD constant. - - \attention If you want to keep or manipulate the \a message, have a look - at the \link BLooper::DetachCurrentMessage() DetachCurrentMessage() \endlink - method to get ownership of the message. - + If your handler cannot process this message, you should pass it on + to the base class. Eventually, it will reach the base implementation, + which will reply with \c B_MESSAGE_NOT_UNDERSTOOD. + + \attention If you want to keep or manipulate the \a message, have a + look at BLooper::DetachCurrentMessage() to receive ownership of + the message. + \param message The message that needs to be handled. */ @@ -254,7 +254,7 @@ ShowImageApp::MessageReceived(BMessage *message) /*! \fn BLooper *BHandler::Looper() const \brief Return a pointer to the looper that this handler is associated with. - + \return If the handler is not yet associated with a looper, it will return \c NULL. \see BLooper::AddHandler() @@ -444,13 +444,14 @@ ShowImageApp::MessageReceived(BMessage *message) /*! \fn BHandler * BHandler::ResolveSpecifier(BMessage *msg, int32 index, BMessage *specifier, int32 form, const char *property) - \brief Undocumented. + \brief Determine the proper handler for a scripting message. */ /*! \fn status_t BHandler::GetSupportedSuites(BMessage *data) - \brief Undocumented. + \brief Reports the suites of messages and specifiers that derived classes + understand. */ diff --git a/docs/user/app/Looper.dox b/docs/user/app/Looper.dox index 7ef6428398..cfabdee7e4 100644 --- a/docs/user/app/Looper.dox +++ b/docs/user/app/Looper.dox @@ -147,7 +147,7 @@ \warning This constructor does no type check whatsoever. Since you can pass any BMessage, you should - if you are not sure about the exact type - use the Instantiate() method, which does check the type. - + \see Instantiate() \see Archive() */ @@ -710,13 +710,20 @@ /*! \fn BHandler* BLooper::ResolveSpecifier(BMessage* msg, int32 index, BMessage* specifier, int32 form, const char* property) - \brief Undocumented. + \brief Determine the proper handler for a scripting message. + + \see BHandler::ResolveSpecifier() */ /*! \fn status_t BLooper::GetSupportedSuites(BMessage* data) - \brief Undocumented. + \brief Reports the suites of messages and specifiers that derived classes + understand. + + \param data The message to report the suite of messages and specifiers. + + \see BHandler::GetSupportedSuites() */ @@ -799,7 +806,7 @@ /*! \fn BMessage* BLooper::MessageFromPort(bigtime_t timeout) - \brief Hook function to retrieve a message from the looper's port. + \brief Hook method to retrieve a message from the looper's port. The default implementation is called by the internal message looping thread and retrieves the next message from the port that belongs to this looper. @@ -813,5 +820,3 @@ arriving at the default port. */ - - \ No newline at end of file diff --git a/docs/user/app/Message.dox b/docs/user/app/Message.dox index d6b724f7bb..123c743edd 100644 --- a/docs/user/app/Message.dox +++ b/docs/user/app/Message.dox @@ -95,9 +95,9 @@ This class is at the center of the web of messaging classes, in the sense that it defines the actual structure of the messages. Messages have two - important elements: the #what identifer, and the data members. The + important elements: the #what identifier, and the data members. The first can be directly manipulated, the latter can be manipulated through - AddData(), FindData() and ReplaceData() and their deratives. Neither of + AddData(), FindData() and ReplaceData() and their derivatives. Neither of these elements are mandatory. The second important role of BMessage is that it stores meta data: @@ -115,7 +115,7 @@ All methods can be classified in these areas: - Adding, Finding, Replacing and Removing Data. - - Statistics and Miscelanous information. + - Statistics and Miscellaneous information. - Delivery information. - Utilities to reply to messages. @@ -135,7 +135,7 @@ /*! \fn BMessage::BMessage() \brief Construct an empty message, without any data members and with a - \c what constant set to zero (0). + \a what constant set to \c 0. \see BMessage(uint32 what) \see BMessage(const BMessage &other) @@ -144,7 +144,7 @@ /*! \fn BMessage::BMessage(uint32 what) - \brief Construct an empty message with the \c what member set tot the + \brief Construct an empty message with the \a what member set to the specified value. \see BMessage::BMessage() @@ -156,14 +156,14 @@ \fn BMessage::BMessage(const BMessage &other) \brief Construct a new message that is a copy of another message. - The \c what member and the data values are copied. The metadata, such as + The \a what member and the data values are copied. The metadata, such as whether or not the message is a drop message or reply information, is not copied. So if the original message is a reply to a previous message, which will make IsReply() return \c true, calling the same method on a copy of the message will return \c false. \remarks BeOS R5 did keep the metadata of the message. Haiku deviates from - this behaviour. Please use the Haiku implementation of message copying as + this behavior. Please use the Haiku implementation of message copying as the default behavior. This will keep your applications backwards compatible. @@ -185,13 +185,13 @@ \fn BMessage &BMessage::operator=(const BMessage &other) \brief Copy one message into another. - See the copy constructor, BMessage(const BMessage &other), for details on what is - copied, and what isn't. + See the copy constructor, BMessage(const BMessage &other), for details on + what is copied, and what isn't. */ /*! - \name Statistics and Miscelanous Information + \name Statistics and Miscellaneous Information */ @@ -212,21 +212,21 @@ in a pointer to the internal name buffer in the message. This means that you should not manipulate this name. If you are not interested in the name, you can safely pass \c NULL. - \param[out] typeFound The type of the item at \a index. If you are not - interested in the type (because you specifically asked for a type), you - can safely pass NULL. - \param[out] countFound The number of items at \a index. If data items have - the same name, they will be placed under the same index. + \param[out] typeFound The type of the item at \a index. If you are + not interested in the type (because you specifically asked for a type), + you can safely pass \c NULL. + \param[out] countFound The number of items at \a index. If data + items have the same name, they will be placed under the same index. - \return If the \a index is found, and matches the requested type, the - other parameters will be filled in. If this is not the case, the method - will return with an error. + \return If the \a index is found, and matches the requested type, + then the other parameters will be filled in. If this is not the case, + the method will return with an error. \retval B_OK An match was found. The values have been filled in. - \retval B_BAD_INDEX The \a index was out of range. None of the passed - variables have been altered. - \retval B_BAD_TYPE The data field at \a index does not have the requested - type. + \retval B_BAD_INDEX The \a index was out of range. None of the + passed variables have been altered. + \retval B_BAD_TYPE The data field at \a index does not have the + requested type. */ @@ -244,9 +244,9 @@ label will be in this parameter. In case you are not interested, you can safely pass \c NULL. - \return If the message has data associated with the given \a name, the - other parameters will contain information associated with the data. - Else, the method will return with an error. + \return If the message has data associated with the given \a name, + the other parameters will contain information associated with the data, + else, the method will return with an error. \retval B_OK A match was found. The other parameters have been filled in. \retval B_BAD_VALUE You passed \c NULL as argument to \a name. @@ -260,9 +260,10 @@ \brief Retrieve the type and whether or not the size of the data is fixed associated with a \a name. - This method is the same as GetInfo(const char *,type_code *, int32 *) const , with the difference that you can find out whether or - not the size of the data associated with the \a name is fixed. You will - get this value in the variable you passed as \a fixedSize parameter. + This method is the same as GetInfo(const char *,type_code *, int32 *) const, + with the difference that you can find out whether or not the size of the + data associated with the \a name is fixed. You will get this value + in the variable you passed as \a fixedSize parameter. */ @@ -277,7 +278,7 @@ method will return the total number of data items. \return The number of data items in this message with the specified - \a type, or zero in case no items match the type. + \a type, or \c 0 in case no items match the type. */ @@ -328,8 +329,8 @@ \param newEntry The new name of the data entry. \retval B_OK Renaming succeeded. - \retval B_BAD_VALUE Either the \a oldEntry or the \a newEntry pointers are - \c NULL. + \retval B_BAD_VALUE Either the \a oldEntry or the + \a newEntry pointers are \c NULL. \retval B_NAME_NOT_FOUND There is no data associated with the label \a oldEntry. */ @@ -477,9 +478,9 @@ This method sends a reply to this message to the sender. On your turn, you specify a messenger that handles a reply back to the message you - specify as the \a reply argument. You can set a timeout for the message - to be delivered. This method blocks until the message has been received, - or the \a timeout has been reached. + specify as the \a reply argument. You can set a timeout for the + message to be delivered. This method blocks until the message has been + received, or the \a timeout has been reached. \param reply The message that is in reply to this message. \param replyTo In case the receiver needs to reply to the message you are @@ -492,8 +493,9 @@ \retval B_OK The message has been delivered. \retval B_DUPLICATE_REPLY There already has been a reply to this message. \retval B_BAD_PORT_ID The reply address is not valid (anymore). - \retval B_WOULD_BLOCK The delivery \a timeout was \c B_INFINITE_TIMEOUT - (zero) and the target port was full when trying to deliver the message. + \retval B_WOULD_BLOCK The delivery \a timeout was + \c B_INFINITE_TIMEOUT (\c 0) and the target port was full when trying + to deliver the message. \retval B_TIMED_OUT The timeout expired while trying to deliver the message. \see SendReply(uint32 command, BHandler *replyTo) @@ -517,12 +519,13 @@ \brief Synchronously send a reply to this message, and wait for a reply back. - This method sends a reply to this message to the sender. The \a reply is - delivered, and then the method waits for a reply from the receiver. If a - reply is received, that reply is copied into the \a replyToReply argument. + This method sends a reply to this message to the sender. The + \a reply is delivered, and then the method waits for a reply from + the receiver. If a reply is received, that reply is copied into the + \a replyToReply argument. If the message was delivered properly, but the receiver did not reply - within the specified \a replyTimeout, the \c what member of \a replyToReply - will be set to \c B_NO_REPLY. + within the specified \a replyTimeout, the \a what member of + \a replyToReply will be set to \c B_NO_REPLY. \param reply The message that is in reply to this message. \param[out] replyToReply The reply is copied into this argument. @@ -535,10 +538,12 @@ \retval B_OK The message has been delivered. \retval B_DUPLICATE_REPLY There already has been a reply to this message. - \retval B_BAD_VALUE Either \a reply or \a replyToReply is \c NULL. + \retval B_BAD_VALUE Either \a reply or \a replyToReply is + \c NULL. \retval B_BAD_PORT_ID The reply address is not valid (anymore). - \retval B_WOULD_BLOCK The delivery \a timeout was \c B_INFINITE_TIMEOUT - (zero) and the target port was full when trying to deliver the message. + \retval B_WOULD_BLOCK The delivery \a timeout was + \c B_INFINITE_TIMEOUT (\c 0) and the target port was full when trying + to deliver the message. \retval B_TIMED_OUT The timeout expired while trying to deliver the message. \retval B_NO_MORE_PORTS All reply ports are in use. @@ -721,20 +726,23 @@ const void *data, ssize_t numBytes, bool isFixedSize, int32 count) \brief Add \a data of a certain \a type to the message. - The amount of \a numBytes is copied into the message. The data is stored - at the label specified in \a name. You are responsible for specifying the - correct \a type. The Haiku API already specifies many constants, such as - B_FLOAT_TYPE or B_RECT_TYPE. See TypeConstants.h for more information on - the system-wide defined types. + The amount of \a numBytes is copied into the message. The data is + stored at the label specified in \a name. You are responsible for + specifying the correct \a type. The Haiku API already specifies + many constants, such as \c B_FLOAT_TYPE or \c B_RECT_TYPE. See + TypeConstants.h for more information on the system-wide defined types. - If the field with the \a name already exists, the data is added in an - array-like form. If you are adding a certain \a name for the first time, - you are able to specify some properties of this array. You can fix the size - of each data entry, and you can also instruct BMessage to allocate a - \a count of items. The latter does not mean that the number of items is - fixed; the array will grow nonetheless. Also, note that every \a name can - only be associated with one \a type of data. If consecutive method calls - specify a different \a type than the initial, these calls will fail. + If the field with the \a name already exists, the data is added in + an array-like form. If you are adding a certain \a name for the + first time, you are able to specify some properties of this array. You can + fix the size of each data entry, and you can also instruct BMessage to + allocate a \a count of items. The latter does not mean that the + number of items is fixed; the array will grow nonetheless. Also, note that + every \a name can only be associated with one \a type of + data. + + If consecutive method calls specify a different \a type than the + initial, these calls will fail. There is no limit to the number of labels, or the amount of data, but note that searching of data members is linear, as well as that some @@ -742,31 +750,32 @@ data you need to pass is too big, find another way to pass it. \param name The label to which this data needs to be associated. If the - \a name already exists, the new data will be added in an array-like - style. - \param type The type of data. If you are adding data to the same \a name, - make sure it is the same type. + \a name already exists, the new data will be added in an + array-like style. + \param type The type of data. If you are adding data to the same + \a name, make sure it is the same type. \param data The data buffer to copy the bytes from. \param numBytes The number of bytes to be copied. If this is the first call - to this method for this type of data, and you set \a isFixedSize to - \c true, this will specify the size of all consecutive calls to this + to this method for this type of data, and you set + \a isFixedSize to \c true, this will specify the size of all + consecutive calls to this method. \param isFixedSize If this is the first call to this method with this - \a name, you can specify the whether or not all items in this array - should have the same fixed size. + \a name, you can specify the whether or not all items in this + array should have the same fixed size. \param count If this is the first call to this method with this - \a name, you can instruct this message to allocate a number of items in - advance. This does not limit the amount of items though. The array will - grow if needed. + \a name, you can instruct this message to allocate a number of + items in advance. This does not limit the amount of items though. The + array will grow if needed. \retval B_OK The \a data is succesfully added. - \retval B_BAD_VALUE The \a numBytes is less than, or equal to zero (0), or - the size of this item is larger than the \a name allows, since it has - been specified to have a fixed size. + \retval B_BAD_VALUE The \a numBytes is less than, or equal to \c 0, + or the size of this item is larger than the \a name allows, + since it has been specified to have a fixed size. \retval B_ERROR There was an error whilst creating the label with your \a name. - \retval B_BAD_TYPE The \a type you specified is different than the one - already associated with \a name. + \retval B_BAD_TYPE The \a type you specified is different than the + one already associated with \a name. */ @@ -959,7 +968,8 @@ /*! \fn status_t BMessage::AddRef(const char *name, const entry_ref *ref) - \brief Convenience method to add an \c entry_ref to the label \a name. + \brief Convenience method to add an \c entry_ref to the label + \a name. This method calls AddData() with the \c B_REF_TYPE \a type. @@ -992,9 +1002,9 @@ This method uses BFlattenable::TypeCode() to determine the type. It also uses BFlattenable::IsFixedSize() to determine whether or not the size of - the object is supposedly always the same. You can specify a \a count, to - pre-allocate more entries if you are going to add more than one of this - type. + the object is supposedly always the same. You can specify a + \a count, to pre-allocate more entries if you are going to add + more than one of this type. \param name The label to associate the data with. \param object The object to flatten into the message. @@ -1019,7 +1029,8 @@ /*! \fn status_t BMessage::RemoveData(const char *name, int32 index) - \brief Remove data associated with \a name at a specified \a index. + \brief Remove data associated with \a name at a specified + \a index. If this is the only instance of the data, then the entire label will be removed. This means you can recreate it with another type. @@ -1027,10 +1038,10 @@ \param name The \a name of which the associated data should be cleared. \param index The \a index of the item that should be cleared. \retval B_OK The data has been removed. - \retval B_BAD_VALUE The \a index is less than zero (0). + \retval B_BAD_VALUE The \a index is less than \c 0. \retval B_BAD_INDEX The \a index is out of bounds. - \retval B_NAME_NOT_FOUND The \a name does not hava any data associated with - it. + \retval B_NAME_NOT_FOUND The \a name does not hava any data + associated with it. \see RemoveName() \see MakeEmpty() */ @@ -1043,7 +1054,8 @@ This also removes the label, so that you can recreate it with another type, if you want to. - \param name The \a name that refers to the data you want to clear out. + \param name The \a name that refers to the data you want to clear + out. \retval B_OK All the data is removed. \retval B_BAD_VALUE The \a name pointer points to \c NULL. \retval B_NAME_NOT_FOUND The \a name does not exist in this message. @@ -1059,7 +1071,7 @@ Everything is cleared out, all labels and all associated data, as well as metadata such as reply info. - \return This method always returns B_OK. + \return This method always returns \c B_OK. \see RemoveData() \see RemoveName() */ @@ -1079,7 +1091,7 @@ - +
Type of dataType codeMethod
BRectB_RECT_TYPEFindRect()
BRect\c B_RECT_TYPEFindRect()
*/ @@ -1090,12 +1102,14 @@ /*! \fn status_t BMessage::FindData(const char *name, type_code type, int32 index, const void **data, ssize_t *numBytes) const - \brief Find \a data that is stored in this message at an \a index. + \brief Find \a data that is stored in this message at an + \a index. - This method matches the label \a name with the \a type you are asking for, - and it looks for the data that is stored at a certain \a index number. If - all these things match, you will get a pointer to the internal buffer, and - the method will put the size of the item in \a numBytes. + This method matches the label \a name with the \a type you + are asking for, and it looks for the data that is stored at a certain + \a index number. If all these things match, you will get a pointer + to the internal buffer, and the method will put the size of the item in + \a numBytes. Note that only this method, and FindString(const char *, const char **), pass a pointer to the internal buffer. The other more specific methods, @@ -1110,8 +1124,8 @@ Note that the array is zero-based. \param[out] data A pointer to a pointer where the data can point to. \param[out] numBytes The size of the data will be put in this parameter. - \retval B_OK The \a name was found, matches the type, and the data at - \a index has been put in \a data. + \retval B_OK The \a name was found, matches the type, and the data + at \a index has been put in \a data. \retval B_BAD_VALUE One of the output arguments were \c NULL. \retval B_BAD_INDEX The \a index does not exist. \retval B_NAME_NOT_FOUND There is no field with this \a name. @@ -1125,8 +1139,9 @@ const void **data, ssize_t *numBytes) const \brief Find \a data that is stored in this message. - This is an overloaded method of FindData(const char *, type_code, int32, - const void **, ssize_t *) const, where data is sought at \a index 0. + This is an overloaded method of + FindData(const char *, type_code, int32, const void **, ssize_t *) const + where data is sought at \a index \c 0. */ @@ -1134,8 +1149,9 @@ \fn status_t BMessage::FindRect(const char *name, BRect *rect) const \brief Find a rectangle at the label \a name. - This is an overloaded method of FindRect(const char *, int32, BRect *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindRect(const char *, int32, BRect *) const + where the data is sought at \a index \c 0. */ @@ -1143,7 +1159,7 @@ \fn status_t BMessage::FindRect(const char *name, int32 index, BRect *rect) const \brief Find a rectangle at the label \a name at an \a index. - This method looks for the data with the \a B_RECT_TYPE, and copies it into + This method looks for the data with the \c B_RECT_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1160,8 +1176,9 @@ \fn status_t BMessage::FindPoint(const char *name, BPoint *point) const \brief Find a point at the label \a name. - This is an overloaded method of FindPoint(const char *, int32, BPoint *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindPoint(const char *, int32, BPoint *) const + where the data is sought at \a index \c 0. */ @@ -1169,7 +1186,7 @@ \fn status_t BMessage::FindPoint(const char *name, int32 index, BPoint *point) const \brief Find a point at the label \a name at an \a index. - This method looks for the data with the \a B_POINT_TYPE, and copies it into + This method looks for the data with the \c B_POINT_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1186,8 +1203,9 @@ \fn status_t BMessage::FindString(const char *name, const char **string) const \brief Find a string at the label \a name. - This is an overloaded method of FindString(const char *, int32, const char **) const - where the data is sought at \a index zero. + This is an overloaded method of + FindString(const char *, int32, const char **) const + where the data is sought at \a index \c 0. */ @@ -1196,7 +1214,7 @@ const char ** string) const \brief Find a string at the label \a name at an \a index. - This method looks for the data with the \a B_STRING_TYPE, and returns a + This method looks for the data with the \c B_STRING_TYPE, and returns a pointer to the internal buffer of the message. Note that this pointer is valid, until the message is deleted. @@ -1215,17 +1233,17 @@ \fn status_t BMessage::FindString(const char *name, BString *string) const \brief Find a string at the label \a name. - This is an overloaded method of FindString(const char *, int32, BString *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindString(const char *, int32, BString *) const + where the data is sought at \a index \c 0. */ /*! - \fn status_t BMessage::FindString(const char *name, int32 index, - BString *string) const + \fn status_t BMessage::FindString(const char *name, int32 index, BString *string) const \brief Find a string at the label \a name at an \a index. - This method looks for the data with the \a B_STRING_TYPE, and copies it + This method looks for the data with the \c B_STRING_TYPE, and copies it into the \a string object. \param name The label to which the data is associated. @@ -1244,7 +1262,7 @@ \brief Find an integer at the label \a name. This is an overloaded method of FindInt8(const char *, int32, int8 *) const - where the data is sought at \a index zero. + where the data is sought at \a index \c 0. */ @@ -1252,7 +1270,7 @@ \fn status_t BMessage::FindInt8(const char *name, int32 index, int8 *value) const \brief Find an integer at the label \a name at an \a index. - This method looks for the data with the \a B_INT8_TYPE, and copies it into + This method looks for the data with the \c B_INT8_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1270,7 +1288,7 @@ \brief Find an integer at the label \a name. This is an overloaded method of FindInt8(const char *, int32, int16 *) const - where the data is sought at \a index zero. + where the data is sought at \a index \c 0. */ @@ -1278,7 +1296,7 @@ \fn status_t BMessage::FindInt16(const char *name, int32 index, int16 *value) const \brief Find an integer at the label \a name at an \a index. - This method looks for the data with the \a B_INT16_TYPE, and copies it into + This method looks for the data with the \c B_INT16_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1295,8 +1313,9 @@ \fn status_t BMessage::FindInt32(const char *name, int32 *value) const \brief Find an integer at the label \a name. - This is an overloaded method of FindInt32(const char *, int32, int32 *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindInt32(const char *, int32, int32 *) const + where the data is sought at \a index \c 0. */ @@ -1304,7 +1323,7 @@ \fn status_t BMessage::FindInt32(const char *name, int32 index, int32 *value) const \brief Find an integer at the label \a name at an \a index. - This method looks for the data with the \a B_INT32_TYPE, and copies it into + This method looks for the data with the \c B_INT32_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1321,8 +1340,9 @@ \fn status_t BMessage::FindInt64(const char *name, int64 *value) const \brief Find an integer at the label \a name. - This is an overloaded method of FindInt64(const char *, int32, int64 *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindInt64(const char *, int32, int64 *) const + where the data is sought at \a index \c 0. */ @@ -1330,7 +1350,7 @@ \fn status_t BMessage::FindInt64(const char *name, int32 index, int64 *value) const \brief Find an integer at the label \a name at an \a index. - This method looks for the data with the \a B_INT64_TYPE, and copies it into + This method looks for the data with the \c B_INT64_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1347,8 +1367,9 @@ \fn status_t BMessage::FindBool(const char *name, bool *value) const \brief Find a boolean at the label \a name. - This is an overloaded method of FindBool(const char *, int32, bool *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindBool(const char *, int32, bool *) const + where the data is sought at \a index \c 0. */ @@ -1356,7 +1377,7 @@ \fn status_t BMessage::FindBool(const char *name, int32 index, bool *value) const \brief Find a boolean at the label \a name at an \a index. - This method looks for the data with the \a B_BOOL_TYPE, and copies it into + This method looks for the data with the \c B_BOOL_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1373,8 +1394,9 @@ \fn status_t BMessage::FindFloat(const char *name, float *value) const \brief Find a float at the label \a name. - This is an overloaded method of FindFloat(const char *, int32, float *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindFloat(const char *, int32, float *) const + where the data is sought at \a index \c 0. */ @@ -1382,7 +1404,7 @@ \fn status_t BMessage::FindFloat(const char *name, int32 index, float *value) const \brief Find a float at the label \a name at an \a index. - This method looks for the data with the \a B_FLOAT_TYPE, and copies it into + This method looks for the data with the \c B_FLOAT_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1399,8 +1421,9 @@ \fn status_t BMessage::FindDouble(const char *name, double *value) const \brief Find a double at the label \a name. - This is an overloaded method of FindDouble(const char *, int32, double *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindDouble(const char *, int32, double *) const + where the data is sought at \a index \c 0. */ @@ -1408,7 +1431,7 @@ \fn status_t BMessage::FindDouble(const char *name, int32 index, double *value) const \brief Find a double at the label \a name at an \a index. - This method looks for the data with the \a B_DOUBLE_TYPE, and copies it into + This method looks for the data with the \c B_DOUBLE_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1425,16 +1448,17 @@ \fn status_t BMessage::FindPointer(const char *name, void **pointer) const \brief Find a pointer at the label \a name. - This is an overloaded method of FindPointer(const char *, int32, void *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindPointer(const char *, int32, void *) const + where the data is sought at \a index \c 0. */ /*! - \fn status_t BMessage::FindPointer(const char *name, int32 index, void **pointer) const + \fn status_t BMessage::FindPointer(const char *name, int32 index, void **pointer) const \brief Find a pointer at the label \a name at an \a index. - This method looks for the data with the \a B_POINTER_TYPE, and copies it into + This method looks for the data with the \c B_POINTER_TYPE, and copies it into a provided buffer. \warning If you want to share objects between applications, please remember @@ -1457,18 +1481,18 @@ \fn status_t BMessage::FindMessenger(const char *name, BMessenger *messenger) const \brief Find a messenger at the label \a name. - This is an overloaded method of FindMessenger(const char *, int32, BMessenger *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindMessenger(const char *, int32, BMessenger *) const + where the data is sought at \a index \c 0. */ /*! - \fn status_t BMessage::FindMessenger(const char *name, int32 index, - BMessenger *messenger) const + \fn status_t BMessage::FindMessenger(const char *name, int32 index, BMessenger *messenger) const \brief Find a messenger at the label \a name at an \a index. - This method looks for the data with the \a B_MESSENGER_TYPE, and copies it into - a provided buffer. + This method looks for the data with the \c B_MESSENGER_TYPE, and copies it + into a provided buffer. \param name The label to which the data is associated. \param index The index from which the data should be copied. @@ -1484,16 +1508,18 @@ \fn status_t BMessage::FindRef(const char *name, entry_ref *ref) const \brief Find a reference to a file at the label \a name. - This is an overloaded method of FindRef(const char *, int32, entry_ref *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindRef(const char *, int32, entry_ref *) const + where the data is sought at \a index \c 0. */ /*! \fn status_t BMessage::FindRef(const char *name, int32 index, entry_ref *ref) const - \brief Find a reference to a file at the label \a name at an \a index. + \brief Find a reference to a file at the label \a name at an + \a index. - This method looks for the data with the \a B_REF_TYPE, and copies it into + This method looks for the data with the \c B_REF_TYPE, and copies it into a provided buffer. \param name The label to which the data is associated. @@ -1510,18 +1536,18 @@ \fn status_t BMessage::FindMessage(const char *name, BMessage *message) const \brief Find a message at the label \a name. - This is an overloaded method of FindMessage(const char *, int32, BMessage *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindMessage(const char *, int32, BMessage *) const + where the data is sought at \a index \c 0. */ /*! - \fn status_t BMessage::FindMessage(const char *name, int32 index, - BMessage *message) const + \fn status_t BMessage::FindMessage(const char *name, int32 index, BMessage *message) const \brief Find a message at the label \a name at an \a index. - This method looks for the data with the \a B_MESSAGE_TYPE, and copies it into - a provided buffer. + This method looks for the data with the \c B_MESSAGE_TYPE, and copies it + into a provided buffer. \param name The label to which the data is associated. \param index The index from which the data should be copied. @@ -1537,15 +1563,17 @@ \fn status_t BMessage::FindFlat(const char *name, BFlattenable *object) const \brief Find a flattened object at the label \a name. - This is an overloaded method of FindFlat(const char *, int32, BFlattenable *) const - where the data is sought at \a index zero. + This is an overloaded method of + FindFlat(const char *, int32, BFlattenable *) const + where the data is sought at \a index \c 0. */ /*! \fn status_t BMessage::FindFlat(const char *name, int32 index, BFlattenable *object) const - \brief Find a flattened object at the label \a name at an \a index. + \brief Find a flattened object at the label \a name at an + \a index. The type is determined by the type of the passed object. If that type is available at the specified label, then the Unflatten() method of that @@ -1579,18 +1607,21 @@ const void *data, ssize_t numBytes) \brief Replace the data at label \a name. - This method is an overloaded method that replaces the data at \a index - zero. See ReplaceData(const char *, type_code, int32, const void *, ssize_t). + This method is an overloaded method that replaces the data at + \a index \c 0. See + ReplaceData(const char *, type_code, int32, const void *, ssize_t). */ /*! \fn status_t BMessage::ReplaceData(const char *name, type_code type, int32 index, const void *data, ssize_t numBytes) - \brief Replace the data at label \a name at a specified \a index. + \brief Replace the data at label \a name at a specified + \a index. - The conditions for replacing data are that the \a name is correct, the - \a type matches and the data entry at \a index exists. + The conditions for replacing data are that the\a name is correct, + the \a type matches and the data entry at \a index + exists. There is also a collection of convenience methods, that allow you to efficiently replace rectanges (ReplaceRect()), booleans (ReplaceBool()), @@ -1615,17 +1646,19 @@ \fn status_t BMessage::ReplaceRect(const char *name, BRect aRect) \brief Replace a rectangle at the label \a name. - This method is an overloaded method of ReplaceRect(const char *, int32, BRect). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceRect(const char *, int32, BRect). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceRect(const char *name, int32 index, BRect aRect) - \brief Replace a rectangle at the label \a name at a specified \a index. + \brief Replace a rectangle at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_RECT_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_RECT_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param aRect The object to store in the message. @@ -1639,17 +1672,19 @@ \fn status_t BMessage::ReplacePoint(const char *name, BPoint aPoint) \brief Replace a point at the label \a name. - This method is an overloaded method of ReplacePoint(const char *, int32, BPoint). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplacePoint(const char *, int32, BPoint). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplacePoint(const char *name, int32 index, BPoint aPoint) - \brief Replace a point at the label \a name at a specified \a index. + \brief Replace a point at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_POINT_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_POINT_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param aPoint The object to store in the message. @@ -1663,17 +1698,19 @@ \fn status_t BMessage::ReplaceString(const char *name, const char *aString) \brief Replace a string at the label \a name. - This method is an overloaded method of ReplaceString(const char *, int32, const char *). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceString(const char *, int32, const char *). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceString(const char *name, int32 index, const char *aString) - \brief Replace a string at the label \a name at a specified \a index. + \brief Replace a string at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_STRING_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_STRING_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param aString The object to store in the message. @@ -1687,17 +1724,19 @@ \fn status_t BMessage::ReplaceString(const char *name, const BString &aString) \brief Replace a string at the label \a name. - This method is an overloaded method of ReplaceString(const char *, int32, BString &). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceString(const char *, int32, BString &). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceString(const char *name, int32 index, const BString &aString) - \brief Replace a string at the label \a name at a specified \a index. + \brief Replace a string at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_STRING_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_STRING_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param aString The object to store in the message. @@ -1711,17 +1750,19 @@ \fn status_t BMessage::ReplaceInt8(const char *name, int8 value) \brief Replace an integer at the label \a name. - This method is an overloaded method of ReplaceInt8(const char *, int32, int8). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceInt8(const char *, int32, int8). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceInt8(const char *name, int32 index, int8 value) - \brief Replace an integer at the label \a name at a specified \a index. + \brief Replace an integer at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_INT8_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_INT8_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param value The object to store in the message. @@ -1735,17 +1776,19 @@ \fn status_t BMessage::ReplaceInt16(const char *name, int16 value) \brief Replace an integer at the label \a name. - This method is an overloaded method of ReplaceInt16(const char *, int32, int16). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceInt16(const char *, int32, int16). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceInt16(const char *name, int32 index, int16 value) - \brief Replace an integer at the label \a name at a specified \a index. + \brief Replace an integer at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_INT16_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_INT16_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param value The object to store in the message. @@ -1759,17 +1802,19 @@ \fn status_t BMessage::ReplaceInt32(const char *name, int32 value) \brief Replace an integer at the label \a name. - This method is an overloaded method of ReplaceInt8(const char *, int32, int32). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceInt8(const char *, int32, int32). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceInt32(const char *name, int32 index, int32 value) - \brief Replace an integer at the label \a name at a specified \a index. + \brief Replace an integer at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_INT32_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_INT32_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param value The object to store in the message. @@ -1783,17 +1828,19 @@ \fn status_t BMessage::ReplaceInt64(const char *name, int64 value) \brief Replace an integer at the label \a name. - This method is an overloaded method of ReplaceInt8(const char *, int32, int64). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceInt8(const char *, int32, int64). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceInt64(const char *name, int32 index, int64 value) - \brief Replace an integer at the label \a name at a specified \a index. + \brief Replace an integer at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_INT64_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_INT64_TYPE. \param name The name associated with the data to replace. \param index The index in the array to replace. \param value The object to store in the message. @@ -1807,17 +1854,20 @@ \fn status_t BMessage::ReplaceBool(const char *name, bool aBoolean) \brief Replace a boolean at the label \a name. - This method is an overloaded method of ReplaceBool(const char *, int32, bool). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceBool(const char *, int32, bool). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceBool(const char *name, int32 index, bool aBoolean) - \brief Replace a boolean at the label \a name at a specified \a index. + \brief Replace a boolean at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_BOOL_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_BOOL_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param aBoolean The object to store in the message. @@ -1831,17 +1881,20 @@ \fn status_t BMessage::ReplaceFloat(const char *name, float aFloat) \brief Replace a float at the label \a name. - This method is an overloaded method of ReplaceFloat(const char *, int32, float). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceFloat(const char *, int32, float). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceFloat(const char *name, int32 index, float aFloat) - \brief Replace a float at the label \a name at a specified \a index. + \brief Replace a float at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_FLOAT_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_FLOAT_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param aFloat The object to store in the message. @@ -1855,17 +1908,20 @@ \fn status_t BMessage::ReplaceDouble(const char *name, double aDouble) \brief Replace a double at the label \a name. - This method is an overloaded method of ReplaceDouble(const char *, int32, double). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceDouble(const char *, int32, double). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceDouble(const char *name, int32 index, double aDouble) - \brief Replace a double at the label \a name at a specified \a index. + \brief Replace a double at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_DOUBLE_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_DOUBLE_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param aDouble The object to store in the message. @@ -1879,17 +1935,19 @@ \fn status_t BMessage::ReplacePointer(const char *name, const void *pointer) \brief Replace a pointer at the label \a name. - This method is an overloaded method of ReplacePointer(const char *, int32, const void *). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplacePointer(const char *, int32, const void *). + It replaces the data at \a index \c 0. */ /*! - \fn status_t BMessage::ReplacePointer(const char *name,int32 index,const void *pointer) + \fn status_t BMessage::ReplacePointer(const char *name,int32 index, const void *pointer) \brief Replace a pointer at the label \a name at a specified \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_POINTER_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_POINTER_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param pointer The object to store in the message. @@ -1903,17 +1961,20 @@ \fn status_t BMessage::ReplaceMessenger(const char *name, BMessenger messenger) \brief Replace a messenger at the label \a name. - This method is an overloaded method of ReplaceMessenger(const char *, int32, BMessenger). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceMessenger(const char *, int32, BMessenger). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceMessenger(const char *name, int32 index, BMessenger messenger) - \brief Replace a messenger at the label \a name at a specified \a index. + \brief Replace a messenger at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_MESSENGER_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_MESSENGER_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param messenger The object to store in the message. @@ -1927,18 +1988,20 @@ \fn status_t BMessage::ReplaceRef(const char *name,const entry_ref *ref) \brief Replace a reference to a file at the label \a name. - This method is an overloaded method of ReplaceRef(const char *, int32, entry_ref *). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceRef(const char *, int32, entry_ref *). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceRef( const char *name, int32 index, const entry_ref *ref) - \brief Replace a reference to a file at the label \a name at a specified - \a index. + \brief Replace a reference to a file at the label \a name at a + specified \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_REF_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_REF_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param ref The object to store in the message. @@ -1952,17 +2015,20 @@ \fn status_t BMessage::ReplaceMessage(const char *name, const BMessage *message) \brief Replace a message at the label \a name. - This method is an overloaded method of ReplaceMessage(const char *, int32, BMessage *). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceMessage(const char *, int32, BMessage *). + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceMessage(const char *name, int32 index, const BMessage *message) - \brief Replace a message at the label \a name at a specified \a index. + \brief Replace a message at the label \a name at a specified + \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the \c B_MESSAGE_TYPE. + The data at the specified \a name and \a index will be + replaced, if it matches the \c B_MESSAGE_TYPE. + \param name The name associated with the data to replace. \param index The index in the array to replace. \param message The object to store in the message. @@ -1976,25 +2042,29 @@ \fn status_t BMessage::ReplaceFlat(const char *name, BFlattenable *object) \brief Replace a flattened object at the label \a name. - This method is an overloaded method of ReplaceFlat(const char *, int32, BFlattenable *). - It replaces the data at \a index zero. + This method is an overloaded method of + ReplaceFlat(const char *, int32, BFlattenable *). + + It replaces the data at \a index \c 0. */ /*! \fn status_t BMessage::ReplaceFlat(const char *name, int32 index, BFlattenable *object) - \brief Replace a flattened object at the label \a name at a specified - \a index. + \brief Replace a flattened object at the label \a name at a + specified \a index. - The data at the specified \a name and \a index will be replaced, if it - matches the type returned by your object. This method uses + The data at the specified \a name and \a index will be + replaced, if it matches the type returned by your object. This method uses BFlattenable::TypeCode() to determine the type of the object. \param name The name associated with the data to replace. \param index The index in the array to replace. \param object The object to store in the message. + \retval B_OK The operation succeeded. \retval B_BAD_INDEX The index was out of range. + \see ReplaceFlat(const char*, BFlattenable *) */ @@ -2005,9 +2075,9 @@ /*! \name Deprecated methods - These methods are very likely to disappear, and they have been - replaced by safer and more powerful methods. These methods are still - implemented for binary compatibility, but they are not documented. + These methods are \e very likely to disappear, and they have been replaced + by safer and more powerful methods. These methods are still implemented + for binary compatibility, but they are not documented. */ diff --git a/docs/user/book.css b/docs/user/book.css index 0ef01740a7..4f50ee8f05 100644 --- a/docs/user/book.css +++ b/docs/user/book.css @@ -7,149 +7,236 @@ * Stephan Aßmus * Braden Ewing * Humdinger + * John Scipione */ -/* This is the Doxygen standard (messy) CSS updated with Haiku stuff. - All tags which are lower case have custom CSS, all upper case tags are the original. - I did some reordering. - - nielx - */ +/* color names provided by: http://chir.ag/projects/name-that-color */ html { - margin: 0px; - padding: 0px; + overflow-x: hidden; + overflow-y: scroll; +} + +body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea, + p,blockquote,th,td { + margin: 0; + padding: 0; } body { - font-family: "DejaVu Sans",Arial,Helvetica,sans-serif; - background: white; - color: #333333; - font-size: 90%; - margin: 0px; - padding: 0px; + color: #333333; /* mine shaft */ + background-color: white; + font-family: "DejaVu Sans", Arial, sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + color: #0c3762; /* madison */ + margin-top: 0.5em; + margin-bottom: 0.5em; } h1 { font-size: 1.3em; - font-weight: normal; - color: #0c3762; - border-bottom: dotted thin #e0e0e0; + font-weight: bold; + border-bottom: dotted thin #c0c0c0; /* silver */ } h2 { - font-size: 1.2em; + font-size: 1.3em; font-weight: normal; - color: #0c3762; - border-bottom: dotted thin #e0e0e0; - margin-top: 10px; + border-bottom: dotted thin #c0c0c0; /* silver */ } h3 { - font-size: 1.1em; + font-size: 1.2em; font-weight: normal; - color: #0c3762; - margin-top: 10px; + border-bottom: dotted thin #c0c0c0; /* silver */ } h4 { + font-size: 1.1em; + font-weight: normal; +} + +h5, h6 { font-size: 1.0em; - font-weight: lighter; - color: #0c3762; - margin-top: 10px; + font-weight: normal; } p { - text-align: justify; - line-height: 1.3; + font-size: 14.4px; + margin-top: 0.5em; + margin-bottom: 0.5em; } -/* link colors and text decoration */ - -a:link { - font-weight: bold; - text-decoration: none; - color: #dc3c01; +table { + border-collapse: collapse; + border-spacing: 0; } -a:visited { +td, th { + vertical-align: top; + text-align: left; +} + +caption { + text-align:left; +} + +fieldset,img { + border: 0; +} + +q:before,q:after { + content: ''; +} + +abbr,acronym { + border: 0; +} + +a:link { font-weight: bold; text-decoration: none; - color: #892601; + color: #dc3c01; /* grenadier */ +} + +a:visited { + font-weight: bold; + text-decoration: none; + color: #892601; /* peru tan */ } a:hover, a:active { text-decoration: underline; - color: #ff4500; + color: #ff4500; /* vermilion */ } + /* Some headers act as anchors, don't give them a hover effect */ -h1 a:hover, a:active { +h1 a:hover, a:active, h2 a:hover, a:active, h3 a:hover, a:active, +h4 a:hover, a:active, h5 a:hover, a:active, h6 a:hover, a:active { text-decoration: none; - color: #0c3762; -} - -h2 a:hover, a:active { - text-decoration: none; - color: #0c3762; -} - -h3 a:hover, a:active { - text-decoration: none; - color: #0c3762; -} - -h4 a:hover, a:active { - text-decoration: none; - color: #0c3762; + color: #0c3762; /* madison */ } /* Custom Header */ -div.logo { +#banner { position: relative; - left: 0px; - top: 0px; - background: #efefef; + top: 0; + left: 0; + height: 84px; + background: #eeeeee; /* gallery */ } -div.logo img { - margin-left: 20px; +#banner div.logo { + background: url('http://api.haiku-os.org/logo.png') no-repeat scroll 0 0 transparent; + width: 59em; + height: 100%; + margin: 0 auto; } -div.title { - position: absolute; +#banner span.subtitle { + position: relative; top: 54px; - right: 40px; + left: 272px; + color: #333333; /* mine shaft */ + text-transform: uppercase; + letter-spacing: 3px; + font-family: Myriad Pro,Myriad Web Pro Regular,Lucida Grande,Geneva,Trebuchet MS,sans-serif; + font-weight: normal; +} + +div.header { + margin-top: 20px; + margin: 10px auto; + width: 59em; +} + +div.summary { + margin: 0 auto; + width: 59em; + + display: none; +} + +div.headertitle { + margin: 0 auto; + width: 59em; +} + +div.headertitle div.title { + color: #0c3762; /* madison */ font-size: 1.2em; + font-weight: bold; + margin-top: 0.5em; + margin-bottom: 0.5em; +} + +.ingroups { + margin-top: 10px; } /* Navigation Tabs */ -div.tabs { - width: 100%; - background: #e0e0e0; + +div.tabs, div.tabs2, div.tabs3 { + position: relative; + left: 0; + top: 0; + background: #e0e0e0; /* alto */ + margin: 0; + padding: 0; } -div.tabs ul { - margin: 0px; - padding-left: 10px; +div.tabs ul.tablist, div.tabs2 ul.tablist, div.tabs3 ul.tablist { + margin: 0 auto; + padding-top: 3px; + padding-bottom: 2px; + list-style: none; + width: 59em; +} + +div.navpath { + margin: 20px auto; + width: 59em; +} + +div.navpath ul { list-style: none; } -div.tabs li { +div.navpath ul li { + padding-top: 3px; + padding-bottom: 2px; +} + +div.tabs ul.tablist { +} + +div.tabs2 ul.tablist { +} + +div.tabs3 ul.tablist { +} + +div.tabs ul.tablist li, div.tabs2 ul.tablist li, div.tabs3 ul.tablist li { display: inline; margin: 0px; padding: 0px; - font-size: 0,8em; + font-size: 0.8em; } -div.tabs span { +div.tabs ul.tablist li span, div.tabs2 ul.tablist li span, + div.tabs3 ul.tablist li span { display: inline; - padding: 5px 9px; + padding-right: 9px; white-space: nowrap; } -div.tabs li.current a { +div.tabs ul.tablist li li.current a, div.tabs2 ul.tablist li li.current a, + div.tabs3 ul.tablist li li.current a { color: black; text-decoration: none; } @@ -157,128 +244,256 @@ div.tabs li.current a { /* Contents div */ div.contents { - padding: 50px 40px; + line-height: 1.5; + margin: 10px auto; + width: 59em; +} + +div.contents ul, div.contents ol { + font-size: 14.4px; + line-height: 1.3; +} + +div.contents em, div.contents code { + font-weight: normal; + font-style: normal; +} + +div.contents code { + color: blue; +} + +div.contents td { + line-height: 1.3; +} + +div.contents code { + color: blue; + font-family: "Deja Vu Mono", Courier, "Courier New", monospace, fixed; + font-weight: normal; + font-style: normal; +} + +div.contents div.dynheader { + margin-bottom: 16px; +} + +div.contents span.keycap, div.contents span.keysym { + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + border-color: #c7c7c7; /* silver */ + border-style: solid; + border-width: 1px; + padding: 0px 2px 0px 2px; + background-color: #e8e8e8; /* mercury */ + font-family: serif; + font-variant: small-caps; +} + +div.contents div.textblock { + width: 95%; + margin-bottom: 20px; +} + +div.contents hr { + display: none; +} + +div.contents ol,ul { + list-style: none; +} + +div.contents li { + margin-bottom: 10px; + margin-left: 20px; +} + +div.contents dd { + font-size: 14.4px; +} + +div.contents dt { + margin-top: 16px; + margin-bottom: 8px; } /* The boxes from the userguide */ -/* Rounded corner boxes */ -/* Common declarations */ -.info, .stop, .warning { - -webkit-border-radius: 10px; - -khtml-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - border-style: dotted; - border-width: thin; - border-color: #dcdcdc; - padding: 10px 15px 10px 80px; - margin-bottom: 15px; - margin-top: 15px; - min-height: 42px; +dl.note, dl.remark, dl.warning, dl.attention { + width: 100%; + border-style: solid; + border-width: 2px; + margin-top: 24px; + margin-bottom: 24px; + padding: 4px; + min-height: 64px; } -.info { - background: #e4ffde url(images/alert_info_32.png) 15px 15px no-repeat; + +dl.note { + /* rice flower */ + background:#e4ffde url('http://haiku-os.org/sites/haiku-os.org/themes/shijin/haiku-icons/alert_info_32.png') 15px 15px no-repeat; + border-color: #94ce18; /* lima */ } -.warning { - background: #fffbc6 url(images/alert_warning_32.png) 15px 15px no-repeat; + +dl.remark { + background: #f3f3f3 url('http://api.haiku-os.org/images/alert_idea_32.png') 15px 15px no-repeat; + border-color: #c0c0c0; /* silver */ } -.stop { - background: #ffeae6 url(images/alert_stop_32.png) 15px 15px no-repeat; + +dl.warning { + /* lemon chiffon */ + background: #fffbc6 url('http://api.haiku-os.org/images/alert_warning_32.png') 15px 15px no-repeat; + border-color: #eed300; /* gold */ } +dl.attention { + /* fair pink */ + background: #ffeae6 url('http://api.haiku-os.org/images/alert_stop_32.png') 15px 15px no-repeat; + border-color: red; +} + +dl.note dt, dl.remark dt, dl.warning dt, dl.attention dt { + display: none; /* don't display the Note: or Warning: header */ +} + +dl.note dd, dl.remark dd, dl.warning dd, dl.attention dd { + margin: 10px 10px 10px 60px; + color: black; /* pseudo-bold */ +} + + +/* For keyboard shortcuts and the like (also from userguide) */ + +div.contents span.keycap { + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + border-color: #c7c7c7; /* silver */ + border-style: solid; + border-width: 1px; + padding: 0px 2px 0px 2px; + background-color: #e8e8e8; /* mercury */ + font-family: serif; + font-variant: small-caps; +} + + /* Continue with the rest of the standard Doxygen stuff... */ CAPTION { font-weight: bold } -DIV.qindex { +div.qindex { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ text-align: center; margin: 2px; padding: 2px; - line-height: 140%; + line-height: 1.3; } -DIV.nav { +div.nav { width: 100%; - background-color: #e8eef2; - border: 1px solid #84b0c7; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ text-align: center; margin: 2px; padding: 2px; - line-height: 140%; + line-height: 1.3; } -DIV.navtab { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; +div.navtab { + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; } TD.navtab { - font-size: 70%; + ; } A.qindex { - text-decoration: none; - font-weight: bold; - color: #1A419D; + text-decoration: none; + font-weight: bold; + color: #1a419d; /* fun blue */ } A.qindex:visited { - text-decoration: none; - font-weight: bold; - color: #1A419D + text-decoration: none; + font-weight: bold; + color: #1a419d; /* fun blue */ } A.qindex:hover { text-decoration: none; - background-color: #ddddff; + background-color: #ddddff; /* fog */ } A.qindexHL { text-decoration: none; font-weight: bold; - background-color: #6666cc; - color: #ffffff; - border: 1px double #9295C2; + background-color: #6666cc; /* blue marguerite */ + color: white; + border: 1px double #9295c2; /* bell blue */ } A.qindexHL:hover { text-decoration: none; - background-color: #6666cc; - color: #ffffff; + background-color: #6666cc; /* blue marguerite */ + color: white; } -A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff } -A.elRef { font-weight: bold } -A.code:link { text-decoration: none; font-weight: normal; color: #0000FF} -A.code:visited { text-decoration: none; font-weight: normal; color: #0000FF} -A.codeRef:link { font-weight: normal; color: #0000FF} -A.codeRef:visited { font-weight: normal; color: #0000FF} -DL.el { margin-left: -1cm } -.fragment { - font-family: monospace, fixed; - font-size: 95%; +A.qindexHL:visited { + text-decoration: none; + background-color: #6666cc; /* blue marguerite */ + color: white; } -PRE.fragment { - border: 1px solid #CCCCCC; - background-color: #f5f5f5; - margin-top: 4px; - margin-bottom: 4px; - margin-left: 2px; - margin-right: 8px; - padding-left: 6px; - padding-right: 6px; - padding-top: 4px; - padding-bottom: 4px; +A.elRef { + font-weight: bold } -DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } - -DIV.groupHeader { - margin-left: 16px; - margin-top: 12px; - margin-bottom: 6px; - font-weight: bold; +A.code:link { + text-decoration: none; + font-weight: normal; + color: blue; +} +A.code:visited { + text-decoration: none; + font-weight: normal; + color: blue; +} +A.codeRef:link { + font-weight: normal; + color: blue; +} +A.codeRef:visited { + font-weight: normal; + color: blue; +} +dl.el { + margin-left: -1cm +} +div.fragment { + width: 99%; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ + padding: 4px; +} +div.fragment pre.fragment { + color: black; + font-family: "Deja Vu Mono", Courier, "Courier New", monospace, fixed; + font-weight: normal; + font-style: normal; + font-size: 0.9em; + line-height: 1.3; +} +div.fragment pre.fragment a.code { + font-weight: bold; +} +div.ah { + background-color: black; + font-weight: bold; + color: white; + margin-bottom: 3px; + margin-top: 3px; } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: 90% } - TD.indexkey { - background-color: #e8eef2; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ font-weight: bold; padding-right : 10px; padding-top : 2px; @@ -288,10 +503,10 @@ TD.indexkey { margin-right : 0px; margin-top : 2px; margin-bottom : 2px; - border: 1px solid #CCCCCC; } TD.indexvalue { - background-color: #e8eef2; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ font-style: italic; padding-right : 10px; padding-top : 2px; @@ -301,220 +516,345 @@ TD.indexvalue { margin-right : 0px; margin-top : 2px; margin-bottom : 2px; - border: 1px solid #CCCCCC; } TR.memlist { - background-color: #f0f0f0; + background-color: #f0f0f0; /* gallery */ } P.formulaDsp { text-align: center; } IMG.formulaDsp { } IMG.formulaInl { vertical-align: middle; } -SPAN.keyword { color: #008000 } -SPAN.keywordtype { color: #604020 } -SPAN.keywordflow { color: #e08000 } -SPAN.comment { color: #800000 } -SPAN.preprocessor { color: #806020 } -SPAN.stringliteral { color: #002080 } -SPAN.charliteral { color: #008080 } -.mdescLeft { - padding: 0px 8px 4px 8px; - font-size: 80%; - font-style: italic; - background-color: #FAFAFA; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; -} -.mdescRight { - padding: 0px 8px 4px 8px; - font-size: 80%; - font-style: italic; - background-color: #FAFAFA; - border-top: 1px none #E0E0E0; - border-right: 1px none #E0E0E0; - border-bottom: 1px none #E0E0E0; - border-left: 1px none #E0E0E0; - margin: 0px; -} -.memItemLeft { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; -} -.memItemRight { - padding: 1px 8px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; -} -.memTemplItemLeft { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: none; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; -} -.memTemplItemRight { - padding: 1px 8px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: none; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - background-color: #FAFAFA; - font-size: 80%; -} -.memTemplParams { - padding: 1px 0px 0px 8px; - margin: 4px; - border-top-width: 1px; - border-right-width: 1px; - border-bottom-width: 1px; - border-left-width: 1px; - border-top-color: #E0E0E0; - border-right-color: #E0E0E0; - border-bottom-color: #E0E0E0; - border-left-color: #E0E0E0; - border-top-style: solid; - border-right-style: none; - border-bottom-style: none; - border-left-style: none; - color: #606060; - background-color: #FAFAFA; - font-size: 80%; -} -.search { color: #003399; - font-weight: bold; +SPAN.keyword { color: #008000; /* japanese laurel */ } +SPAN.keywordtype { color: #5c5f05; /* antique bronze */ } +SPAN.keywordflow { color: #e08000; /* mango tango */ } +SPAN.comment { color: #008000; /* japanese laurel */ } +SPAN.preprocessor { color: #806020; /* kumera */ } +SPAN.stringliteral { color: blue; } +SPAN.charliteral { color: #008080; /* teal */ } +.search { + color: #003399; /* smalt */ + font-weight: bold; } FORM.search { - margin-bottom: 0px; - margin-top: 0px; + margin-bottom: 0px; + margin-top: 0px; } -INPUT.search { font-size: 75%; - color: #000080; - font-weight: normal; - background-color: #e8eef2; +INPUT.search { + color: #000080; /* navy blue */ + font-weight: normal; + background-color: #f3f3f3; /* concrete */ } -TD.tiny { font-size: 75%; +TD.tiny { font-size: 75%; } +.dirtab { + padding: 4px; + border-collapse: collapse; + border: 1px solid #84b0c7; /* glacier */ +} +TH.dirtab { + background-color: #f3f3f3; /* concrete */ + font-weight: bold; } -.dirtab { padding: 4px; - border-collapse: collapse; - border: 1px solid #84b0c7; +/* member declaration table */ + +table.memberdecls { + width: 100%; } -TH.dirtab { background: #e8eef2; - font-weight: bold; + +table.memberdecls td.memItemLeft { + font-size: 13px; + white-space: nowrap; + text-align: right; + padding: 6px 0px 4px 8px; + margin: 4px; + vertical-align: top; + border-top: 1px solid #c0c0c0; /* silver */ + border-left: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ } -HR { height: 1px; - border: none; - border-top: 1px solid black; + +table.memberdecls td.memItemRight { + font-size: 13px; + padding: 6px 8px 4px 0px; + margin: 4px; + vertical-align: top; + border-top: 1px solid #c0c0c0; /* silver */ + border-right: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td.mdescLeft { + font-size: 13px; + line-height: 1.3; + padding: 1px 0px 4px 8px; + margin: 0px; + border-bottom: 1px solid #c0c0c0; /* silver */ + border-left: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td.mdescRight { + font-size: 13px; + line-height: 1.3; + padding: 1px 8px 4px 0px; + margin: 0px; + border-bottom: 1px solid #c0c0c0; /* silver */ + border-right: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td.mdescRight p { + margin: 0; + padding: 0; +} + +table.memberdecls td.memTemplItemLeft { + font-size: 13px; + padding: 1px 0px 0px 8px; + margin: 0px; + text-align: right; + border-left: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td.memTemplItemRight { + font-size: 13px; + padding: 1px 8px 0px 0px; + margin: 0px; + border-right: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td.memTemplParams { + font-size: 13px; + padding: 1px 0px 0px 8px; + margin: 0px; + border-top: 1px solid #c0c0c0; /* silver */ + border-left: 1px solid #c0c0c0; /* silver */ + border-right: 1px solid #c0c0c0; /* silver */ + background-color: #f3f3f3; /* concrete */ +} + +table.memberdecls td div.groupHeader { + /* same as h3 */ + color: #0c3762; /* madison */ + margin-top: 0.5em; + margin-bottom: 0.5em; + font-size: 1.2em; + font-weight: normal; + border-bottom: dotted thin #c0c0c0; /* silver */ +} + +table.memberdecls td div.groupText { + font-size: 14.4px; } /* Style for detailed member documentation */ -.memtemplate { - font-size: 80%; - color: #606060; - font-weight: normal; + +div.memtemplate { + font-weight: normal; + font-style: normal; } -.memnav { - background-color: #e8eef2; - border: 1px solid #84b0c7; - text-align: center; - margin: 2px; - margin-right: 15px; - padding: 2px; + +div.memnav { + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ + text-align: center; + margin: 2px; + margin-right: 15px; + padding: 2px; } -.memitem { - padding: 4px; - background-color: #eef3f5; - border-width: 1px; - border-style: solid; - border-color: #dedeee; - -moz-border-radius: 8px 8px 8px 8px; + +/* member item */ + +div.memitem { + margin-bottom: 20px; + width: 100%; } -.memname { - white-space: nowrap; - font-weight: bold; + +div.memitem dl.info, div.memitem dl.note, div.memitem dl.attention, + div.memitem dl.warning, + div.memitem dl.stop, div.memitem dl.bug { + width: 99%; } -.memdoc{ - padding-left: 10px; + +/* member prototype */ + +div.memproto { + padding: 4px; + background-color: #f3f3f3; /* concrete */ + border: 1px solid #c0c0c0; /* silver */ + font-size: 13px; } -.memproto { - background-color: #d5e1e8; - width: 100%; - border-width: 1px; - border-style: solid; - border-color: #84b0c7; - font-weight: bold; - -moz-border-radius: 8px 8px 8px 8px; + +div.memproto table { + font-size: 13px; } -.paramkey { - text-align: right; + +/* member table */ + +div.memproto table.memname { + line-height: 1.3; } -.paramtype { - white-space: nowrap; + +div.memproto table.memname td.paramtype { + white-space: nowrap; } -.paramname { - color: #602020; - font-style: italic; - white-space: nowrap; + +div.memproto table.memname td.paramkey { + text-align: right; } + +div.memproto table.memname td.paramname { + white-space: nowrap; +} + +div.memproto table.memname td.memname { + white-space: nowrap; +} + +/* member documetation */ + +div.memdoc { + width: 100%; +} + +div.memdoc div.memproto { + margin-top: 2em; +} + +div.memdoc table { + width: 100%; +} + +div.memdoc table td { + vertical-align: middle; + padding: 8px; + border: 1px solid #d5d5d5; /* silver */ +} + +div.memdoc td:first-child { + width: 157px; +} + +div.memdoc dl dd table { + width: 100%; +} + +div.memdoc dl dd table td { + font-size: 14.4px; + padding: 8px; + border: 1px solid #d5d5d5; /* silver */ +} + +div.memdoc dl dd table td ul, table td ol { + margin-top: 8px; + margin-bottom: 8px; +} + +div.memdoc dl dd div.memdoc table.doxtable td { + border: none; +} + +/* parameters table */ + +div.memdoc dl dd table.params td.paramdir { + vertical-align: top; + color: black; + width: 157px; +} + +div.memdoc dl dd table.params td.paramname { + vertical-align: top; + font-weight: normal; + font-style: normal; + width: 157px; +} + +/* return values table */ + +div.memdoc dl dd table.retval td.paramname { + vertical-align: top; + color: blue; + width: 157px; +} + /* End Styling for detailed member documentation */ /* for the tree view */ .ftvtree { font-family: sans-serif; - margin:0.5em; + margin: 0.5em; } + .directory { font-size: 9pt; font-weight: bold; } .directory h3 { margin: 0px; margin-top: 1em; font-size: 11pt; } .directory > h3 { margin-top: 0; } .directory p { margin: 0px; white-space: nowrap; } .directory div { display: none; margin: 0px; } .directory img { vertical-align: -30%; } + +/* printer only pretty stuff */ +@media print { + /* suggest page orientation */ + @page { size: portrait; } + .noprint { + display: none; + } + + html { + background: #FFF; + } + + /* hide header and nav bar */ + #banner { + display:none; + } + + div.tabs, div.tabs2, div.tabs3 { + display:none; + } + + div.summary { + margin: 0px; + padding: 0px; + } + + div.headertitle { + margin: 0px; + padding: 0px; + } + + div.content { + margin: 0px; + padding: 0px; + } + + /* some links we want to print the url along with (CSS2) */ + a.printurl:after { + content: " <" attr(href) ">"; + font-weight: normal; + font-size: small; + } + + /* override for those we really don't want to print */ + a.noprinturl:after { + content: ""; + } + + /* for acronyms we want their definitions inlined at print time */ + acronym[title]:after { + font-size: small; + content: " (" attr(title) ")"; + font-style: italic; + } + + /* and not have mozilla dotted underline */ + acronym { + border: none; + } + + pre.terminal { /* Terminal output black on white */ + background-color: #ffffff; + color: #000000; + } +} diff --git a/docs/user/book.dox b/docs/user/book.dox index cb23cc1697..b2c2056c45 100644 --- a/docs/user/book.dox +++ b/docs/user/book.dox @@ -1,46 +1,555 @@ /*! - \mainpage The Haiku Book + \mainpage Welcome to the Haiku Book - \section kits Kits and Servers + Below you will find documentation on the Application Programming + Interface (API) of the Haiku operating system. This API describes + the internals of the operating system allowing developers to write + native C++ applications and device drivers. See the + online version for the most + updated version of this document. If you would like to help contribute + contact the documentation + mailing list. For guidelines on how to help document the API see + the \link apidoc Documenting the API\endlink page. A list of + contributors can be found \ref credits page. Documenting the API is + an ongoing process so contributions are greatly appreciated. - - \ref app | \link app_intro \em Introduction \endlink - - \ref drivers - - \ref interface | \link interface_intro \em Introduction \endlink - - \ref locale | \link locale_intro \em Introduction \endlink - - \ref midi1 - - \ref midi2 | \link midi2_intro \em Introduction \endlink - - \ref support | \link support_intro \em Introduction \endlink + The Haiku API is based on the BeOS R5 API but changes and additions have + been included where appropriate. Important compatibility differences are + detailed on the \ref compatibility page. New classes and methods + and incompatible API changes to the BeOS R5 API are noted in the + appropriate sections. + + A complete reference to the BeOS R5 API is available on the web in + The Be Book. + The Be Book is used with permission from + Access Co., the current + owners of Be's intellectual property. - \section notes General Notes and Information - - \ref compatibility - - \ref apidoc - - \ref credits + \section kits Kits and Servers + + The API is split into several kits and servers each detailing a different + aspect of the operating system. + - The \ref app is the starting point for developing applications + and includes classes for messaging and for interacting with + the rest of the system. + - The \ref interface is used to create responsive and attractive + graphical user interfaces building on the messaging facilities + provided by the Application Kit. + - The \link layout_intro Layout API \endlink is a new addition + to the Interface Kit in Haiku which provides resources to + layout your application flexibly and easily. + - The \ref locale includes classes to localize your application to + different languages, timezones, number formatting conventions and + much more. + - The \ref media provides a unified and consistent interface for media + streams and applications to intercommunicate. + - The \ref midi2 describes an interface to generating, processing, + and playing music in MIDI format. For reference documentation on the + \ref midi1 is also included. + - The \ref storage is a collection of classes that deal with storing and + retrieving information from disk. + - The \ref support contains support classes to use in your application + including resources for thread safety, IO, and serialization. + + \section special_topics Special Topics + + - \ref drivers */ ///// Define main kits ///// /*! - \defgroup app Application Kit - \defgroup drivers Drivers - \defgroup interface Interface Kit - \brief API for displaying a graphical user interface. - \defgroup midi2 MIDI 2 Kit - \brief API for producing and consuming MIDI events. - \defgroup libmidi2 (libmidi2.so) - \defgroup support Support Kit - \brief Collection of utility classes that are used throughout the API. - \defgroup libbe (libbe.so) - \defgroup libroot (libroot.so) - \defgroup locale Locale Kit - \brief Collection of classes for localizing applications. + \defgroup app Application Kit + \brief The Application Kit is the starting point for writing native Haiku + GUI applications. + + The application kit is exactly what its name suggests — it is the + basis of Haiku applications. You should first read through this document + and the references here before moving on to the other parts of the API. + + The Application Kit classes can be divided into two groups: the messaging + classes and the system interaction classes. The larger of the two groups is + the messaging classes. Since the Haiku API relies on pervasive + multithreading messaging is an essential topic for any application. Have a + look at the \link app_messaging Introduction to Messaging \endlink for more + information. + + The following messaging classes which allow you to easily and securely + communicate between threads. + - BHandler + - BInvoker + - BLooper + - BMessage + - BMessageFilter + - BMessageQueue + - BMessageRunner + - BMessenger + + The second group is the system interaction classes. These classes + provide hooks for your application to interact with the rest of the system. + The most important class in this group is BApplication. Below is a list of + all system interaction classes: + - BApplication + - BClipboard + - BCursor + - BPropertyInfo + - BRoster + + + \defgroup drivers Device Drivers + + + \defgroup interface Interface Kit + \brief API for displaying a graphical user interface. + + The Interface Kit holds all the classes you'll need to develop a GUI. + Building on the messaging facilities provided by the Application Kit, + the Interface Kit can be used to create a responsive and attractive + graphical user interface. + + The most important class in the Interface Kit is the BView class, which + handles drawing and user interaction. Pointer and keyboard events are + processed in this class. + + Another important class is the BWindow class, which holds BViews and makes + them visible to the user. The BWindow class also handles BView focusing + and BMessage dispatching, among other things. + + A new addition Haiku has added over the BeOS API is the Layout API, which + is based around the BLayoutItem and BLayout classes. These classes will + take care of making sure all your GUI widgets end up where you want them, + with enough space to be useful. You can start learning the Layout API + by reading the \link layout_intro introduction \endlink. + + + \defgroup locale Locale Kit + \brief Collection of classes for localizing applications. + + The Locale Kit provides a set of tools for internationalizing, + localizing and translating your software. This includes not only + replacing string with their translations at runtime, but also more + complex tasks such as formatting numbers, dates, and times in a way + that match the locale preferences of the user. + + The main way to access locale data is through the be_locale_roster. + This is a global instance of the BLocaleRoster class, storing the data + for localizing an application according to the user's preferred settings. + The locale roster also acts as a factory to instantiate most of the other + classes. However, there are some cases where you will need to instantiate + another class by yourself, to use it with custom settings. For example, you + may need to format a date with a fixed format in english for including in an + e-mail header, as it is the only format accepted there. + + Unlike the other kits in Haiku, the Locale kit does not live in libbe. + When building a localized application, you have to link it to + liblocale.so. If you want to use the catalog macros, you also have to + link each of your images (that is, applications, libraries and add-ons) + to liblocalestub.a. + + \defgroup media Media Kit + \brief Collection of classes that deal with audio and video. + + + \defgroup midi1 The old MIDI Kit (libmidi.so) + \brief The old MIDI kit. + + + \defgroup midi2 MIDI 2 Kit + \brief The Midi Kit is the API that implements support for generating, + processing, and playing music in MIDI format. + + MIDI, which stands for 'Musical + Instrument Digital Interface', is a well-established standard for + representing and communicating musical data. This document serves as + an overview. If you would like to see all the components, please look + at \link midi2 the list with classes \endlink. + + \section midi2twokits A Tale of Two MIDI Kits + + BeOS comes with two different, but compatible Midi Kits. This + documentation focuses on the "new" Midi Kit, or midi2 as we like to + call it, that was introduced with BeOS R5. The old kit, which we'll + refer to as midi1, is more complete than the new kit, but less powerful. + + Both kits let you create so-called MIDI endpoints, but the endpoints + from midi1 cannot be shared between different applications. The midi2 + kit solves that problem, but unlike midi1 it does not include a General + MIDI softsynth, nor does it have a facility for reading and playing + Standard MIDI Files. Don't worry: both kits are compatible and you can + mix-and-match them in your applications. + + The main differences between the two kits: + - Instead of one BMidi object that both produces and consumes events, + we have BMidiProducer and BMidiConsumer. + - Applications are capable of sharing MIDI producers and consumers + with other applications via the centralized Midi Roster. + - Physical MIDI ports are now sharable without apps "stealing" events + from each other. + - Applications can now send/receive raw MIDI byte streams (useful if + an application has its own MIDI parser/engine). + - Channels are numbered 0–15, not 1–16 + - Timing is now specified in microseconds rather than milliseconds. + + \section midi2concepts Midi Kit Concepts + + A brief overview of the elements that comprise the Midi Kit: + - \b Endpoints. This is what the Midi Kit is all about: sending MIDI + messages between endpoints. An endpoint is like a MIDI In or MIDI + Out socket on your equipment; it either receives information or it + sends information. Endpoints that send MIDI events are called + \b producers; the endpoints that receive those events are called + \b consumers. An endpoint that is created by your own application + is called \b local; endpoints from other applications are + \b remote. You can access remote endpoints using \b proxies. + - \b Filters. A filter is an object that has a consumer and a producer + endpoint. It reads incoming events from its consumer, performs some + operation, and tells its producer to send out the results. In its + current form, the Midi Kit doesn't provide any special facilities + for writing filters. + - \b Midi \b Roster. The roster is the list of all published producers + and consumers. By publishing an endpoint, you allow other + applications to talk to it. You are not required to publish your + endpoints, in which case only your own application can use them. + - \b Midi \b Server. The Midi Server does the behind-the-scenes work. + It manages the roster, it connects endpoints, it makes sure that + endpoints can communicate, and so on. The Midi Server is started + automatically when BeOS boots, and you never have to deal with it + directly. Just remember that it runs the show. + - \b libmidi. The BMidi* classes live inside two shared libraries: + libmidi.so and libmidi2.so. If you write an application that uses + old Midi Kit, you must link it to libmidi.so. Applications that use + the new Midi Kit must link to libmidi2.so. If you want to + mix-and-match both kits, you should also link to both libraries. + + Here is a pretty picture: + + \image html midi2concepts.png + + \section midi2mediakit Midi Kit != Media Kit + + Be chose not to integrate the Midi Kit into the Media Kit as another media + type, mainly because MIDI doesn't require any of the format negotiation that + other media types need. Although the two kits look similar -- both have a + "roster" for finding or registering "consumers" and "producers" -- there are + some very important differences. + + The first and most important point to note is that BMidiConsumer and + BMidiProducer in the Midi Kit are \b NOT directly analogous to + BBufferConsumer and BBufferProducer in the Media Kit! In the Media Kit, + consumers and producers are the data consuming and producing properties + of a media node. A filter in the Media Kit, therefore, inherits from both + BBufferConsumer and BBufferProducer, and implements their virtual member + functions to do its work. + + In the Midi Kit, consumers and producers act as endpoints of MIDI data + connections, much as media_source and media_destination do in the Media Kit. + Thus, a MIDI filter does not derive from BMidiConsumer and BMidiProducer; + instead, it contains BMidiConsumer and BMidiProducer objects for each of its + distinct endpoints that connect to other MIDI objects. The Midi Kit does not + allow the use of multiple virtual inheritance, so you can't create an object + that's both a BMidiConsumer and a BMidiProducer. + + This also contrasts with the old Midi Kit's conception of a BMidi object, + which stood for an object that both received and sent MIDI data. In the new + Midi Kit, the endpoints of MIDI connections are all that matters. What lies + between the endpoints, i.e. how a MIDI filter is actually structured, is + entirely at your discretion. + + Also, rather than use token structs like media_node to make connections + via the MediaRoster, the new kit makes the connections directly via the + BMidiProducer object. + + \section midi2remotelocal Remote vs. Local Objects + + The Midi Kit makes a distinction between remote and local MIDI objects. + You can only create local MIDI endpoints, which derive from either + BMidiLocalConsumer or BMidiLocalProducer. Remote endpoints are endpoints + that live in other applications, and you access them through BMidiRoster. + + BMidiRoster only gives you access to BMidiEndpoints, BMidiConsumers, and + BMidiProducers. When you want to talk to remote MIDI objects, you do so + through the proxy objects that BMidiRoster provides. Unlike + BMidiLocalConsumer and BMidiLocalProducer, these classes do not provide a + lot of functions. That is intentional. In order to hide the details of + communication with MIDI endpoints in other applications, the Midi Kit must + hide the details of how a particular endpoint is implemented. + + So what can you do with remote objects? Only what BMidiConsumer, + BMidiProducer, and BMidiEndpoint will let you do. You can connect + objects, get the properties of these objects -- and that's about it. + + \section midi2lifespan Creating and Destroying Objects + + The constructors and destructors of most midi2 classes are private, + which means that you cannot directly create them using the C++ + new operator, on the stack, or as globals. Nor can you + delete them. Instead, these objects are obtained through + BMidiRoster. The only two exceptions to this rule are BMidiLocalConsumer + and BMidiLocalProducer. These two objects may be directly created and + subclassed by developers. + + \section midi2refcount Reference Counting + + Each MIDI endpoint has a reference count associated with it, so that + the Midi Roster can do proper bookkeeping. When you construct a + BMidiLocalProducer or BMidiLocalConsumer endpoint, it starts with a + reference count of 1. In addition, BMidiRoster increments the reference + count of any object it hands to you as a result of + \link BMidiRoster::NextEndpoint() NextEndpoint() \endlink or + \link BMidiRoster::FindEndpoint() FindEndpoint() \endlink. + Once the count hits 0, the endpoint will be deleted. + + This means that, to delete an endpoint, you don't call the + delete operator directly; instead, you call + \link BMidiEndpoint::Release() Release() \endlink. + To balance this call, there's also an + \link BMidiEndpoint::Acquire() Acquire() \endlink, in case you have two + disparate parts of your application working with the endpoint, and you + don't want to have to keep track of who needs to Release() the endpoint. + + When you're done with any endpoint object, you must Release() it. + This is true for both local and remote objects. Repeat after me: + Release() when you're done. + + \section midi2events MIDI Events + + To make some actual music, you need to + \link BMidiProducer::Connect() Connect() \endlink your consumers to + your producers. Then you tell the producer to "spray" MIDI events to all + the connected consumers. The consumers are notified of these incoming + events through a set of hook functions. + + The Midi Kit already provides a set of commonly used spray functions, + such as \link BMidiLocalProducer::SprayNoteOn() SprayNoteOn() \endlink, + \link BMidiLocalProducer::SprayControlChange() SprayControlChange() + \endlink, and so on. These correspond one-to-one with the message types + from the MIDI spec. You don't need to be a MIDI expert to use the kit, but + of course some knowledge of the protocol helps. If you are really hardcore, + you can also use the + \link BMidiLocalProducer::SprayData() SprayData() \endlink to send raw MIDI + events to the consumers. + + At the consumer side, a dedicated thread invokes a hook function for every + incoming MIDI event. For every spray function, there is a corresponding hook + function, e.g. \link BMidiLocalConsumer::NoteOn() NoteOn() \endlink and + \link BMidiLocalConsumer::ControlChange() ControlChange() \endlink. + The hardcore MIDI fanatics among you will be pleased to know that you can + also tap into the \link BMidiLocalConsumer::Data() Data() \endlink hook and + get your hands dirty with the raw MIDI data. + + \section midi2time Time + + The spray and hook functions accept a bigtime_t parameter named "time". This + indicates when the MIDI event should be performed. The time is given in + microseconds since the computer booted. To get the current tick measurement, + you call the system_time() function from the Kernel Kit. + + If you override a hook function in one of your consumer objects, it should + look at the time argument, wait until the designated time, and then perform + its action. The preferred method is to use the Kernel Kit's + snooze_until() function, which sends the consumer thread to + sleep until the requested time has come. (Or, if the time has already + passed, returns immediately.) + + Like this: + + \code +void MyConsumer::NoteOn( + uchar channel, uchar note, uchar velocity, bigtime_t time) +{ + snooze_until(time, B_SYSTEM_TIMEBASE); + ...do your thing... +} + \endcode + + If you want your producers to run in real time, i.e. they produce MIDI data + that needs to be performed immediately, you should pass time 0 to the spray + functions (which also happens to be the default value). Since time 0 has + already passed, snooze_until() returns immediately, and the + consumer will process the events as soon as they are received. + + To schedule MIDI events for a performance time that lies somewhere in the + future, the producer must take into account the consumer's latency. + Producers should attempt to get notes to the consumer by or before + (scheduled_performance_time - latency). The time argument is still + the scheduled performance time, so if your consumer has latency, it should + snooze like this before it starts to perform the events: + + \code +snooze_until(time - Latency(), B_SYSTEM_TIMEBASE); + \endcode + + Note that a typical producer sends out its events as soon as it can; + unlike a consumer, it does not have to snooze. + + \section midi2ports Other Timing Issues + + Each consumer object uses a Kernel Kit port to receive MIDI events from + connected producers. The queue for this port is only 1 message deep. + This means that if the consumer thread is asleep in a + snooze_until(), it will not read its port. Consequently, + any producer that tries to write a new event to this port will block until + the consumer thread is ready to receive a new message. This is intentional, + because it prevents producers from generating and queueing up thousands of + events. + + This mechanism, while simple, puts on the producer the responsibility + for sorting the events in time. Suppose your producer sends three Note + On events, the first on t + 0, the second on t + 4, and the third on t + 2. + This last event won't be received until after t + 4, so it will be two ticks + too late. If this sort of thing can happen with your producer, you should + somehow sort the events before you spray them. Of course, if you have two or + more producers connected to the same consumer, it is nearly impossible to + sort this all out (pardon the pun). So it is not wise to send the same kinds + of events from more than one producer to one consumer at the same time. + + The article Introduction to MIDI, Part 2 in OpenBeOS + Newsletter 36 describes this problem in more detail, and provides a + solution. Go read it now! + + \section midi2filters Writing a Filter + + A typical filter contains a consumer and a producer endpoint. It receives + events from the consumer, processes them, and sends them out again using the + producer. The consumer endpoint is a subclass of BMidiLocalConsumer, whereas + the producer is simply a BMidiLocalProducer, not a subclass. This is a + common configuration, because consumers work by overriding the event hooks + to do work when MIDI data arrives. Producers work by sending an event when + you call their member functions. You should hardly ever need to derive from + BMidiLocalProducer (unless you need to know when the producer gets connected + or disconnected, perhaps), but you'll always have to override one or more of + BMidiLocalConsumer's member functions to do something useful with incoming + data. + + Filters should ignore the time argument from the spray and hook functions, + and simply pass it on unchanged. Objects that only filter data should + process the event as quickly as possible and be done with it. Do not + snooze_until() in the consumer endpoint of a filter! + + \section midi2apidiffs API Differences + + As far as the end user is concerned, the Haiku Midi Kit is mostly the same + as the BeOS R5 kits, although there are a few small differences in the API + (mostly bug fixes): + - BMidiEndpoint::IsPersistent() always returns false. + - The B_MIDI_CHANGE_LATENCY notification is now properly sent. The Be + kit incorrectly set be:op to B_MIDI_CHANGED_NAME, even though the + rest of the message was properly structured. + - If creating a local endpoint fails, you can still Release() the object + without crashing into the debugger. + + \section midi2seealso See also + + More about the Midi Kit: + - \ref Midi2Defs.h + - Be Newsletter Volume 3, Issue 47 - Motor Mix sample code + - Be Newsletter Volume 4, Issue 3 - Overview of the new kit + - Newsletter + 33, Introduction to MIDI, Part 1 + - Newsletter + 36, Introduction to MIDI, Part 2 + - Sample code and other goodies at the + Haiku Midi Kit team page + + Information about MIDI in general: + - MIDI Manufacturers Association + - MIDI Tutorials + - MIDI Specification + - Standard MIDI File Format + - Jim Menard's MIDI Reference + + + \defgroup libmidi2 (libmidi2.so) + + + \defgroup storage Storage Kit + \brief Collection of classes that deal with storing and retrieving + information from disk. + + + \defgroup support Support Kit + \brief Collection of utility classes that are used throughout the API. + + The Support Kit provides a handy set of classes that you can use in your + applications. These classes provide: + - \b Thread \b Safety. Haiku can execute multiple threads of an + application in parallel, letting certain parts of an application + continue when one part is stalled, as well as letting an application + process multiple pieces of data at the same time on multicore or + multiprocessor systems. However, there are times when multiple + threads desire to work on the same piece of data at the same time, + potentially causing a conflict where variables or pointers are + changed by one thread causing another to execute incorrectly. To + prevent this, Haiku implements a \"locking\" mechanism, allowing one + thread to \"lock out\" other threads from executing code that might + modify the same data. + - \b Archiving \b and \b IO. These classes allow a programmer to + convert objects into a form that can more easily be transferred to + other applications or stored to disk, as well as performing basic + input and output operations. + - \b Memory \b Allocation. This class allows a programmer to hand off + some of the duties of memory accounting and management. + - \b Common \b Datatypes. To avoid unnecessary duplication of code + and to make life easier for programmers, Haiku includes classes that + handle management of ordered lists and strings. + + There are also a number of utility functions to time actions, play system + alert sounds, compare strings, and atomically manipulate integers. Have a + look at the overview, or go straight to the complete + \link support list of components \endlink of this kit. + + \section Overview + - Thread Safety: + - BLocker provides a semaphore-like locking mechanism allowing for + recursive locks. + - BAutolock provides a simple method of automatically removing a + lock when a function ends. + - \ref TLS.h "Thread Local Storage" allows a global variable\'s + content to be sensitive to thread context. + - Archiving and IO: + - BArchivable provides an interface for \"archiving\" objects so + that they may be sent to other applications where an identical + copy will be recreated. + - BArchiver simplifies archiving of BArchivable hierarchies. + - BUnarchiver simplifies unarchiving hierarchies that have been + archived using BArchiver. + - BFlattenable provides an interface for \"flattening\" objects so + that they may be easily stored to disk. + - BDataIO provides an interface for generalized read/write streams. + - BPositionIO extends BDataIO to allow seeking within the data. + - BBufferIO creates a buffer and attaches it to a BPositionIO + stream, allowing for reduced load on the underlying stream. + - BMemoryIO allows operation on an already-existing buffer. + - BMallocIO creates and allows operation on a buffer. + - Memory Allocation: + - BBlockCache allows an application to allocate a \"pool\" of + memory blocks that the application can fetch and dispose of as + it pleases, letting the application make only a few large memory + allocations, instead of many small expensive allocations. + - Common Datatypes: + - BList allows simple ordered lists and provides common access, + modification, and comparison functions. + - BString allows strings and provides common access, modification, + and comparison functions. + - BStopWatch allows an application to measure the time an action takes. + - \ref support_globals "Global functions" + - \ref TypeConstants.h "Common types and constants" + - Error codes for all kits + + + \defgroup libbe (libbe.so) + + + \defgroup libroot (libroot.so) */ ///// Subgroups ///// /*! - \defgroup support_globals Global functions in the support kit - \ingroup support + \defgroup support_globals Global functions in the support kit + \ingroup support - \defgroup layout Layout classes in the Interface Kit - \ingroup interface + \defgroup layout Layout classes in the Interface Kit + \ingroup interface */ diff --git a/docs/user/drivers/USB3.dox b/docs/user/drivers/USB3.dox index 4f1f0e3d4e..b617a7de48 100644 --- a/docs/user/drivers/USB3.dox +++ b/docs/user/drivers/USB3.dox @@ -9,218 +9,218 @@ */ /*! - \file USB3.h - \ingroup drivers - \brief Interface for the USB module. + \file USB3.h + \ingroup drivers + \brief Interface for the USB module. */ /*! - \typedef struct usb_module_info usb_module_info - \brief The main interface object. See the usb_module_info documentation. + \typedef struct usb_module_info usb_module_info + \brief The main interface object. See the usb_module_info documentation. */ /*! - \typedef uint32 usb_id - \brief Uniquely identify various USB objects that are used in the module. + \typedef uint32 usb_id + \brief Uniquely identify various USB objects that are used in the module. */ /*! - \typedef usb_id usb_device - \brief Uniquely identify USB devices. + \typedef usb_id usb_device + \brief Uniquely identify USB devices. */ /*! - \typedef usb_id usb_interface - \brief Uniquely identify USB interfaces. + \typedef usb_id usb_interface + \brief Uniquely identify USB interfaces. */ /*! - \typedef usb_id usb_pipe - \brief Uniquely identify USB pipes. + \typedef usb_id usb_pipe + \brief Uniquely identify USB pipes. */ /*! - \typedef struct usb_endpoint_info usb_endpoint_info - \brief Container for USB endpoint descriptors. - \see Documentation for usb_endpoint_info. + \typedef struct usb_endpoint_info usb_endpoint_info + \brief Container for USB endpoint descriptors. + \see Documentation for usb_endpoint_info. */ /*! - \typedef struct usb_interface_info usb_interface_info - \brief Container for USB interface descriptors. - \see Documentation for usb_interface_info. + \typedef struct usb_interface_info usb_interface_info + \brief Container for USB interface descriptors. + \see Documentation for usb_interface_info. */ /*! - \typedef struct usb_interface_list usb_interface_list - \brief Container that holds a list of USB interface descriptors. - \see Documentation for usb_interface_list. + \typedef struct usb_interface_list usb_interface_list + \brief Container that holds a list of USB interface descriptors. + \see Documentation for usb_interface_list. */ /*! - \typedef struct usb_configuration_info usb_configuration_info - \brief Container for USB configuration descriptors. - \see Documentation for usb_configuration_info. + \typedef struct usb_configuration_info usb_configuration_info + \brief Container for USB configuration descriptors. + \see Documentation for usb_configuration_info. */ ///// usb_notify_hooks ///// /*! - \struct usb_notify_hooks - \brief Hooks that the USB stack can callback in case of events. + \struct usb_notify_hooks + \brief Hooks that the USB stack can callback in case of events. */ /*! - \fn status_t (*usb_notify_hooks::device_added)(usb_device device, void **cookie) - \brief Called by the stack in case a device is added. - - Once you have registered hooks using the - usb_module_info::install_notify() method, this hook will be called as soon as - a device is inserted that matches your provided usb_support_descriptor. - - \param device A unique id that identifies this USB device. - \param[in] cookie You can store a pointer to an object in this variable. - When the device is removed, this cookie will be provided to you. - \return You should return \c B_OK in case of success. The USB stack will then - request the kernel to republish your device names so that the new device - will be shown in the \c /dev tree. If you return an error value, the - \a device id will become invalid and you will not be notified if this - device is removed. - \see device_removed() + \fn status_t (*usb_notify_hooks::device_added)(usb_device device, void **cookie) + \brief Called by the stack in case a device is added. + + Once you have registered hooks using the + usb_module_info::install_notify() method, this hook will be called as soon as + a device is inserted that matches your provided usb_support_descriptor. + + \param device A unique id that identifies this USB device. + \param[in] cookie You can store a pointer to an object in this variable. + When the device is removed, this cookie will be provided to you. + \return You should return \c B_OK in case of success. The USB stack will then + request the kernel to republish your device names so that the new device + will be shown in the \c /dev tree. If you return an error value, the + \a device id will become invalid and you will not be notified if this + device is removed. + \see device_removed() */ /*! - \var status_t (*usb_notify_hooks::device_removed)(void *cookie) - \brief Called by the stack in case a device you are using is removed. - - If you have accepted a device in the device_added() hook, this hook will - be called as soon as the device is removed. - - \param cookie The cookie you provided in the device_added() hook. Make sure - that you free the cookie if necessary. - \return Currently the return value of this hook is ignored. It is recommended - to return \c B_OK though. + \var status_t (*usb_notify_hooks::device_removed)(void *cookie) + \brief Called by the stack in case a device you are using is removed. + + If you have accepted a device in the device_added() hook, this hook will + be called as soon as the device is removed. + + \param cookie The cookie you provided in the device_added() hook. Make sure + that you free the cookie if necessary. + \return Currently the return value of this hook is ignored. It is recommended + to return \c B_OK though. */ - + ///// usb_support_descriptor ///// - + /*! - \struct usb_support_descriptor - \brief Description of device descriptor that the driver can handle. - - Support descriptors can be used to match any form of class, subclass or - protocol, or they can be used to match a vendor and/or product. - If any field has the value \c 0, it is treated as a wildcard. - - For example, if you want to watch for all the hubs, which have a device - class of \c 0x09, you would pass this descriptor: - - \code - usb_support_descriptor hub_devs = { 9, 0, 0, 0, 0 }; - \endcode - - See usb_module_info::register_driver() for more information on how to use - this object. + \struct usb_support_descriptor + \brief Description of device descriptor that the driver can handle. + + Support descriptors can be used to match any form of class, subclass or + protocol, or they can be used to match a vendor and/or product. + If any field has the value \c 0, it is treated as a wildcard. + + For example, if you want to watch for all the hubs, which have a device + class of \c 0x09, you would pass this descriptor: + + \code + usb_support_descriptor hub_devs = { 9, 0, 0, 0, 0 }; + \endcode + + See usb_module_info::register_driver() for more information on how to use + this object. */ - + /*! - \var usb_support_descriptor::dev_class - \brief The supported device classes. + \var usb_support_descriptor::dev_class + \brief The supported device classes. */ /*! - \var usb_support_descriptor::dev_subclass - \brief The supported device subclasses. + \var usb_support_descriptor::dev_subclass + \brief The supported device subclasses. */ /*! - \var usb_support_descriptor::dev_protocol - \brief The supported device protocols. + \var usb_support_descriptor::dev_protocol + \brief The supported device protocols. */ /*! - \var usb_support_descriptor::vendor - \brief The supported device vendor. + \var usb_support_descriptor::vendor + \brief The supported device vendor. */ /*! - \var usb_support_descriptor::product - \brief The supported device products. + \var usb_support_descriptor::product + \brief The supported device products. */ ///// usb_endpoint_info ///// /*! - \struct usb_endpoint_info - \brief Container for endpoint descriptors and their Haiku USB stack - identifiers. + \struct usb_endpoint_info + \brief Container for endpoint descriptors and their Haiku USB stack + identifiers. */ /*! - \var usb_endpoint_descriptor *usb_endpoint_info::descr - \brief Pointer to the descriptor of the endpoint. + \var usb_endpoint_descriptor *usb_endpoint_info::descr + \brief Pointer to the descriptor of the endpoint. */ /*! - \var usb_pipe usb_endpoint_info::handle - \brief Handle to use when using the stack to transfer data to and from this - endpoint. + \var usb_pipe usb_endpoint_info::handle + \brief Handle to use when using the stack to transfer data to and from this + endpoint. */ ///// usb_interface_info ///// /*! - \struct usb_interface_info - \brief Container for interface descriptors and their Haiku USB stack - identifiers. + \struct usb_interface_info + \brief Container for interface descriptors and their Haiku USB stack + identifiers. */ //! @{ /*! - \var usb_interface_descriptor *usb_interface_info::descr - \brief Pointer to the descriptor of the interface. + \var usb_interface_descriptor *usb_interface_info::descr + \brief Pointer to the descriptor of the interface. */ /*! - \var usb_interface usb_interface_info::handle - \brief Handle to use when using the stack to manipulate this interface. + \var usb_interface usb_interface_info::handle + \brief Handle to use when using the stack to manipulate this interface. */ //! @} /*! - \name Endpoints + \name Endpoints */ //! @{ /*! - \var size_t usb_interface_info::endpoint_count - \brief The number of endpoints in this interface. + \var size_t usb_interface_info::endpoint_count + \brief The number of endpoints in this interface. */ /*! - \var usb_endpoint_info *usb_interface_info::endpoint - \brief An array of endpoints that are associated to this interface. + \var usb_endpoint_info *usb_interface_info::endpoint + \brief An array of endpoints that are associated to this interface. */ //! @} /*! - \name Unparsed descriptors + \name Unparsed descriptors */ //! @{ /*! - \var size_t usb_interface_info::generic_count - \brief The number of unparsed descriptors in this interface. + \var size_t usb_interface_info::generic_count + \brief The number of unparsed descriptors in this interface. */ /*! - \var usb_descriptor **usb_interface_info::generic - \brief Unparsed descriptors in this interface. + \var usb_descriptor **usb_interface_info::generic + \brief Unparsed descriptors in this interface. */ //! @} @@ -228,444 +228,447 @@ ///// usb_interface_list ///// /*! - \struct usb_interface_list - \brief List of interfaces available to a configuration. + \struct usb_interface_list + \brief List of interfaces available to a configuration. */ /*! - \var size_t usb_interface_list::alt_count - \brief Number of available interfaces. + \var size_t usb_interface_list::alt_count + \brief Number of available interfaces. */ /*! - \var usb_interface_info *usb_interface_list::alt - \brief Array of available interfaces. + \var usb_interface_info *usb_interface_list::alt + \brief Array of available interfaces. */ /*! - \var usb_interface_info *usb_interface_list::active - \brief Pointer to active interface. + \var usb_interface_info *usb_interface_list::active + \brief Pointer to active interface. */ ///// usb_configuration_info ///// /*! - \struct usb_configuration_info - \brief Container for a specific configuration descriptor of a device. + \struct usb_configuration_info + \brief Container for a specific configuration descriptor of a device. */ /*! - \var usb_configuration_descriptor *usb_configuration_info::descr - \brief The configuration descriptor. + \var usb_configuration_descriptor *usb_configuration_info::descr + \brief The configuration descriptor. */ /*! - \var size_t usb_configuration_info::interface_count - \brief The number of interfaces in this configuration. + \var size_t usb_configuration_info::interface_count + \brief The number of interfaces in this configuration. */ /*! - \var usb_interface_list *usb_configuration_info::interface - \brief The list of interfaces available to this configuration. + \var usb_interface_list *usb_configuration_info::interface + \brief The list of interfaces available to this configuration. */ ///// usb_iso_packet_descriptor ///// /*! - \struct usb_iso_packet_descriptor - \brief The descriptor for data packets of isochronous transfers. + \struct usb_iso_packet_descriptor + \brief The descriptor for data packets of isochronous transfers. */ /*! - \var int16 usb_iso_packet_descriptor::req_len - \brief Length of the request. + \var int16 usb_iso_packet_descriptor::request_length + \brief Length of the request. */ /*! - \var int16 usb_iso_packet_descriptor::act_len - \brief The USB stack writes the actual transferred length in this variable. + \var int16 usb_iso_packet_descriptor::actual_length + \brief The USB stack writes the actual transferred length in this variable. */ /*! - \var status_t usb_iso_packet_descriptor::status - \brief The status of the transfer. + \var status_t usb_iso_packet_descriptor::status + \brief The status of the transfer. */ - + ///// usb_callback_func ///// /*! - \typedef typedef void (*usb_callback_func)(void *cookie, status_t status, void *data, size_t actualLength) - \brief Callback function for asynchronous transfers. - - \param cookie The cookie you supplied when you queued the transfer. - \param status The status of the transfer. This is one of the following: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
B_OKThe transfer succeeded.
B_CANCELEDThe transfer was cancelled by the user - via a usb_module_info::cancel_queued_transfers() call.
B_DEV_MULTIPLE_ERRORSMore than one of the errors - below occurred. Unfortunately, the stack cannot give you more - information.
B_DEV_STALLEDThe endpoint is stalled. You can use - usb_module_info::clear_feature() method with the associated pipe and - the USB_FEATURE_ENDPOINT_HALT arguments.
B_DEV_DATA_OVERRUNIncoming transfer: more data - flowing in than the size of the buffer.
B_DEV_DATA_UNDERRUNOutgoing transfer: more data - is flowing out than the endpoint accepts.
B_DEV_CRC_ERRORThe internal data consistency - checks of the USB protocol failed. It is best to retry. If you keep - on getting this error there might be something wrong with the - device.
B_DEV_UNEXPECTED_PIDThere was an internal error. - You should retry your transfer.
B_DEV_FIFO_OVERRUNinternal error. - You should retry your transfer.
B_DEV_FIFO_UNDERRUNThere was an internal error. - You should retry your transfer.
- \param data The provided buffer. - \param actualLength The amount of bytes read or written during the transfer. + \typedef typedef void (*usb_callback_func)(void *cookie, status_t status, void *data, size_t actualLength) + \brief Callback function for asynchronous transfers. + \param cookie The cookie you supplied when you queued the transfer. + \param status The status of the transfer. This is one of the following: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
B_OKThe transfer succeeded.
B_CANCELEDThe transfer was cancelled by the user + via a usb_module_info::cancel_queued_transfers() call.
B_DEV_MULTIPLE_ERRORSMore than one of the errors + below occurred. Unfortunately, the stack cannot give you more + information.
B_DEV_STALLEDThe endpoint is stalled. You can + use usb_module_info::clear_feature() method with the associated pipe + and the USB_FEATURE_ENDPOINT_HALT arguments.
B_DEV_DATA_OVERRUNIncoming transfer: more data + flowing in than the size of the buffer.
B_DEV_DATA_UNDERRUNOutgoing transfer: more data + is flowing out than the endpoint accepts.
B_DEV_CRC_ERRORThe internal data consistency + checks of the USB protocol failed. It is best to retry. If you keep + on getting this error there might be something wrong with the + device.
B_DEV_UNEXPECTED_PIDThere was an internal error. + You should retry your transfer.
B_DEV_FIFO_OVERRUNinternal error. + You should retry your transfer.
B_DEV_FIFO_UNDERRUNThere was an internal error. + You should retry your transfer.
+ \param data The provided buffer. + \param actualLength The amount of bytes read or written during the transfer. */ ///// usb_module_info ///// /*! - \struct usb_module_info - \brief Interface for drivers to interact with Haiku's USB stack. + \struct usb_module_info + \brief Interface for drivers to interact with Haiku's USB stack. */ /*! - \var usb_module_info::binfo - \brief Instance of the bus_manager_info object. + \var usb_module_info::binfo + \brief Instance of the bus_manager_info object. */ /*! - \fn status_t (*usb_module_info::register_driver)(const char *driverName, const usb_support_descriptor *supportDescriptors, size_t supportDescriptorCount, const char *optionalRepublishDriverName) - \brief Register your driver. - - To let the USB stack know that a driver is available to support devices, a - driver needs to register itself first. To let the stack know about devices - it needs to notify the driver of, have a look at usb_support_descriptor. - - It is possible to supply a list of support constructors. You should allocate - an array of support constructors and give the amount of constructors in the - array using the \a supportDescriptorCount parameter. - - In case your driver supports all devices or, more likely, you want to - monitor all devices plugged in and removed, it is safe to pass \c NULL to the - \a supportDescriptors paramater and zero (0) to \a supportDescriptorCount. - - \param driverName A unique name that identifies your driver. Avoid names like - \c webcam or \c mouse, instead use vendor names and device types to avoid - nameclashes. The install_notify() and uninstall_notify() functions use the - driver name as an identifier. - \param supportDescriptors An array of the type usb_support_descriptor. Pass - the amount of objects in the next parameter. - \param supportDescriptorCount The number of objects in the array supplied in - the previous parameter. - \param optionalRepublishDriverName Unused parameter. You should pass \c NULL. - \retval B_OK The driver is registered. You can now call install_notify() - \retval B_BAD_VALUE You passed \c NULL as \a driverName. - \retval B_ERROR General internal error in the USB stack. You may retry the - request in this case. - \retval B_NO_MEMORY Error allocating some internal objects. The system is - out of memory. + \fn status_t (*usb_module_info::register_driver)(const char *driverName, const usb_support_descriptor *supportDescriptors, size_t supportDescriptorCount, const char *optionalRepublishDriverName) + \brief Register your driver. + + To let the USB stack know that a driver is available to support devices, a + driver needs to register itself first. To let the stack know about devices + it needs to notify the driver of, have a look at usb_support_descriptor. + + It is possible to supply a list of support constructors. You should allocate + an array of support constructors and give the amount of constructors in the + array using the \a supportDescriptorCount parameter. + + In case your driver supports all devices or, more likely, you want to + monitor all devices plugged in and removed, it is safe to pass \c NULL to + the \a supportDescriptors paramater and zero (0) to + \a supportDescriptorCount. + + \param driverName A unique name that identifies your driver. Avoid names + like \c webcam or \c mouse, instead use vendor names and device types to + avoid nameclashes. The install_notify() and uninstall_notify() functions use + the driver name as an identifier. + + \param supportDescriptors An array of the type usb_support_descriptor. Pass + the amount of objects in the next parameter. + \param supportDescriptorCount The number of objects in the array supplied in + the previous parameter. + \param optionalRepublishDriverName Unused parameter. You should pass + \c NULL. + + \retval B_OK The driver is registered. You can now call install_notify() + \retval B_BAD_VALUE You passed \c NULL as \a driverName. + \retval B_ERROR General internal error in the USB stack. You may retry the + request in this case. + \retval B_NO_MEMORY Error allocating some internal objects. The system is + out of memory. */ /*! - \fn status_t (*usb_module_info::install_notify)(const char *driverName, const usb_notify_hooks *hooks) - \brief Install notify hooks for your driver. - - After your driver is registered, you need to pass hooks to your driver that - are called whenever a device that matches your \link usb_support_descriptor - support descriptor \endlink . - - As soon as the hooks are installed, you'll receive callbacks for devices that - are already attached; so make sure your driver is initialized properly when - calling this method. - - \param driverName The name you passed in register_driver(). - \param hooks The hooks the stack should call in case the status of devices - that match your support descriptor changes. - \retval B_OK Hooks are installed succesfully. - \retval B_NAME_NOT_FOUND Invalid \a driverName. - - \see usb_notify_hooks for information on how your hooks should behave. - \see uninstall_notify() + \fn status_t (*usb_module_info::install_notify)(const char *driverName, const usb_notify_hooks *hooks) + \brief Install notify hooks for your driver. + + After your driver is registered, you need to pass hooks to your driver that + are called whenever a device that matches your \link usb_support_descriptor + support descriptor \endlink . + + As soon as the hooks are installed, you'll receive callbacks for devices + that are already attached; so make sure your driver is initialized properly + when calling this method. + + \param driverName The name you passed in register_driver(). + \param hooks The hooks the stack should call in case the status of devices + that match your support descriptor changes. + + \retval B_OK Hooks are installed succesfully. + \retval B_NAME_NOT_FOUND Invalid \a driverName. + + \see usb_notify_hooks for information on how your hooks should behave. + \see uninstall_notify() */ /*! - \fn status_t (*usb_module_info::uninstall_notify)(const char *driverName) - \brief Uninstall notify hooks for your driver. - - If your driver needs to stop, you can uninstall the notifier hooks. This will - clear the stored hooks in the driver, and you will not receive any - notifications when new devices are attached. This method will also call - usb_notify_hooks::device_removed() for all the devices that you are using and - all the stack's resources that are allocated to your driver are cleared. - - \param driverName The name you passed in register_driver(). - \retval B_OK Hooks are uninstalled. - \retval B_NAME_NOT_FOUND Invalid \a driverName. + \fn status_t (*usb_module_info::uninstall_notify)(const char *driverName) + \brief Uninstall notify hooks for your driver. + + If your driver needs to stop, you can uninstall the notifier hooks. This + will clear the stored hooks in the driver, and you will not receive any + notifications when new devices are attached. This method will also call + usb_notify_hooks::device_removed() for all the devices that you are using + and all the stack's resources that are allocated to your driver are + cleared. + + \param driverName The name you passed in register_driver(). + \retval B_OK Hooks are uninstalled. + \retval B_NAME_NOT_FOUND Invalid \a driverName. */ /*! - \fn const usb_device_descriptor *(*usb_module_info::get_device_descriptor)(usb_device device) - \brief Get the device descriptor. - - \param device The id of the device you want to query. - \return The standard usb_device_descriptor, or \c NULL in case of an error. + \fn const usb_device_descriptor *(*usb_module_info::get_device_descriptor)(usb_device device) + \brief Get the device descriptor. + + \param device The id of the device you want to query. + \return The standard usb_device_descriptor, or \c NULL in case of an error. */ /*! - \fn const usb_configuration_info *(*usb_module_info::get_nth_configuration)(usb_device device, uint index) - \brief Get a configuration descriptor by index. - - \param device The id of the device you want to query. - \param index The (zero based) offset of the list of configurations. - \return This will normally return the usb_configuration_info with the - standard usb configuration descriptor. \c NULL will be returned if the - \a id is invalid or the \a index is out of bounds. + \fn const usb_configuration_info *(*usb_module_info::get_nth_configuration)(usb_device device, uint index) + \brief Get a configuration descriptor by index. + + \param device The id of the device you want to query. + \param index The (zero based) offset of the list of configurations. + \return This will normally return the usb_configuration_info with the + standard usb configuration descriptor. \c NULL will be returned if the + \a id is invalid or the \a index is out of bounds. */ /*! - \fn const usb_configuration_info *(*usb_module_info::get_configuration)(usb_device device) - \brief Get the current configuration. - - \param id The id of the device you want to query. - \retval This will return usb_configuration_info with the standard usb - configuration descriptor, or it will return\c NULL if the \a id is invalid. + \fn const usb_configuration_info *(*usb_module_info::get_configuration)(usb_device device) + \brief Get the current configuration. + + \param id The id of the device you want to query. + \retval This will return usb_configuration_info with the standard usb + configuration descriptor, or it will return\c NULL if the \a id is invalid. */ /*! - \fn status_t (*usb_module_info::set_configuration)(usb_device device, const usb_configuration_info *configuration) - \brief Change the current configuration. - - Changing the configuration will destroy all the current endpoints. If the - \a configuration points to the current configuration, the request will be - ignored and \c B_OK will be returned. - - \param device The id of the device you want to query. - \param configuration The pointer to the new configuration you want to set. - \retval B_OK The new configuration is set succesfully. - \retval B_DEV_INVALID_PIPE The \a device parameter is invalid. - \retval B_BAD_VALUE The configuration does not exist. - - \note This method also allows you to completely unconfigure the device, which - means that all the current endpoints, pipes and transfers will be freed. - Pass \c NULL to the parameter \a configuration if you want to do that. + \fn status_t (*usb_module_info::set_configuration)(usb_device device, const usb_configuration_info *configuration) + \brief Change the current configuration. + + Changing the configuration will destroy all the current endpoints. If the + \a configuration points to the current configuration, the request will be + ignored and \c B_OK will be returned. + + \param device The id of the device you want to query. + \param configuration The pointer to the new configuration you want to set. + \retval B_OK The new configuration is set succesfully. + \retval B_DEV_INVALID_PIPE The \a device parameter is invalid. + \retval B_BAD_VALUE The configuration does not exist. + + \note This method also allows you to completely unconfigure the device, which + means that all the current endpoints, pipes and transfers will be freed. + Pass \c NULL to the parameter \a configuration if you want to do that. */ /*! - \fn status_t (*usb_module_info::set_alt_interface)(usb_device device, const usb_interface_info *interface) - \brief Set an alternative interface. Not implemented. - - This method currently always returns \c B_ERROR. + \fn status_t (*usb_module_info::set_alt_interface)(usb_device device, const usb_interface_info *interface) + \brief Set an alternative interface. Not implemented. + + This method currently always returns \c B_ERROR. */ /*! - \fn status_t (*usb_module_info::set_feature)(usb_id handle, uint16 selector) - \brief Convenience function for standard control pipe set feature requests. - - Both the set_feature() and clear_feature() requests work on all the Stack's - objects: devices, interfaces and pipes. - - \param handle The object you want to query. - \param selector The value you want to pass in the feature request. - \return \c B_OK in case the request succeeded and the device responded - positively, or an error code in case it failed. + \fn status_t (*usb_module_info::set_feature)(usb_id handle, uint16 selector) + \brief Convenience function for standard control pipe set feature requests. + Both the set_feature() and clear_feature() requests work on all the Stack's + objects: devices, interfaces and pipes. + + \param handle The object you want to query. + \param selector The value you want to pass in the feature request. + \return \c B_OK in case the request succeeded and the device responded + positively, or an error code in case it failed. */ /*! - \fn status_t (*usb_module_info::clear_feature)(usb_id handle, uint16 selector) - \brief Convenience function for standard control pipe clear feature requests. - - \see set_feature() to see how this method works. + \fn status_t (*usb_module_info::clear_feature)(usb_id handle, uint16 selector) + \brief Convenience function for standard control pipe clear feature requests. + + \see set_feature() to see how this method works. */ /*! - \fn status_t (*usb_module_info::get_status)(usb_id handle, uint16 *status) - \brief Convenience function for standard usb status requests. - - \param[in] handle The object you want to query. - \param[out] status A variable in which the device can store it's status. - \return \c B_OK is returned in case the request succeeded and the device - responded positively, or an error code is returned in case it failed. + \fn status_t (*usb_module_info::get_status)(usb_id handle, uint16 *status) + \brief Convenience function for standard usb status requests. + + \param[in] handle The object you want to query. + \param[out] status A variable in which the device can store it's status. + \return \c B_OK is returned in case the request succeeded and the device + responded positively, or an error code is returned in case it failed. */ - + /*! - \fn status_t (*usb_module_info::get_descriptor)(usb_device device, uint8 descriptorType, uint8 index, uint16 languageID, void *data, size_t dataLength, size_t *actualLength) - \brief Convenience function to get a descriptor from a device. - - \param[in] device The device you want to query. - \param[in] descriptorType The type of descriptor you are requesting. - \param[in] index In case there are multiple descriptors of this type, you - select which one you want. - \param[in] languageID The language you want the descriptor in (if applicable, - as with string_descriptors). - \param[out] data The buffer in which the descriptor can be written. - \param[in] dataLength The size of the buffer (in bytes). - \param[out] actualLength A pointer to a variable in which the actual number - of bytes written can be stored. - \retval B_OK The request succeeded, and the descriptor is written. - \retval B_DEV_INVALID_PIPE Invalid \a device parameter. - \retval "other errors" Request failed. + \fn status_t (*usb_module_info::get_descriptor)(usb_device device, uint8 descriptorType, uint8 index, uint16 languageID, void *data, size_t dataLength, size_t *actualLength) + \brief Convenience function to get a descriptor from a device. + + \param[in] device The device you want to query. + \param[in] descriptorType The type of descriptor you are requesting. + \param[in] index In case there are multiple descriptors of this type, you + select which one you want. + \param[in] languageID The language you want the descriptor in (if applicable, + as with string_descriptors). + \param[out] data The buffer in which the descriptor can be written. + \param[in] dataLength The size of the buffer (in bytes). + \param[out] actualLength A pointer to a variable in which the actual number + of bytes written can be stored. + \retval B_OK The request succeeded, and the descriptor is written. + \retval B_DEV_INVALID_PIPE Invalid \a device parameter. + \retval "other errors" Request failed. */ - + /*! - \fn status_t (*usb_module_info::send_request)(usb_device device, uint8 requestType, uint8 request, uint16 value, uint16 index, uint16 length, void *data, size_t *actualLength) - \brief Send a generic, synchronous request over the default control pipe. - - See queue_request() for an asynchronous version of this method. - - Most of the standard values of a request are defined in USB_spec.h. - - \param[in] device The device you want to query. - \param[in] requestType The request type. - \param[in] request The request you want to perform. - \param[in] value The value of the request. - \param[in] index The index for the request. - \param[in] length The size of the buffer pointed by \a data - \param[out] data The buffer where to put the result in. - \param[out] actualLength The actual numbers of bytes written. - - \retval B_OK The request succeeded. - \retval B_DEV_INVALID_PIPE Invalid \a device parameter. - \retval "other errors" Request failed. + \fn status_t (*usb_module_info::send_request)(usb_device device, uint8 requestType, uint8 request, uint16 value, uint16 index, uint16 length, void *data, size_t *actualLength) + \brief Send a generic, synchronous request over the default control pipe. + + See queue_request() for an asynchronous version of this method. + + Most of the standard values of a request are defined in USB_spec.h. + + \param[in] device The device you want to query. + \param[in] requestType The request type. + \param[in] request The request you want to perform. + \param[in] value The value of the request. + \param[in] index The index for the request. + \param[in] length The size of the buffer pointed by \a data + \param[out] data The buffer where to put the result in. + \param[out] actualLength The actual numbers of bytes written. + + \retval B_OK The request succeeded. + \retval B_DEV_INVALID_PIPE Invalid \a device parameter. + \retval "other errors" Request failed. */ /*! - \fn status_t (*usb_module_info::queue_interrupt)(usb_pipe pipe, void *data, size_t dataLength, usb_callback_func callback, void *callbackCookie) - \brief Asynchronously queue an interrupt transfer. - - \param pipe The id of the pipe you want to query. - \param data The data buffer you want to pass. - \param dataLength The size of the data buffer. - \param callback The callback function the stack should call after finishing. - \param callbackCookie A cookie that will be supplied to your callback - function when the transfer is finished. - - \return This will return a value indicating whether or not the queueing of - the transfer went well. The return value won't tell you if the transfer - actually succeeded. - \retval B_OK The interrupt transfer is queued. - \retval B_NO_MEMORY Error allocating objects. - \retval B_DEV_INVALID_PIPE The \a pipe is not a valid interrupt pipe. + \fn status_t (*usb_module_info::queue_interrupt)(usb_pipe pipe, void *data, size_t dataLength, usb_callback_func callback, void *callbackCookie) + \brief Asynchronously queue an interrupt transfer. + + \param pipe The id of the pipe you want to query. + \param data The data buffer you want to pass. + \param dataLength The size of the data buffer. + \param callback The callback function the stack should call after finishing. + \param callbackCookie A cookie that will be supplied to your callback + function when the transfer is finished. + + \return This will return a value indicating whether or not the queueing of + the transfer went well. The return value won't tell you if the transfer + actually succeeded. + \retval B_OK The interrupt transfer is queued. + \retval B_NO_MEMORY Error allocating objects. + \retval B_DEV_INVALID_PIPE The \a pipe is not a valid interrupt pipe. */ /*! - \fn status_t (*usb_module_info::queue_bulk)(usb_pipe pipe, void *data, size_t dataLength, usb_callback_func callback, void *callbackCookie) - \brief Asynchronously queue a bulk transfer. - - This method behaves like the queue_interrupt() method, except that it queues - a bulk transfer. + \fn status_t (*usb_module_info::queue_bulk)(usb_pipe pipe, void *data, size_t dataLength, usb_callback_func callback, void *callbackCookie) + \brief Asynchronously queue a bulk transfer. + + This method behaves like the queue_interrupt() method, except that it queues + a bulk transfer. */ /*! - \fn status_t (*usb_module_info::queue_bulk_v)(usb_pipe pipe, iovec *vector, size_t vectorCount, usb_callback_func callback, void *callbackCookie) - \brief Asynchronously queue a bulk vector. - - This method behaves like the queue_interrupt() method, except that it queues - bulk transfers and that it is based on an (array of) io vectors. - - \param vector One or more io vectors. IO vectors are standard POSIX entities. - \param vectorCount The number of elements in the \a vector array. + \fn status_t (*usb_module_info::queue_bulk_v)(usb_pipe pipe, iovec *vector, size_t vectorCount, usb_callback_func callback, void *callbackCookie) + \brief Asynchronously queue a bulk vector. + + This method behaves like the queue_interrupt() method, except that it queues + bulk transfers and that it is based on an (array of) io vectors. + + \param vector One or more io vectors. IO vectors are standard POSIX entities. + \param vectorCount The number of elements in the \a vector array. */ /*! - \fn status_t (*usb_module_info::queue_isochronous)(usb_pipe pipe, void *data, size_t dataLength, usb_iso_packet_descriptor *packetDesc, uint32 packetCount, uint32 *startingFrameNumber, uint32 flags, usb_callback_func callback, void *callbackCookie) - \brief Asynchronously queue a isochronous transfer. Not implemented. - - This is not implemented in the current Haiku USB Stack. + \fn status_t (*usb_module_info::queue_isochronous)(usb_pipe pipe, void *data, size_t dataLength, usb_iso_packet_descriptor *packetDesc, uint32 packetCount, uint32 *startingFrameNumber, uint32 flags, usb_callback_func callback, void *callbackCookie) + \brief Asynchronously queue a isochronous transfer. Not implemented. + + This is not implemented in the current Haiku USB Stack. */ /*! - \fn status_t (*usb_module_info::queue_request)(usb_device device, uint8 requestType, uint8 request, uint16 value, uint16 index, uint16 length, void *data, usb_callback_func callback, void *callbackCookie) - \brief Asynchronously queue a control pipe request. - - This method does roughly the same as send_request(), however, it works - asynchronously. This means that the method will return as soon as the - transfer is queued. - - \param callback The callback function for when the transfer is done. - \param callbackCookie The cookie that the stack should pass to your callback - function. - \return Whether or not the queueing of the transfer went well. The return - value won't tell you if the transfer actually succeeded. - \retval B_OK The control transfer is queued. - \retval B_NO_MEMORY Error allocating objects. - \retval B_DEV_INVALID_PIPE The \a device argument is invalid. + \fn status_t (*usb_module_info::queue_request)(usb_device device, uint8 requestType, uint8 request, uint16 value, uint16 index, uint16 length, void *data, usb_callback_func callback, void *callbackCookie) + \brief Asynchronously queue a control pipe request. + + This method does roughly the same as send_request(), however, it works + asynchronously. This means that the method will return as soon as the + transfer is queued. + + \param callback The callback function for when the transfer is done. + \param callbackCookie The cookie that the stack should pass to your callback + function. + \return Whether or not the queueing of the transfer went well. The return + value won't tell you if the transfer actually succeeded. + \retval B_OK The control transfer is queued. + \retval B_NO_MEMORY Error allocating objects. + \retval B_DEV_INVALID_PIPE The \a device argument is invalid. */ /*! - \fn status_t (*usb_module_info::set_pipe_policy)(usb_pipe pipe, uint8 maxNumQueuedPackets, uint16 maxBufferDurationMS, uint16 sampleSize) - \brief Set some pipe features. - - The USB standard specifies some properties that should be able to be set on - isochronous pipes. If your driver requires the properties to be changed, you - should use this method. - - \param pipe The id of the isochronous pipe you want to alter. - \param maxNumQueuedPackets The maximum number of queued packets allowed on - this pipe. - \param maxBufferDurationMS The maximum time in ms that the buffers are valid. - \param sampleSize The size of the samples through this pipe. - \retval B_OK Pipe policy changed. - \retval B_DEV_INVALID_PIPE The \a pipe argument is invalid or not an - isochronous pipe. + \fn status_t (*usb_module_info::set_pipe_policy)(usb_pipe pipe, uint8 maxNumQueuedPackets, uint16 maxBufferDurationMS, uint16 sampleSize) + \brief Set some pipe features. + + The USB standard specifies some properties that should be able to be set on + isochronous pipes. If your driver requires the properties to be changed, you + should use this method. + + \param pipe The id of the isochronous pipe you want to alter. + \param maxNumQueuedPackets The maximum number of queued packets allowed on + this pipe. + \param maxBufferDurationMS The maximum time in ms that the buffers are valid. + \param sampleSize The size of the samples through this pipe. + \retval B_OK Pipe policy changed. + \retval B_DEV_INVALID_PIPE The \a pipe argument is invalid or not an + isochronous pipe. */ /*! - \fn status_t (*usb_module_info::cancel_queued_transfers)(usb_pipe pipe) - \brief Cancel pending transfers on a pipe. - - All the pending transfers will be cancelled. The stack will perform the - callback on all of them that are cancelled. - - \attention There might be transfers that are being executed the moment you - call this method. These will be executed, and their callbacks will be - performed. Make sure you don't delete any buffers that could still be used - by these transfers. - - \param pipe The id of the pipe to clear. - - \retval B_OK All the pending transfers on this pipe are deleted. - \retval B_DEV_INVALID_PIPE The supplied usb_id is not a valid pipe. - \retval "other errors" There was an error clearing the pipe. + \fn status_t (*usb_module_info::cancel_queued_transfers)(usb_pipe pipe) + \brief Cancel pending transfers on a pipe. + All the pending transfers will be cancelled. The stack will perform the + callback on all of them that are cancelled. + + \attention There might be transfers that are being executed the moment you + call this method. These will be executed, and their callbacks will be + performed. Make sure you don't delete any buffers that could still be used + by these transfers. + + \param pipe The id of the pipe to clear. + + \retval B_OK All the pending transfers on this pipe are deleted. + \retval B_DEV_INVALID_PIPE The supplied usb_id is not a valid pipe. + \retval "other errors" There was an error clearing the pipe. */ /*! - \fn status_t (*usb_module_info::usb_ioctl)(uint32 opcode, void *buffer, size_t bufferSize) - \brief Low level commands to the USB stack. - - This method is used to give lowlevel commands to the Stack. There are - currently no uses documented. + \fn status_t (*usb_module_info::usb_ioctl)(uint32 opcode, void *buffer, size_t bufferSize) + \brief Low level commands to the USB stack. + + This method is used to give lowlevel commands to the Stack. There are + currently no uses documented. */ ///// B_USB_MODULE_NAME ///// /*! - \def B_USB_MODULE_NAME - \brief The identifier string for the USB Stack interface module. + \def B_USB_MODULE_NAME + \brief The identifier string for the USB Stack interface module. */ diff --git a/docs/user/drivers/fs_interface.dox b/docs/user/drivers/fs_interface.dox index 12f24fbbe3..9c50e3b230 100644 --- a/docs/user/drivers/fs_interface.dox +++ b/docs/user/drivers/fs_interface.dox @@ -24,49 +24,6 @@ // TODO: These have been superseded by the B_STAT_* flags in . // Move the documentation there! -/*! - \enum write_stat_mask - \brief This mask is used in file_system_module_info::write_stat() to - determine which values need to be written. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_MODE - \brief The mode parameter should be updated. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_UID - \brief The UID field should be updated. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_GID - \brief The GID field should be updated. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_SIZE - \brief The size field should be updated. If the actual size is less than the - new provided file size, the file should be set to the new size and the - extra space should be filled with zeros. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_ATIME - \brief The access time should be updated. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_MTIME - \brief The 'last modified' field should be updated. -*/ - -/*! - \var write_stat_mask::FS_WRITE_STAT_CRTIME - \brief The 'creation time' should be updated. -*/ - /*! \def B_STAT_SIZE_INSECURE \brief Flag for the fs_vnode_ops::write_stat hook indicating that the FS @@ -249,46 +206,6 @@ //! @{ -/*! - \fn bool (*file_system_module_info::supports_defragmenting)(partition_data - *partition, bool *whileMounted) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_repairing)(partition_data *partition, - bool checkOnly, bool *whileMounted) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_resizing)(partition_data *partition, - bool *whileMounted) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_moving)(partition_data *partition, bool *isNoOp) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_setting_content_name)(partition_data *partition, - bool *whileMounted) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_setting_content_parameters)(partition_data *partition, - bool *whileMounted) - \brief Undocumented. TODO. -*/ - -/*! - \fn bool (*file_system_module_info::supports_initializing)(partition_data *partition) - \brief Undocumented. TODO. -*/ - /*! \fn bool (*file_system_module_info::validate_resize)(partition_data *partition, off_t *size) \brief Undocumented. TODO. @@ -638,11 +555,11 @@ \param volume The volume object. \param query The string that represents a query. \param flags Any combination of none or more of these flags: - - \c #B_LIVE_QUERY The query is live. When a query is live, it is + - \c B_LIVE_QUERY The query is live. When a query is live, it is constantly updated using the \a port. The FS must invoke the functions notify_query_entry_created() and notify_query_entry_removed() whenever an entry starts respectively stops to match the query predicate. - - \c #B_QUERY_NON_INDEXED Normally at least one of the attributes used + - \c B_QUERY_NON_INDEXED Normally at least one of the attributes used in the query string should be indexed. If none is, this hook is allowed to fail, unless this flag is specified. Usually an implementation will simply add a wildcard match for any complete @@ -1714,7 +1631,7 @@ \param vnode The node object. \param cookie The cookie you associated with this attribute. \param stat A pointer to the new stats you should write. - \param statMask One or more of the values of #write_stat_mask that tell you + \param statMask One or more of the values of write_stat_mask that tell you which fields of \a stat are to be updated. \return \c B_OK if everything went fine, another error code otherwise. */ diff --git a/docs/user/drivers/usb_modules.dox b/docs/user/drivers/usb_modules.dox index 8ad4f32e76..714d104e55 100644 --- a/docs/user/drivers/usb_modules.dox +++ b/docs/user/drivers/usb_modules.dox @@ -316,7 +316,7 @@ init_driver(void) USB_REQTYPE_INTERFACE_IN | USB_REQTYPE_CLASS, USB_REQUEST_HID_GET_REPORT, 0x0100 | report_id, interfaceNumber, device->total_report_size, - device->buffer, device->total_report_size, &actual); + device->buffer, &actual); \endcode \warning Both the \link usb_module_info::send_request() \a send_request() diff --git a/docs/user/header.html b/docs/user/header.html index 2c0fe5b34d..277802f32e 100644 --- a/docs/user/header.html +++ b/docs/user/header.html @@ -6,7 +6,8 @@ -