diff -Nru ltsp-5.2.8/ChangeLog ltsp-5.2.6/ChangeLog --- ltsp-5.2.8/ChangeLog 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/ChangeLog 2011-03-03 21:09:10.000000000 +0000 @@ -1,113 +1,4 @@ ------------------------------------------------------------ -revno: 1820 -tags: ltsp-5.2.8 -committer: Stéphane Graber -branch nick: ltsp-trunk -timestamp: Wed 2011-04-13 14:28:54 -0400 -message: - version 5.2.8 ------------------------------------------------------------- -revno: 1819 -committer: Stéphane Graber -branch nick: ltsp-trunk -timestamp: Wed 2011-04-13 14:25:16 -0400 -message: - Apparently chmod -f doesn't always return 0, avoid the issue by ignoring return code completely ------------------------------------------------------------- -revno: 1818 -tags: ltsp-5.2.7 -committer: Stéphane Graber -branch nick: ltsp-trunk -timestamp: Tue 2011-04-12 16:08:16 -0400 -message: - version 5.2.7 ------------------------------------------------------------- -revno: 1817 -committer: Stéphane Graber -branch nick: ltsp-trunk -timestamp: Tue 2011-04-12 16:02:28 -0400 -message: - Make sure vmlinuz, initrd and nbi are ALWAYS readable by the tftp daemon ------------------------------------------------------------- -revno: 1816 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Mon 2011-04-11 10:45:47 -0700 -message: - ltsp-init-common: do not run ntpdate backgrounded, otherwise fast clients may - fail to sync, and this introduces at most a 1 second delay. only sync - hardware clock if ntpdate succeeds. ensure that it doesn't error out if either - ntpdate or hwclock fail. ------------------------------------------------------------- -revno: 1815 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Thu 2011-03-31 14:21:21 -0700 -message: - Updated Catalan translation with by Jordà Polo and Jordi Mallach. - http://bugs.debian.org/619437 ------------------------------------------------------------- -revno: 1814 -committer: Wim Muskee -branch nick: ltsp-trunk -timestamp: Tue 2011-03-29 21:55:21 +0200 -message: - Gentoo: Fixed bootstrap and setstage plugins. ------------------------------------------------------------- -revno: 1813 -committer: Gideon Romm -branch nick: ltsp-trunk -timestamp: Fri 2011-03-25 17:27:52 -0400 -message: - Make CRONTAB_ respect inheritence. Code brought to you by Alkis, not me. ------------------------------------------------------------- -revno: 1812 -committer: Gideon Romm -branch nick: ltsp-trunk -timestamp: Fri 2011-03-25 17:06:25 -0400 -message: - Add set -f so paths are not expanded - useful for CRONTAB params, for example ------------------------------------------------------------- -revno: 1811 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Fri 2011-03-25 12:01:58 -0700 -message: - Updated Finnish translation by Esko Arajärvi. - http://bugs.debian.org/618937 ------------------------------------------------------------- -revno: 1810 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Fri 2011-03-25 12:00:05 -0700 -message: - Updated Catalan translation by Jordà Polo. - http://bugs.debian.org/619437 ------------------------------------------------------------- -revno: 1809 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Fri 2011-03-18 15:32:32 -0700 -message: - Updated Slovak (sk) translation by Slavko. - http://bugs.debian.org/618410 ------------------------------------------------------------- -revno: 1808 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Mon 2011-03-14 16:14:45 -0700 -message: - run_parts_list function: simplify find call by always using a -name argument, - although if no second argument is passed to the function it will match all - files. another elegant solution by Alkis Georgopoulos! ------------------------------------------------------------- -revno: 1807 -committer: Vagrant Cascadian -branch nick: ltsp-trunk -timestamp: Mon 2011-03-14 11:32:54 -0700 -message: - updated translation files. ------------------------------------------------------------- revno: 1806 tags: ltsp-5.2.6 committer: Stéphane Graber diff -Nru ltsp-5.2.8/client/initscripts/ltsp-init-common ltsp-5.2.6/client/initscripts/ltsp-init-common --- ltsp-5.2.8/client/initscripts/ltsp-init-common 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/client/initscripts/ltsp-init-common 2011-03-03 21:09:09.000000000 +0000 @@ -276,7 +276,7 @@ # Set up timeserver if [ -n "$TIMESERVER" ]; then - ntpdate $TIMESERVER && hwclock --systohc --${HWCLOCK:-"utc"} --noadjfile || true + (ntpdate $TIMESERVER; hwclock --systohc --${HWCLOCK:-"utc"} --noadjfile) & fi } @@ -371,7 +371,11 @@ if [ -n "$SHUTDOWN_TIME" ] ; then echo $SHUTDOWN_TIME | awk -F : '{print $2" "$1" * * * root test ! -S \"$(ls -1 /var/run/ldm_socket_* | head -1)\" && PATH=\$PATH:/sbin/ poweroff -fp" }' >> $CRON_FILE fi - env | sed -n 's/^CRONTAB_[0-9][0-9]=//p' >> $CRON_FILE + for ltsconf in /etc/lts.conf /var/cache/getltscfg-cluster/lts.conf; do + if [ -f $ltsconf ]; then + cat $ltsconf | grep -E "^[[:blank:]]*CRONTAB_[0-9]{2}[[:blank:]]*=" | sed -e "s/[[:blank:]]*CRONTAB_[0-9]\{2\}[[:blank:]]*=[[:blank:]]*\"//g" -e "s/\"[[:blank:]]*$//g" >> $CRON_FILE + fi + done } run_rcfiles() { diff -Nru ltsp-5.2.8/client/ltsp_config ltsp-5.2.6/client/ltsp_config --- ltsp-5.2.8/client/ltsp_config 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/client/ltsp_config 2011-03-03 21:09:09.000000000 +0000 @@ -50,7 +50,6 @@ fi # Read in lts.conf entries. -set -f if [ -f /etc/lts.conf ]; then eval $(getltscfg -a) || true fi @@ -66,7 +65,6 @@ . $script done fi -set +f # set compatbility for ltsp 4.x variables export X_VIDEO_RAM=${X_VIDEO_RAM:-"$X_VIDEORAM"} diff -Nru ltsp-5.2.8/debian/changelog ltsp-5.2.6/debian/changelog --- ltsp-5.2.8/debian/changelog 2011-05-05 13:48:28.000000000 +0000 +++ ltsp-5.2.6/debian/changelog 2011-05-05 13:48:28.000000000 +0000 @@ -1,33 +1,14 @@ -ltsp (5.2.8-0ubuntu1) natty; urgency=low +ltsp (5.2.6-0ubuntu4~maverick1) natty; urgency=low - * New upstream bugfix release (5.2.8). - - Ignore return code of chmod in ltsp-update-kernels (LP: #759965) + * new test for nbd-proxy - -- Stéphane Graber Wed, 13 Apr 2011 14:32:40 -0400 + -- Marc Gariépy Thu, 05 May 2011 09:24:57 -0400 -ltsp (5.2.7-0ubuntu1) natty; urgency=low +ltsp (5.2.6-0ubuntu3~maverick) maverick; urgency=low - * New upstream bugfix release (5.2.7). - - Force vmlinuz, initrd and nbi to be readable by tftp daemon (LP: #759115) - - Fix race condition with ntpdate - - Update translations - - Fix inheritence issue in CRONTAB_ - - Simplify run_parts_list function - - Gentoo specific fixes + * Backport to maverick - -- Stéphane Graber Tue, 12 Apr 2011 16:09:22 -0400 - -ltsp (5.2.6-0ubuntu4) natty; urgency=low - - * Make Edubuntu theme default for LTSP Live on Edubuntu media - - -- Jonathan Carter Tue, 05 Apr 2011 15:19:26 -0400 - -ltsp (5.2.6-0ubuntu3) natty; urgency=low - - * Fix postinst script generating invalid ssh_known_hosts file on Edubuntu. - - -- Stéphane Graber Mon, 28 Mar 2011 12:22:43 -0400 + -- Marc Gariépy Wed, 09 Mar 2011 12:53:53 -0500 ltsp (5.2.6-0ubuntu2) natty; urgency=low diff -Nru ltsp-5.2.8/debian/ltsp-server.postinst ltsp-5.2.6/debian/ltsp-server.postinst --- ltsp-5.2.8/debian/ltsp-server.postinst 2011-05-05 13:48:28.000000000 +0000 +++ ltsp-5.2.6/debian/ltsp-server.postinst 2011-05-05 13:48:28.000000000 +0000 @@ -52,25 +52,25 @@ ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N "" -t dsa fi if [ ! -f /etc/ssh/ssh_host_ecdsa_key ]; then - ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa + ssh-keygen -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t dsa fi # Add entries to ssh_known_hosts for the idefault IP and current hostname if [ -f /etc/ssh/ssh_host_rsa_key ]; then rsa_key=$(cat /etc/ssh/ssh_host_rsa_key.pub | cut -d " " -f 2) - echo "$(cat /etc/hostname) ssh-rsa $rsa_key" > /opt/ltsp/i386/etc/ssh/ssh_known_hosts + echo "$(cat /etc/hostname) ssh-rsa $rsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts echo "192.168.0.254 ssh-rsa $rsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts fi if [ -f /etc/ssh/ssh_host_dsa_key ]; then dsa_key=$(cat /etc/ssh/ssh_host_dsa_key.pub | cut -d " " -f 2) - echo "$(cat /etc/hostname) ssh-dsa $dsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts + echo "$(cat /etc/hostname) ssh-dsa $dsa_key" > /opt/ltsp/i386/etc/ssh/ssh_known_hosts echo "192.168.0.254 ssh-dsa $dsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts fi if [ -f /etc/ssh/ssh_host_ecdsa_key ]; then ecdsa_key=$(cat /etc/ssh/ssh_host_ecdsa_key.pub | cut -d " " -f 2) - echo "$(cat /etc/hostname) ssh-ecdsa $ecdsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts + echo "$(cat /etc/hostname) ssh-ecdsa $ecdsa_key" > /opt/ltsp/i386/etc/ssh/ssh_known_hosts echo "192.168.0.254 ssh-ecdsa $ecdsa_key" >> /opt/ltsp/i386/etc/ssh/ssh_known_hosts fi diff -Nru ltsp-5.2.8/debian/scripts/ltsp-livecd ltsp-5.2.6/debian/scripts/ltsp-livecd --- ltsp-5.2.8/debian/scripts/ltsp-livecd 2011-05-05 13:48:28.000000000 +0000 +++ ltsp-5.2.6/debian/scripts/ltsp-livecd 2011-05-05 13:48:28.000000000 +0000 @@ -19,11 +19,6 @@ LDM_GUESTLOGIN=True EOF -# Apply Edubuntu theme, if we're running on Edubuntu media: -if [ -n "$(grep Edubuntu /cdrom/README.diskdefines)" ]; then - echo "LDM_THEME=edubuntu" >> /var/lib/tftpboot/ltsp/i386/lts.conf -fi - # Create LTSP Guest Users: echo " * Creating LTSP Guest Users..." for user in $(seq 1 255); do diff -Nru ltsp-5.2.8/ltsp-common-functions ltsp-5.2.6/ltsp-common-functions --- ltsp-5.2.8/ltsp-common-functions 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/ltsp-common-functions 2011-03-03 21:09:09.000000000 +0000 @@ -22,7 +22,12 @@ exit 1 fi - find -L "$1" -mindepth 1 -maxdepth 1 -type f -name "$2*" | sed -n '/.*\/[0-9a-zA-Z_\-]\{1,\}$/p' | sort -n + if [ -d "$1" ]; then + if [ -n "$2" ]; then + find_opts="-name $2\*" + fi + find -L "$1" -mindepth 1 -maxdepth 1 -type f $find_opts | sed -n '/.*\/[0-9a-zA-Z_\-]\{1,\}$/p' | sort -n + fi } if [ -f /usr/share/ltsp/ltsp-vendor-functions ]; then diff -Nru ltsp-5.2.8/nbd-proxy/configure.ac ltsp-5.2.6/nbd-proxy/configure.ac --- ltsp-5.2.8/nbd-proxy/configure.ac 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/nbd-proxy/configure.ac 2011-05-05 13:48:28.000000000 +0000 @@ -13,9 +13,6 @@ AM_PROG_CC_C_O AC_PROG_INSTALL -# Checks for libraries. -AC_CHECK_LIB([pthread], [pthread_create],[],AC_MSG_ERROR(nbd-proxy requires pthreads)) - AC_SUBST(DEPS_CFLAGS) # Checks for header files. @@ -23,5 +20,7 @@ AC_HEADER_STDC AC_CHECK_HEADERS([stdio.h stdlib.h linux/nbd.h sys/socket.h pthread.h arpa/inet.h netinet/tcp.h netinet/in.h string.h sys/types.h limits.h unistd.h]) +AC_CHECK_LIB(m, pow) + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile]) AC_OUTPUT diff -Nru ltsp-5.2.8/nbd-proxy/src/nbd-proxy.c ltsp-5.2.6/nbd-proxy/src/nbd-proxy.c --- ltsp-5.2.8/nbd-proxy/src/nbd-proxy.c 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/nbd-proxy/src/nbd-proxy.c 2011-05-05 13:48:28.000000000 +0000 @@ -1,20 +1,306 @@ -#include -#include +#define _GNU_SOURCE + +#include #include #include -#include +#include #include #include #include #include -#include #include #include #include +#include +#include #include #include +#include +#include +#include + +/* Always 64 bits on 32 bit platforms. */ +typedef unsigned long long u64; +typedef unsigned int u32; + +/* Return value from the main proxy functions. */ +enum proxy_state { + /* Either side is properly disconnecting. */ + P_DISCONNECT, + + /* Communication protocol error. Similar effect as P_MELTDOWN. */ + P_PROTOCOL_ERROR, + + /* Something is very wrong and the proxy must exit ASAP. Usually + means we are out of memory. */ + P_MELTDOWN, + + /* All is well. Communication can continue. */ + P_OK +}; + +enum server_state { + /* Initial state. Unused. */ + S_INIT, + + /* Asynchronous connection. */ + S_CONNECTING, + + /* NBD handshake. */ + S_HANDSHAKING, + + /* Ready to read protocol data. */ + S_READING, + + /* Disconnection was initiated by the client. */ + S_DISCONNECTING, + + /* Panic situation, exit immediately. */ + S_FUKUSHIMA +}; + +enum client_state { + /* Initial state. Unused. */ + C_INIT, + + /* Listening for client connection. */ + C_LISTENING, + + /* The client is sending requests. */ + C_READING, + + /* The client is disconnecting. */ + C_DISCONNECTING +}; + +/* Linked list of proxy requests. */ +struct proxy_nbd_request { + + /* Set to 1 when the header for this request does not need to be + resent to the client. */ + int reply_header_sent; + + + struct nbd_request *nr; + struct proxy_nbd_request *next; +}; + +struct buf { + char *data; + + /* Data tag. */ + int id; + + /* Size of the buffer pointed by data. */ + size_t sz; + + /* Quantity of data presently in the buffer. */ + size_t len; -#include "nbd-proxy.h" + /* Read index in the buffer. */ + size_t idx; + + /* Next buffer in the linked list. */ + struct buf *nextbuf; +}; + +struct buf_queue { + char name[12]; + + int fd; + + struct buf *first; + struct buf *last; +}; + +struct nbd_init_data { + char init_passwd[8]; + u64 magic; + u64 size; + u32 flags; + char zeros[124]; +}; + +/* Commande line options. */ +struct buf_queue server_out_queue; +struct buf_queue server_in_queue; +struct buf_queue client_out_queue; +struct buf_queue client_in_queue; + +/* Boolean for the debug mode. */ +int debug_mode; + +/* Number of times the server should try to reconnect before reaching + S_INIT. */ +int conn_strikes; + +/* True if the proxy should stay attached to the console. */ +int stay_attached; + +/* Minimum and maximum value for exponential backoff. */ +int backoff_min; +int backoff_max; + +#define NBD_PROXY_VERSION "2.0.2" + +#define PRINT_DEBUG_FUNC(FMT, ...) \ + do { \ + if (debug_mode) { \ + char buf[255]; \ + \ + snprintf(buf, sizeof(buf) - 1, FMT, ##__VA_ARGS__); \ + fprintf(stderr, "[%s] %s", __FUNCTION__, buf); \ + } \ + } while (0); \ + +#define PRINT_DEBUG(...) if (debug_mode) { fprintf(stderr, __VA_ARGS__); } + +const char init_passwd[] = "NBDMAGIC"; + +u64 cliserv_magic = 0x00420281861253LL; + +/* Server-side state. */ +enum server_state s_state; + +/* Client-side state. */ +enum client_state c_state; + +char *handle_to_string(char *handle) { + static char res[128]; + + sprintf(res, "%X, %X, %X, %X, %X, %X, %X, %X", + (unsigned char)handle[0], + (unsigned char)handle[1], + (unsigned char)handle[2], + (unsigned char)handle[3], + (unsigned char)handle[4], + (unsigned char)handle[5], + (unsigned char)handle[6], + (unsigned char)handle[7]); + return res; +} + +/* add_nbd_request + * Adding nbd_request to the chained list (proxy_nbd_request) + * r -- nbd_request to add into the chained list + * first -- first element of the list + */ +void add_nbd_request(struct nbd_request* nr, struct proxy_nbd_request **first) { + struct proxy_nbd_request *new_pnr = (struct proxy_nbd_request*) malloc(sizeof(struct proxy_nbd_request)); + struct proxy_nbd_request *current_pnr = *first; + + if(*first == NULL) + *first = new_pnr; + + else { + while(current_pnr->next != NULL) + current_pnr = current_pnr->next; + current_pnr->next = new_pnr; + } + new_pnr->reply_header_sent = 0; + new_pnr->nr = nr; + new_pnr->next = NULL; + + PRINT_DEBUG_FUNC("nbd_request handle(%s) added to linked list\n", handle_to_string(new_pnr->nr->handle)); +} + +/* get_nbd_request_by_handle + * Return nbd_request for a specific handle (nbd_request->handle) + * handle -- search param + * first -- first proxy_nbd_request of the chained list + */ +struct proxy_nbd_request *get_nbd_request_by_handle(char *handle, struct proxy_nbd_request **first) { + struct proxy_nbd_request *current_pnr = *first; + if(current_pnr != NULL) { + do { + if(!strncmp(handle, current_pnr->nr->handle, sizeof((*first)->nr->handle))) { + return current_pnr; + } + } while((current_pnr = current_pnr->next) != NULL); + } + return NULL; +} + +/* rm_nbd_request + * Remove nbd_request from proxy chained list + * nr -- nbd_request pointer to remove from the list and free + * first -- first proxy_nbd_request of the chained list + */ +void rm_nbd_request(struct nbd_request *nr, struct proxy_nbd_request **first) { + struct proxy_nbd_request *current_pnr = *first; + struct proxy_nbd_request *previous_pnr = *first; + + if(current_pnr != NULL) { + do { + if(current_pnr->nr == nr) { + PRINT_DEBUG_FUNC("Removing nbd_request: handle(%s)\n", handle_to_string(current_pnr->nr->handle)); + + if(current_pnr == *first) + *first = current_pnr->next; + else + previous_pnr->next = current_pnr->next; + + /* Free the request structure and the enclosing list struct. */ + free(nr); + free(current_pnr); + break; + } + previous_pnr = current_pnr; + } while((current_pnr = current_pnr->next) != NULL); + } + else { + PRINT_DEBUG_FUNC("proxy_nbd_request empty... \n"); + } +} + +void reset_nbd_requests(struct proxy_nbd_request **first) { + int i = 0; + struct proxy_nbd_request *current_pnr = *first; + struct proxy_nbd_request *next_pnr; + + while (current_pnr != NULL) { + next_pnr = current_pnr->next; + current_pnr->next = NULL; + free(current_pnr); + current_pnr = next_pnr; + i++; + } + + PRINT_DEBUG_FUNC("Removed %d orphaned proxy requests from the queue.\n", i); +} + +/* count_nbd_request + * Count number of nbd_request in queue + * first -- first proxy_nbd_request of the chained list + */ +int count_nbd_request(struct proxy_nbd_request **first) { + int count = 0; + struct proxy_nbd_request *current_pnr = *first; + if(current_pnr == NULL) + return count; + do { + count++; + } while((current_pnr = current_pnr->next) != NULL); + return count; +} + +/* ntohll + * Network to host format for long long (64bits) data + * host_longlong -- 64 bit to transform + */ +uint64_t ntohll(uint64_t host_longlong) { + int x = 1; + + /* little endian */ + if(*(char *)&x == 1) + return ((((uint64_t)ntohl(host_longlong)) << 32) + ntohl(host_longlong >> 32)); + + /* big endian */ + else + return host_longlong; +} + +#define htonll ntohll /* sighandler * Handles the different signal during the execution @@ -23,232 +309,230 @@ */ void sighandler(int sig) { switch(sig) { - case SIGINT: - printf("Ctrl+C pressed, exiting\n"); - exit(EXIT_FAILURE); - break; + case SIGINT: + printf("Ctrl+C pressed, exiting\n"); + exit(EXIT_FAILURE); + break; + + case SIGUSR1: + break; + case SIGUSR2: + break; + } +} + +struct buf *alloc_buf(size_t s, int id) { + struct buf *rb; + + rb = malloc(sizeof(struct buf)); + + if (rb == NULL) + return NULL; + + rb->data = malloc(s); + if (rb->data == NULL) { + free(rb); + return NULL; } + + rb->sz = s; + rb->len = 0; + rb->id = id; + rb->idx = 0; + rb->nextbuf = NULL; + + return rb; +} + +/* Free a sendbuf structure. */ +void free_buf(struct buf *sb) { + free(sb->data); + + sb->data = NULL; + sb->nextbuf = NULL; + + free(sb); +} + +/** Put the sendbuf on the send queue. */ +void queue_buf(struct buf_queue *queue, struct buf *sb) { + PRINT_DEBUG("[%s] Enqueing %zu bytes.\n", queue->name, sb->sz); + + /* Enqueue as the first item. */ + if (queue->first == NULL) { + queue->first = sb; + queue->last = sb; + } + /* Enqueue as the last item. */ + else { + queue->last->nextbuf = sb; + queue->last = sb; + } +} + +/* Flush a input queue. */ +void reset_buf_queue(struct buf_queue *queue) { + int i = 0; + struct buf *rb, *rbnext; + + /* Nothing to flush. */ + if (queue->first == NULL) + return; + + rb = queue->first; + + /* Loop around the queue to free each elements. */ + do { + rbnext = rb->nextbuf; + free(rb->data); + free(rb); + rb = rbnext; + i++; + } while (rb != NULL); + + PRINT_DEBUG("[%s] Freed %d queue elements.\n", queue->name, i); + + queue->first = NULL; + queue->last = NULL; +} + +/* + * Reset the buf indexes. + */ +void reset_buf(struct buf *rb) { + rb->len = rb->sz; + rb->idx = 0; } /* client_to_server * This thread acts as a proxy from client to server * data -- struct containing shared data between threads (thread_data) */ -void *client_to_server(void *data) { - struct thread_data *infos = (struct thread_data*) data; - /* nbd_request size : 28 bytes */ - char recv_buf[sizeof(struct nbd_request)]; - ssize_t bytes_read; - - PRINT_DEBUG("[t_client] Init mainloop\n"); - while(1) { - PRINT_DEBUG("[t_client] recv mode\n"); - bytes_read = recv(infos->client_socket, recv_buf, sizeof(recv_buf), MSG_WAITALL); - if(bytes_read <= 0) { - PRINT_DEBUG("[t_client] Client disconnected on recv(). Dying...\n"); - cleaning(infos); - exit(EXIT_FAILURE); +enum proxy_state client_proxy_server(struct buf *rb, struct proxy_nbd_request **reqs) { + struct nbd_request *new_req; + + // Copy the request. + new_req = (struct nbd_request*) malloc(sizeof(struct nbd_request)); + if (new_req == NULL) { + free_buf(rb); + return P_MELTDOWN; + } + + memcpy(new_req, rb->data, sizeof(struct nbd_request)); + + /* Checking if data is a valid nbd_request */ + if(ntohl(new_req->magic) == NBD_REQUEST_MAGIC) { + + /* NBD_CMD_READ from client */ + if(ntohl(new_req->type) == NBD_CMD_READ || ntohl(new_req->type) == NBD_CMD_WRITE) { + PRINT_DEBUG_FUNC("Got NBD request: type(%u) handle(%s) of len(%u) and from(%llu)\n", + ntohl(new_req->type), handle_to_string(new_req->handle), + ntohl(new_req->len), (unsigned long long int)ntohll(new_req->from)); + + // Add to the list of tracked requests. + add_nbd_request(new_req, reqs); } - - struct nbd_request *new_req = (struct nbd_request*) malloc(sizeof(struct nbd_request)); - memcpy(new_req, recv_buf, sizeof(struct nbd_request)); - - /* Checking if data is a valid nbd_request */ - if(new_req->magic == ntohl(NBD_REQUEST_MAGIC)) { - /* NBD_CMD_READ from client */ - if(new_req->type == ntohl(NBD_CMD_READ)) { - PRINT_DEBUG("[t_client] Got nbd_request : handle(%s) of len(%u) and from(%lu)\n", - handle_to_string(new_req->handle), ntohl(new_req->len), ntohll(new_req->from)); - - add_nbd_request(new_req, infos->reqs); - pthread_mutex_lock(&net_lock); - if(send_to_server(infos, recv_buf, bytes_read) == -1) - PRINT_DEBUG("[t_client] Failed sending nbd_request to server\n"); - /* Adding nbd_request received to queue (thread safe) */ - pthread_mutex_unlock(&net_lock); - /* NBD_CMD_DISC from client */ - } else if(new_req->type == ntohl(NBD_CMD_DISC)) { - PRINT_DEBUG("[t_client] NBD_DISCONNECT from client. Cleaning\n"); - /* On thin client infrastructure, this should not happen. Quitting properly */ - cleaning(infos); - exit(EXIT_SUCCESS); - } + + /* NBD_CMD_DISC from client */ + else if (ntohl(new_req->type) == NBD_CMD_DISC) { + free_buf(rb); + free(new_req); + return P_DISCONNECT; } } - PRINT_DEBUG("[t_client] WTF... client_to_server outside of while(1)\n"); + /* Invalid magic?!? */ + else { + PRINT_DEBUG_FUNC("Invalid magic number.\n"); + free_buf(rb); + free(new_req); + return P_PROTOCOL_ERROR; + } + + /* All data is forwarded to the server if the server is ready to + accept it. Requests received when the server isn't ready will + be handled immediately following the successful handshake. */ + if (s_state == S_READING) { + reset_buf(rb); + queue_buf(&server_out_queue, rb); + } + + return P_OK; } -/* server_to_client - * This thread acts as a proxy from server to client - * data -- struct containing shared data between threads (thread_data) +/* + * Manages communication between the NBD server and the NBD client. */ -void *server_to_client(void *data) { - struct thread_data *infos = (struct thread_data*) data; - struct nbd_reply nr; - struct nbd_request *current_nr = NULL; - struct nbd_request *nr_flag_disconnect = NULL; - char recv_buf[SRV_RECV_BUF * SEND_BUF_FACTOR]; - char send_buf[SRV_RECV_BUF * SEND_BUF_FACTOR]; - ssize_t bytes_read; - ssize_t r_bytes; - ssize_t total_size = 0; - int discard_reply_flag = 0; - int out_flag = 0; - int size_recv_buf = SRV_RECV_BUF; - int sockopt = MSG_WAITALL; - - /* Main loop */ - PRINT_DEBUG("[t_server] Init mainloop\n"); - while(1) { - PRINT_DEBUG("\n[t_server] recv mode (%d)\n", size_recv_buf); - /* Assurance not to bust recv_buf real size */ - if(size_recv_buf > sizeof(recv_buf)) - size_recv_buf = SRV_RECV_BUF * SEND_BUF_FACTOR; - /* Receiving data from nbd-server */ - bytes_read = recv(infos->server_socket, recv_buf, size_recv_buf, sockopt); - /* Keep track of bytes read for used to update nbd_request len */ - r_bytes = bytes_read; - if(bytes_read <= 0) { - PRINT_DEBUG("[t_server] Server disconnected on recv() (bytes_read = %d). Reconnecting\n", - (int) bytes_read); - reconnect_server(infos); - /* Sending last nbd_request modified */ - if(current_nr != NULL) { - PRINT_DEBUG("[t_server] nbd_request count : %d\n", count_nbd_request(infos->reqs)); - send_to_server(infos, (char *) current_nr, sizeof(struct nbd_request)); - PRINT_DEBUG("[t_server] Last known nbd_request sent\n"); - PRINT_DEBUG("|-- nbd_request : handle(%s) of len(%u) and from(%lu)\n", - handle_to_string(current_nr->handle), ntohl(current_nr->len), - ntohll(current_nr->from)); - - nr_flag_disconnect = current_nr; - discard_reply_flag = sizeof(struct nbd_reply); - size_recv_buf = ntohl(current_nr->len) + sizeof(struct nbd_reply); - sockopt = MSG_WAITALL; - } else { - PRINT_DEBUG("[t_server] Resending all nbd_request after recv error from server\n"); - resend_all_nbd_requests(infos); - size_recv_buf = SRV_RECV_BUF; - sockopt = 0; - total_size = 0; - } - out_flag = 0; - continue; +enum proxy_state server_proxy_client(struct buf *rb, struct proxy_nbd_request **reqs) { + static struct proxy_nbd_request *current_pnr = NULL; + + /* This is a header. */ + if (rb->id == 0) { + struct nbd_reply *reply_hdr; + + /* Check if the handle is valid. */ + reply_hdr = (struct nbd_reply *)rb->data; + if (reply_hdr->magic != htonl(NBD_REPLY_MAGIC)) { + PRINT_DEBUG_FUNC("Invalid header magic received.\n"); + free_buf(rb); + return P_PROTOCOL_ERROR; } - - /* Getting nbd_reply */ - memcpy(&nr, recv_buf, sizeof(struct nbd_reply)); - /* If the packet received contain a valid nbd_reply */ - if(nr.magic == ntohl(NBD_REPLY_MAGIC)) { - PRINT_DEBUG("[t_server] Got nbd_reply : handle(%s)\n", handle_to_string(nr.handle)); + else { + PRINT_DEBUG_FUNC("Valid header received.\n"); + /* Getting corresponding nbd_request in queue (Thread safe) */ - current_nr = get_nbd_request_by_handle(nr.handle, infos->reqs); - - if(current_nr == NULL) - PRINT_DEBUG("[t_server] nbd_reply handle unknown by proxy\n"); + current_pnr = get_nbd_request_by_handle(reply_hdr->handle, reqs); + + if (current_pnr == NULL) { + PRINT_DEBUG_FUNC("Reply received for unknown request.\n"); + free_buf(rb); + return P_PROTOCOL_ERROR; + } else { - /* Adapting recv buffer size to nbd_request len */ - size_recv_buf = (ntohl(current_nr->len) - (bytes_read - sizeof(struct nbd_reply))); - sockopt = MSG_WAITALL; - if(size_recv_buf == 0) { - size_recv_buf = SRV_RECV_BUF; - sockopt = 0; - out_flag = 1; - } - /* Ignoring nbd_reply size for len of nbd_request */ - r_bytes -= sizeof(struct nbd_reply); + PRINT_DEBUG_FUNC("Got nbd_reply : handle(%s)\n", handle_to_string(reply_hdr->handle)); } - } else if(current_nr == NULL) { - PRINT_DEBUG("[t_server] Fatal error: No nbd_reply received and no nbd_request to serve. Bad!\n"); - } else { - /* Ready to send information to client */ - out_flag = 1; - } - - /* Filling send_buf */ - PRINT_DEBUG("Copy %ld bytes to send_buf from %ld of send_buf\n", bytes_read, total_size); - memcpy(send_buf + total_size, recv_buf, bytes_read); - total_size += bytes_read; - - PRINT_DEBUG("[t_server] nbd_request queue count : %d\n", count_nbd_request(infos->reqs)); - /* Sending to client when all nbd_request's data received */ - if(out_flag) { - PRINT_DEBUG("[t_server] Sending %d bytes to client\n",(int)total_size - discard_reply_flag); - /* Sending data to client (P -> C). On client disconnect, nbd proxy STOP! */ - send_to_client(infos, send_buf + discard_reply_flag, total_size - discard_reply_flag); - total_size = 0; - discard_reply_flag = 0; - out_flag = 0; - } - - /* Updating current nbd_request.len of received bytes (r_bytes) */ - if(current_nr != NULL) { - current_nr->len = htonl(ntohl(current_nr->len) - r_bytes); - current_nr->from = htonll(ntohll(current_nr->from) + r_bytes); - - if((current_nr->len) == 0) { - /* Removing nbd_request from queue. Not useful anymore (Thread safe) */ - rm_nbd_request(current_nr, infos->reqs); - if(current_nr == nr_flag_disconnect) { - PRINT_DEBUG("[t_server] Last known nbd_request done! Resending queue (count : %d)\n", - count_nbd_request(infos->reqs)); - resend_all_nbd_requests(infos); - nr_flag_disconnect = NULL; - } - current_nr = NULL; - sockopt = 0; - size_recv_buf = SRV_RECV_BUF; + + reset_buf(rb); + + /* Don't resend the header if it was already sent. */ + if (!current_pnr->reply_header_sent) { + queue_buf(&client_out_queue, rb); + current_pnr->reply_header_sent = 1; } - } - } - PRINT_DEBUG("[t_server] WTF... server_to_client outside of while(1)\n"); -} + else { + PRINT_DEBUG("Not resending header for handle(%s)\n", handle_to_string(reply_hdr->handle)); + } + + /* Queue a recv. */ + struct buf *data_rb = alloc_buf(ntohl(current_pnr->nr->len), 1); -/* nbd_connect - * Connect to server with the specific negotiation protocol of nbd - * sock -- socket to nbd server - * - * Return nbd_init_data* containing all the information from server. This - * needs to be resend to the client - */ -struct nbd_init_data *nbd_connect(int sock) { - struct nbd_init_data *nid = (struct nbd_init_data *) malloc(sizeof(struct nbd_init_data)); + if (data_rb == NULL) + return P_MELTDOWN; - PRINT_DEBUG("[nbd_connect] Negotiation: "); - /* Read INIT_PASSWD */ - if (read(sock, &(nid->init_passwd) , sizeof(nid->init_passwd)) < 0) - PRINT_DEBUG("[nbd_connect] Failed/1: %m\n"); - if (strlen(nid->init_passwd)==0) - PRINT_DEBUG("[nbd_connect] Server closed connection\n"); - if (strcmp(nid->init_passwd, INIT_PASSWD)) - PRINT_DEBUG("[nbd_connect] INIT_PASSWD bad\n"); - PRINT_DEBUG("."); - - /* Read cliserv_magic */ - if (read(sock, &(nid->magic), sizeof(nid->magic)) < 0) - PRINT_DEBUG("[nbd_connect] Failed/2: %m\n"); - nid->magic = ntohll(nid->magic); - if (nid->magic != cliserv_magic) - PRINT_DEBUG("[nbd_connect] Not enough cliserv_magic\n"); - nid->magic = ntohll(nid->magic); - PRINT_DEBUG("."); + queue_buf(&server_in_queue, data_rb); + } + } + /* This is some data. */ + else { + /* Received some data without matching header? BAD!. */ + if (current_pnr == NULL) { + free_buf(rb); + return P_MELTDOWN; + } - /* Read size */ - if (read(sock, &(nid->size), sizeof(nid->size)) < 0) - PRINT_DEBUG("[nbd_connect] Failed/3: %m\n"); - PRINT_DEBUG("."); - - /* Read flags */ - if (read(sock, &(nid->flags), sizeof(nid->flags)) < 0) - PRINT_DEBUG("[nbd_connect] Failed/4: %m\n"); - PRINT_DEBUG("."); - - /* Read zeros */ - if (read(sock, &(nid->zeros), sizeof(nid->zeros)) < 0) - PRINT_DEBUG("[nbd_connect] Failed/5: %m\n"); - PRINT_DEBUG("\n"); + /* Updating current nbd_request.len of received bytes (r_bytes) */ + current_pnr->nr->len = htonl(ntohl(current_pnr->nr->len) - rb->sz); + current_pnr->nr->from = htonll(ntohll(current_pnr->nr->from) + rb->sz); + + /* Removing nbd_request from queue. Not useful anymore. */ + if(current_pnr->nr->len == 0) + rm_nbd_request(current_pnr->nr, reqs); + + /* Send the data to the client. */ + reset_buf(rb); + queue_buf(&client_out_queue, rb); + } - return nid; + return P_OK; } /* create_connect_sock @@ -258,34 +542,92 @@ * * Return socket file descriptor */ -int create_connect_sock(int port, char *addr) { +int create_connect_sock(int *newfd) { int sock; - int err = -1; int opt = 1; - struct sockaddr_in struct_addr; sock = socket(PF_INET, SOCK_STREAM, 0); + if(sock == -1) { - PRINT_DEBUG("Unable to create connect socket\n"); - exit(1); + PRINT_DEBUG_FUNC("Failed to create socket: %m\n"); + return -1; + } + + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)) < 0) { + PRINT_DEBUG_FUNC("setsockopt(TCP_NODELAY) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; } - if((setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) == -1) - perror("setsockopt"); + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + PRINT_DEBUG_FUNC("setsockopt(SO_REUSEADDR) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; + } + + if ((fcntl(sock, F_SETFL, O_NONBLOCK)) < 0) { + PRINT_DEBUG_FUNC("fcntl(O_NONBLOCK) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; + } + + *newfd = sock; + + return 0; +} + +/* + * Return the error code for a asynchronous connect. + */ +int socket_errno(int sock) { + int opt = 0; + socklen_t s = sizeof(opt); + + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, &opt, &s) < 0) { + PRINT_DEBUG_FUNC("Unable to return the socket error code."); + return -1; + } + + if (opt != 0) + PRINT_DEBUG_FUNC("Socket error code: %d.\n", opt); + + return opt; +} + +/* + * Start an asynchronous connect on the server socket, putting the + * server side in S_CONNECTING mode. + * + * Returns: -1 on error + * 0 if the connection is in progress + * 1 if the connection was completed + */ +int server_connect(int sock, char *addr, int port) { + int err = -1; + struct sockaddr_in struct_addr; struct_addr.sin_family = AF_INET; struct_addr.sin_port = htons(port); struct_addr.sin_addr.s_addr = inet_addr(addr); memset(struct_addr.sin_zero, 0, sizeof(struct_addr.sin_zero)); - PRINT_DEBUG("[create_connect_sock] Connect socket to %s\n", addr); err = connect(sock, (struct sockaddr *) &struct_addr, sizeof(struct_addr)); - if(err == -1) { - PRINT_DEBUG("Server unable to connect\n"); + if (err < 0 && errno == EINPROGRESS) { + PRINT_DEBUG_FUNC("Connecting to %s.\n", addr); + return 0; + } + else if (err < 0) { + PRINT_DEBUG_FUNC("Connection to %s failed: %m\n", addr); + return -1; } + /* The connection might succeed immediately. */ + else if (err == 0) + return 1; - PRINT_DEBUG("[create_connect_sock] Connected and ready.\n"); - return sock; + return 0; } /* create_listen_sock @@ -295,17 +637,15 @@ * * Return socket file descriptor */ -int create_listen_sock(int port, int addr) { - int sock, newfd; - socklen_t s_size; - int opt = 1; +int create_listen_sock(int port, int addr, int *newfd) { + int sock, opt = 1; struct sockaddr_in struct_addr; /* New socket */ - if((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { - perror("socket"); - PRINT_DEBUG("Unable to create listen socket\n"); - exit(EXIT_FAILURE); + if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { + PRINT_DEBUG_FUNC("Failed to create socket: %m\n"); + *newfd = -1; + return -1; } struct_addr.sin_family = AF_INET; @@ -313,273 +653,880 @@ struct_addr.sin_addr.s_addr = ntohl(addr); memset(struct_addr.sin_zero, 0, sizeof(struct_addr.sin_zero)); - if((setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) == -1) - perror("setsockopt"); + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &opt, sizeof(opt)) < 0) { + PRINT_DEBUG_FUNC("setsockopt(TCP_NODELAY) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; + } + + if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + PRINT_DEBUG_FUNC("setsockopt(SO_REUSEADDR) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; + } - PRINT_DEBUG("[create_listen_sock] Binding socket to localhost\n"); - if(bind(sock, (struct sockaddr *) &struct_addr, sizeof(struct_addr)) == -1) { - perror("bind"); - PRINT_DEBUG("Unable to bind socket\n"); - exit(EXIT_FAILURE); + if ((fcntl(sock, F_SETFL, O_NONBLOCK)) < 0) { + PRINT_DEBUG_FUNC("fcntl(O_NONBLOCK) failed: %m\n"); + close(sock); + *newfd = -1; + return -1; } - PRINT_DEBUG("[create_listen_sock] Listining to localhost\n"); - if(listen(sock,1) == -1) { - perror("listen"); - PRINT_DEBUG("Unable to listen\n"); - exit(EXIT_FAILURE); + PRINT_DEBUG_FUNC("Binding client socket.\n"); + + if (bind(sock, (struct sockaddr *) &struct_addr, sizeof(struct_addr)) == -1) { + PRINT_DEBUG_FUNC("bind() failed: %m\n"); + close(sock); + *newfd = -1; + return -1; } -#ifndef DEBUG - /* Send SIGHUP to detach the parent process */ - kill(getppid(), SIGHUP); -#endif - - PRINT_DEBUG("[create_listen_sock] Accepting socket\n"); - s_size = sizeof(struct_addr); - if((newfd = accept(sock, (struct sockaddr *) &struct_addr, &s_size)) == -1) { - perror("accept"); - PRINT_DEBUG("Accept() failed\n"); - exit(EXIT_FAILURE); - } - if((setsockopt(newfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) == -1) - perror("setsockopt"); - PRINT_DEBUG("[create_listen_sock] Socket bound and ready. Returning\n"); + PRINT_DEBUG_FUNC("Listening.\n"); + + if (listen(sock, 1) == -1) { + PRINT_DEBUG_FUNC("listen() failed: %m\n"); + close(sock); + *newfd = -1; + return -1; + } + + PRINT_DEBUG_FUNC("Socket bound and ready. Returning\n"); + + c_state = C_LISTENING; + *newfd = sock; - return newfd; + return 0; } -/* resend_all_nbd_requests - * Resend all nbd_requests in memory to nbd server - * infos -- struct thread_data - */ -void resend_all_nbd_requests(struct thread_data *infos) { - pthread_mutex_lock(&data_lock); - struct proxy_nbd_request *current_pnr = *(infos->reqs); +/* resend_all_nbd_requests */ +int resend_all_nbd_requests(struct proxy_nbd_request *pnr) { + struct proxy_nbd_request *current_pnr = pnr; + if(current_pnr == NULL) { - PRINT_DEBUG("[resend] No nbd_request in queue\n"); - pthread_mutex_unlock(&data_lock); - return; + PRINT_DEBUG_FUNC("No nbd_request in queue\n"); + return 0; } do { - send_to_server(infos, (char*) current_pnr->nr, sizeof(struct nbd_request)); - PRINT_DEBUG("[resend] nbd_request : handle(%s) of len(%u) and from(%lu)\n", - handle_to_string(current_pnr->nr->handle), ntohl(current_pnr->nr->len), - ntohll(current_pnr->nr->from)); - } while((current_pnr = current_pnr->next) != NULL); - pthread_mutex_unlock(&data_lock); -} - -/* reconnect_server - * Clean data structure and reconnect to server (Thread safe : net_lock) - * infos -- struct thread_data - */ -void reconnect_server(struct thread_data *infos) { - pthread_mutex_lock(&net_lock); - /* Close current server socket */ - close(infos->server_socket); - /* New server socket */ - infos->server_socket = create_connect_sock(infos->server_port, infos->server_addr); - server_connect(infos); - pthread_mutex_unlock(&net_lock); - PRINT_DEBUG("[reconnect_server] Reconnected to server\n"); -} - -/* server_connect - * Establish connection to nbd server - * infos -- struct thread_data - */ -void server_connect(struct thread_data *infos) { - /* Saving nid information to thread_data */ - infos->nid = nbd_connect(infos->server_socket); - PRINT_DEBUG("Server Connected\n"); -} - -/* client_connect - * Connect client to server (nbd point of view) - * td -- struct thread_data containing thread informations - */ -void client_connect(struct thread_data *td) { - struct nbd_init_data *nid = td->nid; - send(td->client_socket, &(nid->init_passwd), sizeof(nid->init_passwd), 0); - send(td->client_socket, &(nid->magic), sizeof(nid->magic), 0); - send(td->client_socket, &(nid->size), sizeof(nid->size) + sizeof(nid->flags) + sizeof(nid->zeros) - 4, 0); - PRINT_DEBUG("Client Connected\n"); -} - -/* send_to_client - * Send data to client with safe control - * infos -- thread_data - * buf -- data to send - * size -- size of data to send - * Return -1 if error detected - * Else 0 - */ -void send_to_client(struct thread_data *infos, char *buf, size_t size) { - /* Sending to client */ - if((send(infos->client_socket, buf, size, 0) == -1)) { - PRINT_DEBUG("Client disconnected on send(). Dying...\n"); - cleaning(infos); - exit(EXIT_FAILURE); + if (debug_mode) { + char *handle; + handle = handle_to_string(current_pnr->nr->handle); + PRINT_DEBUG_FUNC("nbd_request : handle(%s) of len(%u) and from(%llu)\n", + handle, + ntohl(current_pnr->nr->len), + (unsigned long long int) ntohll(current_pnr->nr->from)); + } + + /* Place a request to resend the partial request. */ + struct buf *sb = alloc_buf(sizeof(struct nbd_request), 0); + + if (sb == NULL) + return -1; + + memcpy(sb->data, current_pnr->nr, sizeof(struct nbd_request)); + sb->len = sizeof(struct nbd_request); + queue_buf(&server_out_queue, sb); + + } while ((current_pnr = current_pnr->next) != NULL); + + return 0; +} + +/* + * Accept the connection from the client then immediately queue the + * handshare informations to be sent. + */ +int client_accept_and_handshake(int listen_socket, int *client_socket, struct nbd_init_data *nid) { + int newfd, opt; + + if ((newfd = accept(listen_socket, NULL, 0)) < 0) { + PRINT_DEBUG_FUNC("Accept failed: %m\n"); + return -1; + } + + opt = 1; + if ((setsockopt(newfd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt))) < 0) { + PRINT_DEBUG_FUNC("setsockopt(SO_REUSEADDR) failed: %m\n"); + return -1; + } + + if ((fcntl(newfd, F_SETFL, O_NONBLOCK)) == -1) { + PRINT_DEBUG_FUNC("fcntl(O_NONBLOCK) failed: %m\n"); + return -1; + } + + /* Queue the handshake data. */ + size_t s = sizeof(nid->init_passwd) + + sizeof(nid->magic) + + sizeof(nid->size) + + sizeof(nid->flags) + + sizeof(nid->zeros); + struct buf *sb = alloc_buf(s, 0); + void *ptr; + + sb->len = s; + + ptr = sb->data; + memcpy(ptr, nid->init_passwd, sizeof(nid->init_passwd)); + ptr += sizeof(nid->init_passwd); + + u64 magic = htonll(nid->magic); + memcpy(ptr, &magic, sizeof(nid->magic)); + ptr += sizeof(nid->magic); + + u64 size = htonll(nid->size); + memcpy(ptr, &size, sizeof(nid->size)); + ptr += sizeof(nid->size); + + u32 flags = htonl(nid->flags); + memcpy(ptr, &flags, sizeof(nid->flags)); + ptr += sizeof(nid->flags); + + memset(ptr, 0, sizeof(nid->zeros)); + + queue_buf(&client_out_queue, sb); + + /* Return the client socket. */ + *client_socket = newfd; + + return 0; +} + +/* + * Place a request to read what is needed for the server handshake. + */ +int server_start_handshake(struct nbd_init_data *nid) { + int sz; + struct buf *rb_handshake; + + PRINT_DEBUG_FUNC("Starting server handshake.\n"); + + sz = sizeof(nid->init_passwd) + + sizeof(nid->magic) + + sizeof(nid->size) + + sizeof(nid->flags) + + sizeof(nid->zeros); + + rb_handshake = alloc_buf(sz, 0); + if (rb_handshake == NULL) + return -1; + + queue_buf(&server_in_queue, rb_handshake); + + return 0; +} + +int server_finish_handshake(struct buf *rb, struct nbd_init_data *nid) { + void *ptr = rb->data; + + /* Read the initialization data components. */ + memcpy(nid->init_passwd, ptr, sizeof(nid->init_passwd)); + ptr += sizeof(nid->init_passwd); + + memcpy(&nid->magic, ptr, sizeof(nid->magic)); + nid->magic = ntohll(nid->magic); + ptr += sizeof(nid->magic); + + memcpy(&nid->size, ptr, sizeof(nid->size)); + nid->size = ntohll(nid->size); + ptr += sizeof(nid->size); + + memcpy(&nid->flags, ptr, sizeof(nid->flags)); + nid->flags = ntohl(nid->flags); + ptr += sizeof(nid->flags); + + /* Check the handshake magic validity. */ + if (nid->magic != cliserv_magic) { + PRINT_DEBUG_FUNC("Protocol error: not enough magic.\n"); + return -1; + } + + /* Check the handshake password. */ + if (memcmp(nid->init_passwd, &init_passwd, 8) != 0) { + PRINT_DEBUG_FUNC("Protocol error: invalid password.\n"); + return -1; } + + /* All is well, ready to read some requests. */ + PRINT_DEBUG_FUNC("Done with server handshake.\n"); + PRINT_DEBUG_FUNC("Device size: %llu.\n", nid->size); + + return 0; } -/* send_to_server - * Send data to server with safe control - * infos -- thread_data - * buf -- data to send - * size -- size of data to send - * Return -1 if error detected - * Else 0 - */ -int send_to_server(struct thread_data *infos, char *buf, size_t size) { - int flag = 0; - /* Sending to server */ - if((send(infos->server_socket, buf, size, 0) == -1)) - flag = -1; - return flag; +/* + * Write data to a queue. + */ +int send_queue(struct buf_queue *queue) { + struct buf *sb = queue->first; + + /* TODO: It might improve speed a bit if we looped the send call + until it returns EWOULDBLOCK or use writev. */ + + /* Nothing to send. */ + if (sb == NULL) + return 0; + + char *ptr = sb->data + sb->idx; + size_t len = sb->len - sb->idx; + ssize_t s; + + s = send(queue->fd, ptr, len, 0); + + /* Disconnect. */ + if (s < 0) { + /* This seems to happen sometimes. */ + if (errno == EWOULDBLOCK) { + PRINT_DEBUG("[%s] Spurious readyness signal received. Nevermind.\n", queue->name); + return 0; + } + else if (errno == EINTR) { + PRINT_DEBUG("[%s] Write interrupted by signal.\n", queue->name); + return 0; + } + else { + PRINT_DEBUG("[%s] Error in send(): %m\n", queue->name); + return -1; + } + } + else if (s == 0) { + PRINT_DEBUG("[%s] Disconnected on send(): %m\n", queue->name); + return -1; + } + /* Correct. */ + else { + sb->idx += s; + PRINT_DEBUG("[%s] %zu of %zu bytes written.\n", queue->name, sb->idx, sb->len); + } + + if (sb->idx == sb->len) { + queue->first = sb->nextbuf; + + /* Clear the last element if needed. */ + if (queue->first == NULL) + queue->last = NULL; + + free_buf(sb); + } + + return 0; +} + +/* + * Read data from readqueue. + */ +int read_queue(struct buf_queue *queue, struct buf **complete_rb) { + struct buf *rb = queue->first; + ssize_t s; + + /* TODO: Same TODO as above for send_queue applies here, it's + just a bit harder to use readv here. */ + + /* Nothing to read. */ + if (rb == NULL) + return 0; + + s = recv(queue->fd, rb->data + rb->len, rb->sz - rb->len, 0); + + if (s < 0) { + /* This seems to happen sometimes. */ + if (errno == EWOULDBLOCK) { + PRINT_DEBUG("[%s] Spurious readyness signal received. Nevermind.\n", queue->name); + return 0; + } + /* Interruption by signal means we may be able to continue. */ + else if (errno == EINTR) { + PRINT_DEBUG("[%s] Read interrupted by signal.\n", queue->name); + return 0; + } + else { + PRINT_DEBUG("[%s] Error on recv(): %m.\n", queue->name); + return -1; + } + } + /* Disconnection. */ + if (s == 0) { + PRINT_DEBUG("[%s] Disconnected on recv().\n", queue->name); + return -1; + } + /* Proper, complete read. */ + else { + rb->len += s; + PRINT_DEBUG("[%s] %zu of %zu bytes read.\n", queue->name, rb->len, rb->sz); + } + + /* Check if the recv buffer is complete. */ + if (rb->len == rb->sz) { + *complete_rb = rb; + + /* Dequeue the buf */ + queue->first = rb->nextbuf; + + /* Clear the last element if the queue is empty. */ + if (queue->last == rb) + queue->last = NULL; + + /* The readbuf is no longer in a queue. */ + rb->nextbuf = NULL; + } + /* Partial read, nothing for you. */ + else + *complete_rb = NULL; + + return 0; +} + +/* Initialize the queues we use. */ +void init_queues() { + PRINT_DEBUG_FUNC("Initializing queues.\n"); + + strcpy(client_in_queue.name, "client_in"); + client_in_queue.first = NULL; + client_in_queue.last = NULL; + + strcpy(client_out_queue.name, "client_out"); + client_out_queue.first = NULL; + client_out_queue.last = NULL; + + strcpy(server_in_queue.name, "server_in"); + server_in_queue.first = NULL; + server_in_queue.last = NULL; + + strcpy(server_out_queue.name, "server_out"); + server_out_queue.first = NULL;; + server_out_queue.last = NULL; +} + +/* + * Check if the proxy is in idle state and place the required requests + * on the queues if not. + */ +int check_idle_state() { + if (c_state == C_READING && client_in_queue.first == NULL) { + struct buf *rb = alloc_buf(sizeof(struct nbd_request), 0); + + PRINT_DEBUG("[%s] Idle.\n", client_in_queue.name); + + if (rb == NULL) + return -1; + + queue_buf(&client_in_queue, rb); + } + + if (s_state == S_READING && server_in_queue.first == NULL) { + struct buf *rb = alloc_buf(sizeof(struct nbd_reply), 0); + + PRINT_DEBUG("[%s] Idle.\n", server_in_queue.name); + + if (rb == NULL) + return -1; + + queue_buf(&server_in_queue, rb); + } + + return 0; +} + +/* + * Verbose change of the server state. + */ +void server_set_state(enum server_state newstate) { + if (debug_mode) { + if (s_state == newstate) return; + + if (newstate == S_INIT) { + PRINT_DEBUG_FUNC("Moving to S_INIT state.\n"); + } + else if (newstate == S_CONNECTING) { + PRINT_DEBUG_FUNC("Moving to S_CONNECTING state.\n"); + } + else if (newstate == S_HANDSHAKING) { + PRINT_DEBUG_FUNC("Moving to S_HANDSHAKING state.\n"); + } + else if (newstate == S_READING) { + PRINT_DEBUG_FUNC("Moving to S_READING state.\n"); + } + else if (newstate == S_FUKUSHIMA) { + PRINT_DEBUG_FUNC("Server meltdown.\n"); + } + } + + s_state = newstate; +} + +/* + * Verbose change of the client state. + */ +void client_set_state(enum client_state newstate) { + if (debug_mode) { + if (c_state == newstate) return; + + if (newstate == C_LISTENING) { + PRINT_DEBUG_FUNC("Moving to C_LISTENING state.\n"); + } + else if (newstate == C_READING) { + PRINT_DEBUG_FUNC("Moving to C_READING state.\n"); + } + else if (newstate == C_DISCONNECTING) { + PRINT_DEBUG_FUNC("Moving to C_DISCONNECTING state.\n"); + } + } + + c_state = newstate; } /* main * entry point */ int main(int argc, char *argv[]) { - int server_port, listen_port, client_socket, server_socket; - int client_th, server_th, rc; - char server_address[INET_ADDRSTRLEN]; - void *status; - struct nbd_init_data *nid; - struct sched_param param_client; - struct sched_param param_server; - pthread_attr_t pattr_client; - pthread_attr_t pattr_server; - pthread_t threads[NUM_THREADS]; + int opt; + int server_port, listen_port; + int client_socket = -1, server_socket = -1, listen_socket = -1; + int nbconn = 0; + char server_address[INET_ADDRSTRLEN]; + char *smax, *smin; + struct nbd_init_data init_data; if(argc < 4) { - printf("Usage : nbd-proxy server_address server_port listening_port\n"); + } + + stay_attached = 0; + debug_mode = 0; + conn_strikes = 0; + backoff_min = 5; + backoff_max = 30; + + while ((opt = getopt(argc, argv, "adc:e:v")) != -1) { + switch (opt) { + case 'a': + stay_attached = 1; + break; + case 'd': + debug_mode = 1; + stay_attached = 1; + break; + case 'c': + conn_strikes = atoi(optarg); + break; + case 'v': + fprintf(stdout, NBD_PROXY_VERSION"\n"); + exit(EXIT_SUCCESS); + break; + case 'e': + smin = strtok(optarg, ":"); + smax = strtok(NULL, ":"); + if (smin == NULL || smax == NULL) { + fprintf(stderr, "Invalid exponential backoff option.\n"); + exit(EXIT_FAILURE); + } + else { + backoff_min = atoi(smin); + backoff_max = atoi(smax); + } + break; + default: + fprintf(stderr, "Unknown option: %c.\n", opt); + exit(EXIT_FAILURE); + } + } + + if (argc - optind < 3) { + printf("Usage : nbd-proxy -v -a [-c nb conn] [-e backoff-min:backoff-max] -d server_address server_port listening_port\n"); exit(1); } /* Server addr verification */ - if(inet_pton(AF_INET, argv[1], &server_address) == 0) { - struct hostent *host = gethostbyname(argv[1]); + if(inet_pton(AF_INET, argv[optind], &server_address) == 0) { + struct hostent *host = gethostbyname(argv[optind]); if(host == NULL) { - printf("Hostname or ipaddr not understand : %s\n", server_address); + printf("Invalid hostname or IP address: %s\n", server_address); exit(EXIT_FAILURE); } memcpy(server_address, inet_ntoa(*((struct in_addr **)host->h_addr_list)[0]), INET_ADDRSTRLEN); } else - memcpy(server_address, argv[1], INET_ADDRSTRLEN); + memcpy(server_address, argv[optind], INET_ADDRSTRLEN); /* Port verification */ - server_port = atoi(argv[2]); - listen_port = atoi(argv[3]); - if((server_port < 1 || server_port > 65535) || (listen_port < 1 || listen_port > 65535)) { + server_port = atoi(argv[optind + 1]); + listen_port = atoi(argv[optind + 2]); + if((server_port < 1 || server_port > 65535) || + (listen_port < 1 || listen_port > 65535)) { printf("Bad port range\n"); exit(EXIT_FAILURE); } - struct thread_data *th_d1 = (struct thread_data *) malloc(sizeof(struct thread_data)); struct proxy_nbd_request *pnr = NULL; signal(SIGINT, sighandler); + signal(SIGUSR1, SIG_IGN); + signal(SIGUSR2, SIG_IGN); -#ifndef DEBUG /* Our process ID and Session ID */ pid_t pid, sid; - /* Fork off the parent process */ - pid = fork(); - if (pid < 0) { - exit(EXIT_FAILURE); - } - /* If we got a good PID, then - we can exit the parent process. */ - if (pid > 0) { - /* Wait until the child process is ready to process the requests and exit */ - pause(); - exit(EXIT_SUCCESS); + if (!stay_attached) { + sigset_t set; + + sigemptyset(&set); + sigaddset(&set, SIGUSR2); + sigaddset(&set, SIGCHLD); + + /* Block SIGUSR2 and SIGCHLD from happening until we are + ready. */ + sigprocmask(SIG_BLOCK, &set, NULL); + + /* Fork off the parent process */ + pid = fork(); + if (pid < 0) { + fprintf(stderr, "Failed to fork nbd-proxy: %m\n"); + exit(EXIT_FAILURE); + } + + /* If we got a good PID, then we can exit the parent + process. */ + if (pid > 0) { + int signo; + + signo = sigwaitinfo(&set, NULL); + + if (signo == SIGUSR2) + exit(EXIT_SUCCESS); + else + exit(EXIT_FAILURE); + } + else { + /* Change the file mode mask */ + umask(0); + + /* Create a new SID for the child process */ + sid = setsid(); + if (sid < 0) { + fprintf(stderr, "setsid() failed: %m\n"); + exit(EXIT_FAILURE); + } + + /* Change the current working directory */ + if (chdir("/") < 0) { + fprintf(stderr, "chdir(/) failed: %m\n"); + exit(EXIT_FAILURE); + } + } } - /* Change the file mode mask */ - umask(0); - - /* Create a new SID for the child process */ - sid = setsid(); - if (sid < 0) { - /* Log the failure */ - exit(EXIT_FAILURE); + /* New client socket */ + if (create_listen_sock(listen_port, INADDR_LOOPBACK, &listen_socket) < 0) { + close(server_socket); + return -1; } - /* Change the current working directory */ - if ((chdir("/")) < 0) { - /* Log the failure */ - exit(EXIT_FAILURE); + /* Initialize the queues. */ + init_queues(server_socket); + + /* Tell the parent PID that we started successfully. */ + if (!stay_attached) + kill(getppid(), SIGUSR2); + + /* Start the read/write loop, not leaving until the client + disconnects. */ + while (c_state != C_DISCONNECTING && s_state != S_FUKUSHIMA) { + struct pollfd fds[2]; + const int server = 0, client = 1; + int nbpoll; + int backoff_sleep; + + /* Start the asynchronous connection to the server. */ + if (s_state == S_INIT) { + int c; + + /* Flush the server queues. If this is a reconnection, we + want to start with empty queues. */ + reset_buf_queue(&server_out_queue); + reset_buf_queue(&server_in_queue); + + /* Don't retry to connect if we are out of connection + attempts. */ + if (conn_strikes > 0 && nbconn == conn_strikes) { + PRINT_DEBUG_FUNC("No more reconnect left (%d of %d).\n", nbconn, conn_strikes); + server_set_state(S_FUKUSHIMA); + continue; + } + + /* Close then recreate the server socket if it's not new. */ + if (server_socket > 0) { + shutdown(server_socket, SHUT_RDWR); + close(server_socket); + } + + /* New server socket */ + if (create_connect_sock(&server_socket) < 0) { + server_set_state(S_INIT); + continue; + } + + /* Wait just a bit. */ + if (nbconn > 0) { + backoff_sleep = (-backoff_max / pow(nbconn, 0.4)) + (backoff_max + backoff_min); + fprintf(stderr, "nbd-proxy: sleeping %d seconds (retry no: %d).\n", backoff_sleep, nbconn); + sleep(backoff_sleep); + } + + c = server_connect(server_socket, server_address, server_port); + nbconn++; + + /* Connection error: retry. */ + if (c < 0) + server_set_state(S_INIT); + + /* Asynchronous connect not completed, wait until it is + to start the handshare. */ + else if (c == 0) { + if (conn_strikes != 0) + PRINT_DEBUG_FUNC("Connection attempt %d of %d.\n", nbconn, conn_strikes); + + server_set_state(S_CONNECTING); + } + + /* Connected immediately. Start the handshake immediately. */ + else { + if (server_start_handshake(&init_data) < 0) + server_set_state(S_FUKUSHIMA); + else + server_set_state(S_HANDSHAKING); + + /* Reset the connection count when connected. */ + nbconn = 0; + } + + /* Must repoll, of course. */ + continue; + } + + server_in_queue.fd = server_socket; + server_out_queue.fd = server_socket; + fds[server].fd = server_socket; + fds[server].events = 0; + fds[client].events = 0; + + /* Put the default read requests on the queues if needed. */ + if (check_idle_state() < 0) + return -1; + + /* Check if we need to trap new connections. */ + if (c_state == C_LISTENING) { + fds[client].fd = listen_socket; + fds[client].events |= (POLLIN | POLLOUT); + } + /* Once we have one client we no longer care about the listen + socket. */ + else { + fds[client].fd = client_socket; + + if (client_out_queue.first) + fds[client].events |= POLLOUT; + if (client_in_queue.first) + fds[client].events |= POLLIN; + } + + /* Check if we have to wait for the server connection to + complete. */ + if (s_state == S_CONNECTING) + fds[server].events |= (POLLIN | POLLOUT); + else { + if (server_out_queue.first) + fds[server].events |= POLLOUT; + if (server_in_queue.first) + fds[server].events |= POLLIN; + } + + nbpoll = poll(fds, 2, -1); + + /* Not possible without timeout in poll(). */ + if (nbpoll == 0) continue; + + /* Check for poll error. */ + if (nbpoll < 0) { + + /* Interruption by signal: nevermind */ + if (errno == EINTR) { + PRINT_DEBUG_FUNC("Loop interrupted by signal.\n"); + continue; + } + + /* Any other kind of error with poll makes us exit the + loop. */ + PRINT_DEBUG_FUNC("poll() error: %m\n"); + client_set_state(C_DISCONNECTING); + } + + /* The client wants to hangup or poll has problems waiting for + the client. This means that we should disconnect since its + the responsibility of the client to restart the proxy. */ + if (fds[client].revents & POLLHUP || fds[client].revents & POLLERR) { + if (debug_mode && fds[client].revents & POLLHUP) { + PRINT_DEBUG_FUNC("Client side hangup.\n"); + } else if (debug_mode && fds[client].revents & POLLERR) { + PRINT_DEBUG_FUNC("Client side poll error.\n"); + } + + client_set_state(C_DISCONNECTING); + } + + /* The server wants to hangup or poll has problems waiting for + the server. */ + if (fds[server].revents & POLLHUP || fds[server].revents & POLLERR) { + + if (s_state == S_CONNECTING) { + /* This will certainly fail but we will get more + information from the socket. */ + int e = socket_errno(fds[server].fd); + PRINT_DEBUG_FUNC("Connect failed: %s.\n", strerror(e)); + } + if (debug_mode && fds[server].revents & POLLHUP) { + PRINT_DEBUG_FUNC("Server side hangup.\n"); + } else if (debug_mode && fds[server].revents & POLLERR) { + PRINT_DEBUG_FUNC("Server side poll error.\n"); + } + + server_set_state(S_INIT); + continue; + } + + /* Complete connection on the server side. */ + if (s_state == S_CONNECTING && fds[server].revents & POLLOUT) { + /* Check if the socket has an error. */ + if (socket_errno(fds[server].fd) != 0) + server_set_state(S_INIT); + + else if (server_start_handshake(&init_data) < 0) + server_set_state(S_FUKUSHIMA); + + else { + server_set_state(S_HANDSHAKING); + + /* Reset the connection count when connected. */ + nbconn = 0; + } + + /* Must re-poll after handshake is started. */ + continue; + } + + /* Complete handshake on the server side. */ + if (s_state == S_HANDSHAKING && fds[server].revents & POLLIN) { + struct buf *rb = NULL; + + if (read_queue(&server_in_queue, &rb) < 0) { + server_set_state(S_INIT); + continue; + } + + /* Received some data. */ + else if (rb != NULL) { + if (server_finish_handshake(rb, &init_data) < 0) + server_set_state(S_INIT); + else { + server_set_state(S_READING); + + if (resend_all_nbd_requests(pnr) < 0) + server_set_state(S_FUKUSHIMA); + } + + /* Remove the reception buffer. */ + free_buf(rb); + } + + /* This makes sure we don't try to re-read again without a + poll. */ + continue; + } + + /* Accept connection on the client side. */ + if (s_state == S_READING && c_state == C_LISTENING && fds[client].revents & POLLIN) { + if (client_accept_and_handshake(listen_socket, &client_socket, &init_data) < 0) + client_set_state(C_DISCONNECTING); + else + client_set_state(C_READING); + + client_in_queue.fd = client_socket; + client_out_queue.fd = client_socket; + } + + /* Data ready from the server. */ + if (fds[server].revents & POLLIN) { + struct buf *rb = NULL; + + if (read_queue(&server_in_queue, &rb) < 0) { + server_set_state(S_INIT); + continue; + } + + /* Received some data. */ + else if (rb != NULL) { + enum proxy_state ps = server_proxy_client(rb, &pnr); + + if (ps == P_MELTDOWN) + server_set_state(S_FUKUSHIMA); + else if (ps == P_DISCONNECT || ps == P_PROTOCOL_ERROR) + server_set_state(S_INIT); + } + } + + /* Ready to write data to the server. */ + if (fds[server].revents & POLLOUT) { + if (send_queue(&server_out_queue) < 0) { + server_set_state(S_INIT); + continue; + } + } + + /* Data ready from the client. */ + if (fds[client].revents & POLLIN) { + struct buf *rb = NULL; + + if (read_queue(&client_in_queue, &rb) < 0) { + client_set_state(C_DISCONNECTING); + continue; + } + + /* Received some data. */ + else if (rb != NULL) { + enum proxy_state ps = client_proxy_server(rb, &pnr); + + if (ps == P_MELTDOWN || ps == P_PROTOCOL_ERROR || ps == P_DISCONNECT) + client_set_state(C_DISCONNECTING); + } + } + + if (fds[client].revents & POLLOUT) + if (send_queue(&client_out_queue) < 0) + client_set_state(C_DISCONNECTING); } - /* Close out the standard file descriptors */ - close(STDIN_FILENO); - close(STDOUT_FILENO); - close(STDERR_FILENO); -#endif - - PRINT_DEBUG("[main] Creating sockets\n"); - /* New server socket */ - server_socket = create_connect_sock(server_port, server_address); - - PRINT_DEBUG("[main] nbd_connect\n"); - /* Negotiate with nbd server */ - nid = nbd_connect(server_socket); + PRINT_DEBUG_FUNC("Proxy quitting.\n"); - /* New client socket */ - client_socket = create_listen_sock(listen_port, INADDR_LOOPBACK); + reset_nbd_requests(&pnr); + reset_buf_queue(&server_in_queue); + reset_buf_queue(&client_in_queue); + reset_buf_queue(&server_out_queue); + reset_buf_queue(&client_out_queue); + + /* Shutdown all the sockets. */ + if (listen_socket != -1) { + shutdown(listen_socket, SHUT_RDWR); + close(listen_socket); + } + + if (server_socket != -1) { + shutdown(server_socket, SHUT_RDWR); + close(server_socket); + } - th_d1->client_socket = client_socket; - th_d1->server_socket = server_socket; - th_d1->server_port = server_port; - th_d1->server_addr = server_address; - th_d1->listen_port = listen_port; - th_d1->nid = nid; - th_d1->reqs = &pnr; - - /* Connect client with server negotiation data */ - client_connect(th_d1); - - pthread_attr_init(&pattr_client); - pthread_attr_init(&pattr_server); - - /* Allowing sched options to be changed */ - pthread_attr_setinheritsched(&pattr_client, PTHREAD_EXPLICIT_SCHED); - pthread_attr_setinheritsched(&pattr_server, PTHREAD_EXPLICIT_SCHED); - - /* Scheduling to SCHED_FIFO */ - pthread_attr_setschedpolicy(&pattr_client, SCHED_FIFO); - pthread_attr_setschedpolicy(&pattr_server, SCHED_FIFO); - - /* Thread priority */ - param_client.sched_priority = 10; - param_server.sched_priority = 5; - - pthread_attr_setschedparam(&pattr_client, ¶m_client); - pthread_attr_setschedparam(&pattr_server, ¶m_server); - - /* Creating threads */ - client_th = pthread_create(&threads[0], &pattr_client, client_to_server, (void *) th_d1); - server_th = pthread_create(&threads[1], &pattr_server, server_to_client, (void *) th_d1); - - /* Joining threads */ - PRINT_DEBUG("[main] Spawning thread client\n"); - rc = pthread_join(threads[0], &status); - if (rc) { - PRINT_DEBUG("ERROR, return code from pthread_join is %d\n", rc); - } - PRINT_DEBUG("[main] Spawning thread server\n"); - rc = pthread_join(threads[1], &status); - if (rc) { - PRINT_DEBUG("ERROR, return code from pthread_join is %d\n", rc); + if (client_socket != -1) { + shutdown(client_socket, SHUT_RDWR); + close(client_socket); } - PRINT_DEBUG("[main] main is dying\n"); - pthread_exit(NULL); + return 0; } diff -Nru ltsp-5.2.8/po/ca.po ltsp-5.2.6/po/ca.po --- ltsp-5.2.8/po/ca.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/ca.po 2011-03-03 21:09:09.000000000 +0000 @@ -1,19 +1,18 @@ # # Catalan translation for ltsp package. -# Copyright © 2011 LTSP Debian/Ubuntu Maintainers. +# Copyright © 2009 LTSP Debian/Ubuntu Maintainers. # This file is distributed under the same license as the ltsp package. # -# Jordà Polo , 2006, 2007, 2008, 2009, 2011. +# Jordà Polo , 2006, 2007, 2008, 2009. # msgid "" msgstr "" -"Project-Id-Version: 5.2.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" -"PO-Revision-Date: 2011-03-30 17:48+0200\n" +"Project-Id-Version: 5.1.91\n" +"Report-Msgid-Bugs-To: pkg-ltsp-devel@lists.alioth.debian.org\n" +"POT-Creation-Date: 2009-10-18 18:04-0700\n" +"PO-Revision-Date: 2009-12-27 10:50+0100\n" "Last-Translator: Jordà Polo \n" "Language-Team: Catalan \n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -76,438 +75,396 @@ msgid "Cancel" msgstr "Cancel·la" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 -#, sh-format -msgid "set the list of packages to install after base-install is completed" -msgstr "" -"indica la llista de paquets a instal·lar després que base-install hagi acabat" - -#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 -#, sh-format -msgid "list of packages to install as part of the final installation" -msgstr "llista de paquets a instal·lar com a part de la instal·lació final." - -#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 -#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 -#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/common/010-set-base:3 #, sh-format -msgid "set the default locale" -msgstr "estableix el locale predeterminat" +msgid "Set the default base install directory" +msgstr "Estableix el directori d'instal·lació base predeterminat" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 +#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format -msgid "Enable progress reporting" -msgstr "Habilita la informació del progrés" +msgid "Load a user specific configuration file" +msgstr "Carrega un fitxer de configuració específic d'usuari" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 #, sh-format -msgid "Print stage times (seconds)" -msgstr "Mostra el temps de les etapes (en segons)" +msgid "set the target architecture" +msgstr "estableix l'arquitectura objectiu" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 #, sh-format -msgid "Draw progress bar" -msgstr "Dibuixa una barra de progrés" +msgid "ERROR: --arch %s called on unsupported arch: %s" +msgstr "ERROR: --arch %s cridat per a una arquitectura no suportada: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format -msgid "prompt to set the root password, defaults to disabled" +msgid "ERROR: unsupported architecture. Check your --arch argument: %s" msgstr "" -"indicador per especificar la contrasenya de root, per omissió està desactivat" +"ERROR: arquitectura no suportada. Comproveu el vostre argument --arch: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 #, sh-format -msgid "enable serial console" -msgstr "habilita la consola sèrie" +msgid " supported values are: %s" +msgstr " els valors permesos són: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 #, sh-format -msgid "Enabling serial console..." -msgstr "S'està habilitant la consola sèrie..." +msgid "Set the distribution to be used for install" +msgstr "Estableix la distribució que s'utilitzarà per a la instal·lació" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 #, sh-format -msgid "set the mirror location" -msgstr "estableix la ubicació de la rèplica" +msgid "purge existing LTSP chroot if present" +msgstr "elimina el chroot de l'LTSP si existeix" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 #, sh-format -msgid "add a mirror, which takes priority over the default mirror" -msgstr "afegeix una rèplica, amb més prioritat que la rèplica predeterminada" +msgid "Set the name of the chroot." +msgstr "Estableix el nom del chroot." -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/common/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 #, sh-format -msgid "add a mirror, with lower priority than the default mirror" -msgstr "afegeix una rèplica, amb menys prioritat que la rèplica predeterminada" +msgid "prompt to set the root password, defaults to disabled" +msgstr "" +"indicador per especificar la contrasenya de root, per omissió està desactivat" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 +#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format -msgid "add a security mirror" -msgstr "afegeix una rèplica de seguretat" +msgid "exclude packages from the initial chroot" +msgstr "exclou paquets del chroot inicial" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 +#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 #, sh-format -msgid "set the kernel package to install." -msgstr "indica el paquet del nucli a instal·lar." +msgid "Enable debug support" +msgstr "Habilita el suport per a la depuració" -#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 -#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 #, sh-format -msgid "keep cache of downloaded package files" -msgstr "mantén una cau dels fitxers de paquets descarregats" +msgid "Path to Quickstart profile" +msgstr "Camí al perfil del Quickstart" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 -#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 #, sh-format -msgid "set the distribution to be used for install" -msgstr "estableix la distribució que s'utilitzarà per a la instal·lació" +msgid "Debug Quickstart" +msgstr "Depura el Quickstart" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 #, sh-format -msgid "Set the i18n langs" -msgstr "Estableix les llengües" +msgid "Show external command output" +msgstr "Mostra sortida d'ordres externes" -#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 #, sh-format -msgid "set the kernel modules packages to install." -msgstr "indica els paquets de mòduls del nucli que s'han d'instal·lar." +msgid "Get profile from a Quickstart server" +msgstr "Obté el perfil d'un servidor Quickstart" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format -msgid "set the target architecture" -msgstr "estableix l'arquitectura objectiu" +msgid "Manual Quickstart: %s" +msgstr "Quickstart manual: %s" -#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format -msgid "include the listed keys in the apt keyring" -msgstr "inclou les claus llistades a l'anell de claus de l'apt" +msgid "Default Quickstart profile: %s" +msgstr "Perfil predeterminat del Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format -msgid "cache downloaded packages" -msgstr "manté una cau dels paquets" +msgid "ERROR: %s does not exist" +msgstr "ERROR: %s no existeix" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format -msgid "Copying packages" -msgstr "S'estan copiant els paquets" +msgid "Installing into: %s" +msgstr "S'està instal·lant a: %s" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format -msgid "done." -msgstr "fet." +msgid "Stage 3 URI" +msgstr "URI de l'etapa 3" -#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format -msgid "create squashfs image for use with NBD" -msgstr "crea una imatge squashfs per a utilitzar amb NBD" +msgid "Set the number of parallel build processes" +msgstr "Estableix el nombre de processos de muntatge en paral·lel" -#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format -msgid "load debconf seeding in the chroot after install" +msgid "Set extra mirror locations (space-separated)" msgstr "" -"carrega la preconfiguració de debconf al chroot després de la instal·lació" - -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 -#, sh-format -msgid "mount package cache dir from server" -msgstr "munta el directori de la cau de paquets des del servidor" +"Estableix les ubicacions de les rèpliques addicionals (separades per espais)" -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 +#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #, sh-format -msgid "mount a server directory as the chroot package cache dir" -msgstr "munta un directori del servidor com a directori cau de paquets" +msgid "Set the default locale" +msgstr "Estableix el locale predeterminat" -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" +msgid "list of extra packages to install as part of the initial installation." msgstr "" -"instal·la al chroot tots els fitxers .deb que hi hagi al directori " -"especificat" - -#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 -#, sh-format -msgid "allow unsigned packages during install" -msgstr "permet paquets no signats durant la instal·lació." - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 -#, sh-format -msgid "copy apt Packages files from server" -msgstr "copia els fitxers «Packages» de l'apt del servidor" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 -#, sh-format -msgid "add a backports mirror" -msgstr "afegeix una rèplica de backports" +"llista de paquets addicionals a instal·lar com a part de la instal·lació " +"final." -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 #, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "llista de paquets dels repositoris de backports a instal·lar" +msgid "Enable LTSP-Cluster" +msgstr "Habilita el clúster LTSP" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 +#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 #, sh-format -msgid "distribution to pull backports from" -msgstr "distribució des de la qual baixar els backports" +msgid "force to skip the squashfs build (for debian-installer)." +msgstr "força l'omissió de l'squashfs (per al debian-installer)." -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"NOTA: s'està afegint la distribució i els components predeterminats a la " -"rèplica de backports:" +msgid "a simple webkiosk mode." +msgstr "un mode quiosc-web simple." -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 #, sh-format -msgid "distribution to set up apt pinning" -msgstr "distribució per configurar l'etiquetatge de l'apt" +msgid "use the servers sources.list instead of generating one" +msgstr "utilitza el sources.list del servidor en comptes de generar-lo" -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 #, sh-format -msgid "list of packages to install from the pinned distribution" -msgstr "llista de paquets de la distribució etiquetada a instal·lar" +msgid "Set the mirror location" +msgstr "Estableix la ubicació de la rèplica" -#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 #, sh-format -msgid "a simple webkiosk mode" -msgstr "un mode quiosc-web simple" +msgid "add a mirror, which takes priority over the default mirror" +msgstr "afegeix una rèplica, amb més prioritat que la rèplica predeterminada" -#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 #, sh-format -msgid "mounts CDROM before installation" -msgstr "munta CD-ROM abans de la instal·lació" +msgid "add a mirror, with lower priority than the default mirror" +msgstr "afegeix una rèplica, amb menys prioritat que la rèplica predeterminada" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:6 #, sh-format -msgid "use specified http proxy" -msgstr "utilitza el proxy http especificat" +msgid "Set the security mirror location" +msgstr "Estableix la ubicació de la rèplica de seguretat" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:7 #, sh-format -msgid "do not autodetect apt proxy configuration" -msgstr "no detectar automàticament la configuració del proxy de l'apt" +msgid "Set the update mirror location" +msgstr "Estableix la ubicació de la rèplica d'actualitzacions" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 #, sh-format -msgid "enable popularity-contest in the chroot" -msgstr "activa popularity-contest al chroot" +msgid "Set the i18n langs" +msgstr "Estableix les llengües" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 +#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 #, sh-format -msgid "Enabling popularity contest..." -msgstr "S'està activant el concurs de popularitat..." +msgid "keep cache of downloaded package files" +msgstr "manté una cau dels fitxers de paquets descarregats" -#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 #, sh-format -msgid "set the components to be used in mirror" -msgstr "estableix els components que s'utilitzaran en la rèplica" +msgid "set the kernel modules packages to install." +msgstr "indica els paquets de mòduls del nucli que s'han d'instal·lar." -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:6 #, sh-format -msgid "create ext2 image for use with NBD" -msgstr "crea una imatge ext2 per a utilitzar amb NBD" +msgid "add a security mirror" +msgstr "afegeix una rèplica de seguretat" -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format -msgid "create image for use with NBD of the specified filesystem" +msgid "set the list of packages to install after base-install is completed." msgstr "" -"crea una imatge del sistema de fitxers especificat per a utilitzar amb NBD" +"indica la llista de paquets a instal·lar després que base-install hagi " +"acabat." -#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 #, sh-format -msgid "skip upgrade of installed packages" -msgstr "omet l'actualització dels paquets instal·lats" +msgid "Enable progress reporting" +msgstr "Habilita la informació del progrés" -#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 #, sh-format -msgid "set the list of kernel packages to install" -msgstr "indica la llista de paquets del nucli que s'han d'instal·lar" +msgid "Print stage times (seconds)" +msgstr "Mostra el temps de les etapes (en segons)" -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 #, sh-format -msgid "NOTE: adding default dist and components to security mirror:" -msgstr "" -"NOTA: s'està afegint la distribució i els components predeterminats a la " -"rèplica de seguretat:" +msgid "Draw progress bar" +msgstr "Dibuixa una barra de progrés" -#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 #, sh-format -msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "" -"NOTA: s'està desactivant la font de seguretat de l'APT per a sid. No " -"existeix." +msgid "set the kernel package to install." +msgstr "indica el paquet del nucli a instal·lar." -#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 #, sh-format -msgid "exclude packages from the initial chroot" -msgstr "exclou paquets del chroot inicial" +msgid "list of packages to install as part of the final installation." +msgstr "llista de paquets a instal·lar com a part de la instal·lació final." -#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 #, sh-format -msgid "load a user specific configuration file" -msgstr "carrega un fitxer de configuració específic d'usuari" +msgid "enable serial console" +msgstr "habilita la consola sèrie" -#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 #, sh-format -msgid "purge existing LTSP chroot if present" -msgstr "elimina el chroot de l'LTSP si existeix" +msgid "Enabling serial console..." +msgstr "S'està habilitant la consola sèrie..." -#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 +#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 #, sh-format -msgid "enable debug support" -msgstr "habilita el suport per a la depuració" +msgid "include the listed keys in the apt keyring" +msgstr "inclou les claus llistades a l'anell de claus de l'apt" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 #, sh-format -msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "ERROR: s'ha cridat --arch %s per a una arquitectura no suportada: %s" +msgid "mount package cache dir from server" +msgstr "munta el directori de la cau de paquets des del servidor" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/Debian/010-security-mirror:8 #, sh-format -msgid "ERROR: unsupported architecture. Check your --arch argument: %s" +msgid "NOTE: adding default dist and components to security mirror:" msgstr "" -"ERROR: l'arquitectura no està suportada. Comproveu el vostre argument --" -"arch: %s" - -#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 -#, sh-format -msgid " supported values are: %s" -msgstr " els valors permesos són: %s" - -#: ../server/plugins/ltsp-build-client/common/010-set-base:3 -#, sh-format -msgid "set the default base install directory" -msgstr "estableix el directori d'instal·lació base predeterminat" +"NOTA: s'està afegint la distribució i els components predeterminats a la " +"rèplica de seguretat:" -#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 +#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 #, sh-format -msgid "set the name of the chroot" -msgstr "estableix el nom del chroot" +msgid "create squashfs image for use with NBD." +msgstr "crea una imatge squashfs per a utilitzar amb NBD." -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 +#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 #, sh-format -msgid "set the security mirror location" -msgstr "estableix la ubicació de la rèplica de seguretat" +msgid "load debconf seeding in the chroot after install" +msgstr "" +"carrega la preconfiguració de debconf al chroot després de la instal·lació" -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 #, sh-format -msgid "set the update mirror location" -msgstr "estableix la ubicació de la rèplica d'actualitzacions" +msgid "copy apt Packages files from server" +msgstr "copia els fitxers «Packages» de l'apt del servidor" -#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 #, sh-format -msgid "use the servers sources.list instead of generating one" -msgstr "utilitza el sources.list del servidor en comptes de generar-lo" +msgid "cache downloaded packages" +msgstr "manté una cau dels paquets" -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 #, sh-format -msgid "run most or all applications locally" -msgstr "executa la majoria o totes les aplicacions localment" +msgid "Copying packages" +msgstr "S'estan copiant els paquets" -#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 #, sh-format -msgid "enable LTSP-Cluster" -msgstr "habilita el clúster LTSP" +msgid "done." +msgstr "fet." -#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 +#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 #, sh-format -msgid "force to skip the squashfs build (for debian-installer)" -msgstr "força l'omissió de l'squashfs (per al debian-installer)" +msgid "skip upgrade of installed packages." +msgstr "omet l'actualització dels paquets instal·lats." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 #, sh-format -msgid "Path to Quickstart profile" -msgstr "Camí al perfil del Quickstart" +msgid "set the list of kernel packages to install." +msgstr "indica la llista de paquets del nucli que s'han d'instal·lar." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 +#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format -msgid "Debug Quickstart" -msgstr "Depura el Quickstart" +msgid "NOTE: disabling security APT source for sid. It does not exist." +msgstr "" +"NOTA: s'està desactivant la font de seguretat de l'APT per a sid. No " +"existeix." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format -msgid "Show external command output" -msgstr "Mostra sortida d'ordres externes" +msgid "allow unsigned packages during install." +msgstr "permet paquets no signats durant la instal·lació." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 +#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 #, sh-format -msgid "Get profile from a Quickstart server" -msgstr "Obtén el perfil d'un servidor Quickstart" +msgid "Set the components to be used in mirror" +msgstr "Estableix els components que s'utilitzaran en la rèplica" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 #, sh-format -msgid "Manual Quickstart: %s" -msgstr "Quickstart manual: %s" +msgid "create ext2 image for use with NBD" +msgstr "crea una imatge ext2 per a utilitzar amb NBD" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 #, sh-format -msgid "Default Quickstart profile: %s" -msgstr "Perfil predeterminat del Quickstart: %s" +msgid "create image for use with NBD of the specified filesystem" +msgstr "" +"crea una imatge del sistema de fitxers especificat per a utilitzar amb NBD" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 #, sh-format -msgid "ERROR: %s does not exist" -msgstr "ERROR: %s no existeix" +msgid "use specified http proxy" +msgstr "utilitza el proxy http especificat" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 #, sh-format -msgid "Installing into: %s" -msgstr "S'està instal·lant a: %s" +msgid "do not autodetect apt proxy configuration" +msgstr "no detectar automàticament la configuració del proxy de l'apt" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format -msgid "Stage 3 URI" -msgstr "URI de l'etapa 3" +msgid "distribution to set up apt pinning" +msgstr "distribució per configurar l'etiquetatge de l'apt" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format -msgid "Set the number of parallel build processes" -msgstr "Estableix el nombre de processos de muntatge en paral·lel" +msgid "list of packages to install from the pinned distribution" +msgstr "llista de paquets de la distribució etiquetada a instal·lar" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 #, sh-format -msgid "Set extra mirror locations (space-separated)" -msgstr "" -"Estableix les ubicacions de les rèpliques addicionals (separades per espais)" +msgid "enable popularity-contest in the chroot" +msgstr "activa popularity-contest al chroot" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 #, sh-format -msgid "list of extra packages to install as part of the initial installation." -msgstr "" -"llista de paquets addicionals a instal·lar com a part de la instal·lació " -"final." +msgid "Enabling popularity contest..." +msgstr "S'està activant el concurs de popularitat..." -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 #, sh-format -msgid "Load a user specific configuration file" -msgstr "Carrega un fitxer de configuració específic d'usuari" +msgid "mounts CDROM before installation" +msgstr "munta CD-ROM abans de la instal·lació" #: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 #, sh-format @@ -529,42 +486,42 @@ msgid "Distro name" msgstr "Nom de la distribució" -#: ../server/ltsp-build-client:89 +#: ../server/ltsp-build-client:83 #, sh-format msgid "API ERROR: you need to provide true or false." msgstr "ERROR DE LA API: heu d'indicar «true» o «false»." -#: ../server/ltsp-build-client:132 +#: ../server/ltsp-build-client:126 #, sh-format -msgid "display this help message" -msgstr "mostra aquest missatge d'ajuda" +msgid "Display this help message" +msgstr "Mostra aquest missatge d'ajuda" -#: ../server/ltsp-build-client:133 +#: ../server/ltsp-build-client:127 #, sh-format -msgid "display help for all available commandline options" -msgstr "mostra l'ajuda per a totes les opcions disponibles a la línia d'ordres" +msgid "Display help for all available commandline options" +msgstr "Mostra l'ajuda per a totes les opcions disponibles a la línia d'ordres" -#: ../server/ltsp-build-client:137 +#: ../server/ltsp-build-client:131 #, sh-format msgid "LTSP Build Client usage:" msgstr "Forma d'ús del muntador de clients LTSP:" -#: ../server/ltsp-build-client:141 +#: ../server/ltsp-build-client:135 #, sh-format msgid " Regular options:" msgstr " Opcions habituals:" -#: ../server/ltsp-build-client:145 +#: ../server/ltsp-build-client:139 #, sh-format msgid " Advanced options:" msgstr " Opcions avançades:" -#: ../server/ltsp-build-client:157 +#: ../server/ltsp-build-client:151 #, sh-format msgid "info: LTSP client installation completed successfully" -msgstr "info: la instal·lació del client LTSP ha finalitzat amb èxit" +msgstr "info: La instal·lació del client LTSP ha finalitzat amb èxit" -#: ../server/ltsp-build-client:159 +#: ../server/ltsp-build-client:153 #, sh-format msgid "error: LTSP client installation ended abnormally" -msgstr "error: la instal·lació del client LTSP no ha acabat correctament" +msgstr "error: La instal·lació del client LTSP no ha acabat correctament" diff -Nru ltsp-5.2.8/po/cs.po ltsp-5.2.6/po/cs.po --- ltsp-5.2.8/po/cs.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/cs.po 2011-03-03 21:09:09.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: ltsp 5.1.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2009-10-18 18:04-0700\n" "PO-Revision-Date: 2009-11-01 20:51+0100\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" -"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -74,432 +73,390 @@ msgid "Cancel" msgstr "Zrušit" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 -#, fuzzy, sh-format -msgid "set the list of packages to install after base-install is completed" -msgstr "" -"nastavit seznam balíků, které se mají instalovat po skončení základní " -"instalace." +#: ../server/plugins/ltsp-build-client/common/010-set-base:3 +#, sh-format +msgid "Set the default base install directory" +msgstr "Nastavit výchozí instalační adresář" -#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 -#, fuzzy, sh-format -msgid "list of packages to install as part of the final installation" -msgstr "seznam balíků k instalaci jako součást finální instalace." +#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#, sh-format +msgid "Load a user specific configuration file" +msgstr "Nahrát specifický konfigurační soubor uživatele" -#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 -#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 -#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 -#, fuzzy, sh-format -msgid "set the default locale" -msgstr "nastavit výchozí locale" +#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#, sh-format +msgid "set the target architecture" +msgstr "Nastavit cílovou architekturu" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 #, sh-format -msgid "Enable progress reporting" -msgstr "Povolit hlášení o postupu" +msgid "ERROR: --arch %s called on unsupported arch: %s" +msgstr "CHYBA: --arch %s spuštěno na nepodporované architektuře: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format -msgid "Print stage times (seconds)" -msgstr "Vypisovat časy jednotlivých fází (v sekundách)" +msgid "ERROR: unsupported architecture. Check your --arch argument: %s" +msgstr "CHYBA: nepodporovaná architektura. Zkontrolujte argument --arch: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 #, sh-format -msgid "Draw progress bar" -msgstr "Zobrazovat ukazatel postupu" +msgid " supported values are: %s" +msgstr " podporované hodnoty jsou: %s" +#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 +#, sh-format +msgid "Set the distribution to be used for install" +msgstr "Nastavit distribuci, která se použije pro instalaci" + +#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#, sh-format +msgid "purge existing LTSP chroot if present" +msgstr "pokud existuje, smazat předchozí LTSP chroot" + +#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 +#, sh-format +msgid "Set the name of the chroot." +msgstr "Nastavit jméno chrootu." + +#: ../server/plugins/ltsp-build-client/common/095-rootpass:3 #: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 #, sh-format msgid "prompt to set the root password, defaults to disabled" msgstr "dotázat se na rootovo heslo, výchozí je zakázáno" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 +#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format -msgid "enable serial console" -msgstr "povolit sériovou konzoli" +msgid "exclude packages from the initial chroot" +msgstr "vyřadit balíky z prvotního chrootu" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 #, sh-format -msgid "Enabling serial console..." -msgstr "Povoluje se sériová konzole..." +msgid "Enable debug support" +msgstr "Povolit podporu ladění" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 -#, fuzzy, sh-format -msgid "set the mirror location" -msgstr "Nastavit umístění zrcadel" +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#, sh-format +msgid "Path to Quickstart profile" +msgstr "Cesta ke Quickstart profilu" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 #, sh-format -msgid "add a mirror, which takes priority over the default mirror" -msgstr "přidat zrcadlo, které má prioritu před výchozím zrcadlem" +msgid "Debug Quickstart" +msgstr "Ladit Quickstart" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 #, sh-format -msgid "add a mirror, with lower priority than the default mirror" -msgstr "přidat zrcadlo, které má nižší prioritu než výchozí zrcadlo" +msgid "Show external command output" +msgstr "Zobrazit výstup externích programů" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 #, sh-format -msgid "add a security mirror" -msgstr "přidat zrcadlo s bezpečnostními aktualizacemi" +msgid "Get profile from a Quickstart server" +msgstr "Získat profil z Quickstart serveru" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format -msgid "set the kernel package to install." -msgstr "vybrat balík s jádrem, který se má instalovat." +msgid "Manual Quickstart: %s" +msgstr "Ruční Quickstart: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 -#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format -msgid "keep cache of downloaded package files" -msgstr "ponechat soubory stažených balíků v cache" +msgid "Default Quickstart profile: %s" +msgstr "Výchozí profil Quickstartu: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 -#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 -#, fuzzy, sh-format -msgid "set the distribution to be used for install" -msgstr "Nastavit distribuci, která se použije pro instalaci" +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 +#, sh-format +msgid "ERROR: %s does not exist" +msgstr "CHYBA: %s neexistuje" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format -msgid "Set the i18n langs" -msgstr "Nastavit i18n jazyky" +msgid "Installing into: %s" +msgstr "Instaluje se do: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format -msgid "set the kernel modules packages to install." -msgstr "nastavit balíky s jadernými moduly, které se mají instalovat." +msgid "Stage 3 URI" +msgstr "URI 3. fáze" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format -msgid "set the target architecture" -msgstr "Nastavit cílovou architekturu" +msgid "Set the number of parallel build processes" +msgstr "Nastavit počet paralelních buildovacích procesů" -#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format -msgid "include the listed keys in the apt keyring" -msgstr "přidat vypsané klíče na klíčenku aptu" +msgid "Set extra mirror locations (space-separated)" +msgstr "Nastavit umístění dalších zrcadel (oddělené mezerami)" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 +#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #, sh-format -msgid "cache downloaded packages" -msgstr "ukládat stažené balíky do cache" +msgid "Set the default locale" +msgstr "nastavit výchozí locale" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format -msgid "Copying packages" -msgstr "Kopírují se balíky" +msgid "list of extra packages to install as part of the initial installation." +msgstr "" +"seznam dalších balíků, které se nainstalují jako součást úvodní instalace." -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 #, sh-format -msgid "done." -msgstr "hotovo." +msgid "Enable LTSP-Cluster" +msgstr "Povolit LTSP-Cluster" -#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 -#, fuzzy, sh-format -msgid "create squashfs image for use with NBD" -msgstr "vytvořit squashfs obraz pro použití s NBD." +#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 +#, sh-format +msgid "force to skip the squashfs build (for debian-installer)." +msgstr "přeskočit vytvoření squashfs (pro debian-installer)." -#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #, sh-format -msgid "load debconf seeding in the chroot after install" -msgstr "po instalaci nahrát do chrootu debconf přednastavení" +msgid "a simple webkiosk mode." +msgstr "režim jednoduchého webového kiosku." -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 #, sh-format -msgid "mount package cache dir from server" -msgstr "připojit adresář s cachí balíků ze serveru" +msgid "use the servers sources.list instead of generating one" +msgstr "místo vytváření sources.list použít ten ze serveru" -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 #, sh-format -msgid "mount a server directory as the chroot package cache dir" -msgstr "" +msgid "Set the mirror location" +msgstr "Nastavit umístění zrcadel" -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" +msgid "add a mirror, which takes priority over the default mirror" +msgstr "přidat zrcadlo, které má prioritu před výchozím zrcadlem" -#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 -#, fuzzy, sh-format -msgid "allow unsigned packages during install" -msgstr "povolit během instalace nepodepsané balíky." +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#, sh-format +msgid "add a mirror, with lower priority than the default mirror" +msgstr "přidat zrcadlo, které má nižší prioritu než výchozí zrcadlo" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:6 #, sh-format -msgid "copy apt Packages files from server" -msgstr "zkopírovat soubory Packages ze serveru" +msgid "Set the security mirror location" +msgstr "Nastavit umístění zrcadla s bezpečnostními aktualizacemi" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 -#, fuzzy, sh-format -msgid "add a backports mirror" -msgstr "přidat zrcadlo s bezpečnostními aktualizacemi" +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:7 +#, sh-format +msgid "Set the update mirror location" +msgstr "Nastavit umístění zrcadla s aktualizacemi" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 -#, fuzzy, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "" -"seznam vypíchnutých balíků, které se mají nainstalovat ze zadané distribuce" +#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#, sh-format +msgid "Set the i18n langs" +msgstr "Nastavit i18n jazyky" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 -#, fuzzy, sh-format -msgid "distribution to pull backports from" -msgstr "nastavit distribuci, která se použije pro vypichování balíků v apt" +#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#, sh-format +msgid "keep cache of downloaded package files" +msgstr "ponechat soubory stažených balíků v cache" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 -#, fuzzy, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"INFO: k zrcadlu s bezpečnostními aktualizacemi se nastavují výchozí " -"komponenty a distribuce:" +#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#, sh-format +msgid "set the kernel modules packages to install." +msgstr "nastavit balíky s jadernými moduly, které se mají instalovat." -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:6 #, sh-format -msgid "distribution to set up apt pinning" -msgstr "nastavit distribuci, která se použije pro vypichování balíků v apt" +msgid "add a security mirror" +msgstr "přidat zrcadlo s bezpečnostními aktualizacemi" -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format -msgid "list of packages to install from the pinned distribution" +msgid "set the list of packages to install after base-install is completed." msgstr "" -"seznam vypíchnutých balíků, které se mají nainstalovat ze zadané distribuce" +"nastavit seznam balíků, které se mají instalovat po skončení základní instalace." -#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 -#, fuzzy, sh-format -msgid "a simple webkiosk mode" -msgstr "režim jednoduchého webového kiosku." - -#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 #, sh-format -msgid "mounts CDROM before installation" -msgstr "před instalací připojí CD-ROM" +msgid "Enable progress reporting" +msgstr "Povolit hlášení o postupu" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 #, sh-format -msgid "use specified http proxy" -msgstr "použít zadanou http proxy" +msgid "Print stage times (seconds)" +msgstr "Vypisovat časy jednotlivých fází (v sekundách)" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 #, sh-format -msgid "do not autodetect apt proxy configuration" -msgstr "nerozpoznávat nastavení apt proxy automaticky" +msgid "Draw progress bar" +msgstr "Zobrazovat ukazatel postupu" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 #, sh-format -msgid "enable popularity-contest in the chroot" -msgstr "povolit v chrootu popularity-contest" +msgid "set the kernel package to install." +msgstr "vybrat balík s jádrem, který se má instalovat." -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 +#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 #, sh-format -msgid "Enabling popularity contest..." -msgstr "Povoluje se popularity-contest..." - -#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 -#, fuzzy, sh-format -msgid "set the components to be used in mirror" -msgstr "Nastavit komponenty, které se mají ze zrcadla použít" +msgid "list of packages to install as part of the final installation." +msgstr "seznam balíků k instalaci jako součást finální instalace." -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 #, sh-format -msgid "create ext2 image for use with NBD" -msgstr "vytvořit ext2 obraz pro použití s NBD" +msgid "enable serial console" +msgstr "povolit sériovou konzoli" -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 #, sh-format -msgid "create image for use with NBD of the specified filesystem" -msgstr "vytvořit obraz pro použití NBD se zadaným souborovým systémem" +msgid "Enabling serial console..." +msgstr "Povoluje se sériová konzole..." -#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 -#, fuzzy, sh-format -msgid "skip upgrade of installed packages" -msgstr "přeskočit instalaci instalovaných balíků." +#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#, sh-format +msgid "include the listed keys in the apt keyring" +msgstr "přidat vypsané klíče na klíčenku aptu" -#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 -#, fuzzy, sh-format -msgid "set the list of kernel packages to install" -msgstr "vybrat seznam balíků s jádrem, které se mají instalovat." +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 +#, sh-format +msgid "mount package cache dir from server" +msgstr "připojit adresář s cachí balíků ze serveru" -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 +#: ../server/plugins/ltsp-build-client/Debian/010-security-mirror:8 #, sh-format msgid "NOTE: adding default dist and components to security mirror:" msgstr "" "INFO: k zrcadlu s bezpečnostními aktualizacemi se nastavují výchozí " "komponenty a distribuce:" -#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 -#, sh-format -msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "" -"INFO: zakazují se zdroje s bezpečnostními aktualizacemi pro sid, protože " -"neexistují." - -#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 +#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 #, sh-format -msgid "exclude packages from the initial chroot" -msgstr "vyřadit balíky z prvotního chrootu" - -#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 -#, fuzzy, sh-format -msgid "load a user specific configuration file" -msgstr "Nahrát specifický konfigurační soubor uživatele" +msgid "create squashfs image for use with NBD." +msgstr "vytvořit squashfs obraz pro použití s NBD." -#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 #, sh-format -msgid "purge existing LTSP chroot if present" -msgstr "pokud existuje, smazat předchozí LTSP chroot" - -#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 -#, fuzzy, sh-format -msgid "enable debug support" -msgstr "Povolit podporu ladění" +msgid "load debconf seeding in the chroot after install" +msgstr "po instalaci nahrát do chrootu debconf přednastavení" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 #, sh-format -msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "CHYBA: --arch %s spuštěno na nepodporované architektuře: %s" +msgid "copy apt Packages files from server" +msgstr "zkopírovat soubory Packages ze serveru" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 #, sh-format -msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "CHYBA: nepodporovaná architektura. Zkontrolujte argument --arch: %s" +msgid "cache downloaded packages" +msgstr "ukládat stažené balíky do cache" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 #, sh-format -msgid " supported values are: %s" -msgstr " podporované hodnoty jsou: %s" - -#: ../server/plugins/ltsp-build-client/common/010-set-base:3 -#, fuzzy, sh-format -msgid "set the default base install directory" -msgstr "Nastavit výchozí instalační adresář" - -#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 -#, fuzzy, sh-format -msgid "set the name of the chroot" -msgstr "Nastavit jméno chrootu." - -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 -#, fuzzy, sh-format -msgid "set the security mirror location" -msgstr "Nastavit umístění zrcadla s bezpečnostními aktualizacemi" - -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 -#, fuzzy, sh-format -msgid "set the update mirror location" -msgstr "Nastavit umístění zrcadla s aktualizacemi" +msgid "Copying packages" +msgstr "Kopírují se balíky" -#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 #, sh-format -msgid "use the servers sources.list instead of generating one" -msgstr "místo vytváření sources.list použít ten ze serveru" +msgid "done." +msgstr "hotovo." -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 +#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 #, sh-format -msgid "run most or all applications locally" -msgstr "" - -#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 -#, fuzzy, sh-format -msgid "enable LTSP-Cluster" -msgstr "Povolit LTSP-Cluster" - -#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 -#, fuzzy, sh-format -msgid "force to skip the squashfs build (for debian-installer)" -msgstr "přeskočit vytvoření squashfs (pro debian-installer)." +msgid "skip upgrade of installed packages." +msgstr "přeskočit instalaci instalovaných balíků." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 #, sh-format -msgid "Path to Quickstart profile" -msgstr "Cesta ke Quickstart profilu" +msgid "set the list of kernel packages to install." +msgstr "vybrat seznam balíků s jádrem, které se mají instalovat." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 +#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format -msgid "Debug Quickstart" -msgstr "Ladit Quickstart" +msgid "NOTE: disabling security APT source for sid. It does not exist." +msgstr "" +"INFO: zakazují se zdroje s bezpečnostními aktualizacemi pro sid, protože " +"neexistují." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format -msgid "Show external command output" -msgstr "Zobrazit výstup externích programů" +msgid "allow unsigned packages during install." +msgstr "povolit během instalace nepodepsané balíky." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 +#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 #, sh-format -msgid "Get profile from a Quickstart server" -msgstr "Získat profil z Quickstart serveru" +msgid "Set the components to be used in mirror" +msgstr "Nastavit komponenty, které se mají ze zrcadla použít" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 #, sh-format -msgid "Manual Quickstart: %s" -msgstr "Ruční Quickstart: %s" +msgid "create ext2 image for use with NBD" +msgstr "vytvořit ext2 obraz pro použití s NBD" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 #, sh-format -msgid "Default Quickstart profile: %s" -msgstr "Výchozí profil Quickstartu: %s" +msgid "create image for use with NBD of the specified filesystem" +msgstr "vytvořit obraz pro použití NBD se zadaným souborovým systémem" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 #, sh-format -msgid "ERROR: %s does not exist" -msgstr "CHYBA: %s neexistuje" +msgid "use specified http proxy" +msgstr "použít zadanou http proxy" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 #, sh-format -msgid "Installing into: %s" -msgstr "Instaluje se do: %s" +msgid "do not autodetect apt proxy configuration" +msgstr "nerozpoznávat nastavení apt proxy automaticky" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format -msgid "Stage 3 URI" -msgstr "URI 3. fáze" +msgid "distribution to set up apt pinning" +msgstr "nastavit distribuci, která se použije pro vypichování balíků v apt" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format -msgid "Set the number of parallel build processes" -msgstr "Nastavit počet paralelních buildovacích procesů" +msgid "list of packages to install from the pinned distribution" +msgstr "" +"seznam vypíchnutých balíků, které se mají nainstalovat ze zadané distribuce" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 #, sh-format -msgid "Set extra mirror locations (space-separated)" -msgstr "Nastavit umístění dalších zrcadel (oddělené mezerami)" +msgid "enable popularity-contest in the chroot" +msgstr "povolit v chrootu popularity-contest" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 #, sh-format -msgid "list of extra packages to install as part of the initial installation." -msgstr "" -"seznam dalších balíků, které se nainstalují jako součást úvodní instalace." +msgid "Enabling popularity contest..." +msgstr "Povoluje se popularity-contest..." -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 #, sh-format -msgid "Load a user specific configuration file" -msgstr "Nahrát specifický konfigurační soubor uživatele" +msgid "mounts CDROM before installation" +msgstr "před instalací připojí CD-ROM" #: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 #, sh-format @@ -521,42 +478,42 @@ msgid "Distro name" msgstr "Jméno distribuce" -#: ../server/ltsp-build-client:89 +#: ../server/ltsp-build-client:83 #, sh-format msgid "API ERROR: you need to provide true or false." msgstr "CHYBA API: musíte zadat true nebo false." -#: ../server/ltsp-build-client:132 -#, fuzzy, sh-format -msgid "display this help message" +#: ../server/ltsp-build-client:126 +#, sh-format +msgid "Display this help message" msgstr "Zobrazí tuto nápovědu" -#: ../server/ltsp-build-client:133 -#, fuzzy, sh-format -msgid "display help for all available commandline options" +#: ../server/ltsp-build-client:127 +#, sh-format +msgid "Display help for all available commandline options" msgstr "Zobrazí nápovědu pro všechny dostupné volby" -#: ../server/ltsp-build-client:137 +#: ../server/ltsp-build-client:131 #, sh-format msgid "LTSP Build Client usage:" msgstr "Použití LTSP build klienta:" -#: ../server/ltsp-build-client:141 +#: ../server/ltsp-build-client:135 #, sh-format msgid " Regular options:" msgstr " Běžné volby:" -#: ../server/ltsp-build-client:145 +#: ../server/ltsp-build-client:139 #, sh-format msgid " Advanced options:" msgstr " Pokročilé volby:" -#: ../server/ltsp-build-client:157 +#: ../server/ltsp-build-client:151 #, sh-format msgid "info: LTSP client installation completed successfully" msgstr "info: instalace LTSP klienta skončila úspěšně" -#: ../server/ltsp-build-client:159 +#: ../server/ltsp-build-client:153 #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "chyba: instalace LTSP klienta neočekávaně skončila" diff -Nru ltsp-5.2.8/po/de.po ltsp-5.2.6/po/de.po --- ltsp-5.2.8/po/de.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/de.po 2011-03-03 21:09:09.000000000 +0000 @@ -5,17 +5,15 @@ # Wolfgang Schweer , 2007-2010. msgid "" msgstr "" -"Project-Id-Version: ltsp 5.2.2\n" +"Project-Id-Version: ltsp 5.2.2\n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-07 09:27+0100\n" "Last-Translator: Wolfgang Schweer \n" "Language-Team: German \n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" @@ -83,26 +81,21 @@ #: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format msgid "set the list of packages to install after base-install is completed" -msgstr "" -"Pakete auflisten, die nach der Grundinstallation zusätzlich installiert " -"werden sollen." +msgstr "Pakete auflisten, die nach der Grundinstallation zusätzlich installiert werden sollen." #: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 #: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 #, sh-format msgid "list of packages to install as part of the final installation" -msgstr "" -"Liste von Paketen, die als Teil der Schlussinstallation zu installieren sind." +msgstr "Liste von Paketen, die als Teil der Schlussinstallation zu installieren sind." #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" -msgstr "" -"Spracheinstellung (locale) setzen, die als Voreinstellung verwendet werden " -"soll" +msgstr "Spracheinstellung (locale) setzen, die als Voreinstellung verwendet werden soll" #: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 #, sh-format @@ -123,9 +116,7 @@ #: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 #, sh-format msgid "prompt to set the root password, defaults to disabled" -msgstr "" -"Nachfragen, ob ein Passwort für root gesetzt werden soll; voreingestellt " -"erfolgt keine Nachfrage" +msgstr "Nachfragen, ob ein Passwort für root gesetzt werden soll; voreingestellt erfolgt keine Nachfrage" #: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 #: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 @@ -149,17 +140,13 @@ #: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 #, sh-format msgid "add a mirror, which takes priority over the default mirror" -msgstr "" -"Spiegelserver hinzufügen, dessen Priorität höher als die des " -"voreingestellten ist" +msgstr "Spiegelserver hinzufügen, dessen Priorität höher als die des voreingestellten ist" #: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 #: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 #, sh-format msgid "add a mirror, with lower priority than the default mirror" -msgstr "" -"Spiegelserver hinzufügen, dessen Priorität niedriger als die des " -"voreingestellten ist" +msgstr "Spiegelserver hinzufügen, dessen Priorität niedriger als die des voreingestellten ist" #: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 @@ -232,9 +219,7 @@ #: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 #, sh-format msgid "load debconf seeding in the chroot after install" -msgstr "" -"Nach der Installation Voreinstellungen durch Debconf im Chroot-Verzeichnis " -"ausführen" +msgstr "Nach der Installation Voreinstellungen durch Debconf im Chroot-Verzeichnis ausführen" #: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 #, sh-format @@ -244,16 +229,12 @@ #: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 #, sh-format msgid "mount a server directory as the chroot package cache dir" -msgstr "" -"ein Verzeichnis des Servers als Paket-Cache-Verzeichnis für den Chroot " -"mounten" +msgstr "ein Verzeichnis des Servers als Paket-Cache-Verzeichnis für den Chroot mounten" #: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" -"alle .deb-Dateien aus dem bereitgestellten Verzeichnis im Chroot installieren" +msgid "install to the chroot all the .deb files contained in the provided directory" +msgstr "alle .deb-Dateien aus dem bereitgestellten Verzeichnis im Chroot installieren" #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format @@ -283,9 +264,7 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:29 #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"HINWEIS: Für den »backports«-Spiegelserver wurden Voreinstellungen für " -"Distribution und Komponenten hinzugefügt:" +msgstr "HINWEIS: Für den »backports«-Spiegelserver wurden Voreinstellungen für Distribution und Komponenten hinzugefügt:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -295,9 +274,7 @@ #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format msgid "list of packages to install from the pinned distribution" -msgstr "" -"Liste von Paketen, die von der mittels Pinning gesetzten Distribution " -"installiert werden sollen" +msgstr "Liste von Paketen, die von der mittels Pinning gesetzten Distribution installiert werden sollen" #: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 @@ -358,22 +335,17 @@ #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 #, sh-format msgid "NOTE: adding default dist and components to security mirror:" -msgstr "" -"HINWEIS: Für Security wurden Voreinstellungen für Distribution und " -"Komponenten hinzugefügt:" +msgstr "HINWEIS: Für Security wurden Voreinstellungen für Distribution und Komponenten hinzugefügt:" #: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "" -"HINWEIS: In der Datei sources.list von apt wurde der Eintrag security für " -"Sid deaktiviert, da diese Komponente nicht existiert." +msgstr "HINWEIS: In der Datei sources.list von apt wurde der Eintrag security für Sid deaktiviert, da diese Komponente nicht existiert." #: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format msgid "exclude packages from the initial chroot" -msgstr "" -"Pakete auflisten, die im Chroot zunächst nicht installiert werden sollen" +msgstr "Pakete auflisten, die im Chroot zunächst nicht installiert werden sollen" #: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 #, sh-format @@ -396,8 +368,7 @@ #: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 #, sh-format msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "" -"FEHLER: --arch %s wurde auf der nicht unterstützten Architektur %s angegeben." +msgstr "FEHLER: --arch %s wurde auf der nicht unterstützten Architektur %s angegeben." #: ../server/plugins/ltsp-build-client/common/001-set-arch:51 #: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 @@ -405,9 +376,7 @@ #: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "" -"FEHLER: Nicht unterstützte Architektur. Bitte den Parameter --arch %s " -"überprüfen." +msgstr "FEHLER: Nicht unterstützte Architektur. Bitte den Parameter --arch %s überprüfen." #: ../server/plugins/ltsp-build-client/common/001-set-arch:52 #: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 @@ -440,8 +409,7 @@ #: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 #, sh-format msgid "use the servers sources.list instead of generating one" -msgstr "" -"Die Datei sources.list des Servers benutzen, statt eine neue zu generieren" +msgstr "Die Datei sources.list des Servers benutzen, statt eine neue zu generieren" #: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 #: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 @@ -479,46 +447,45 @@ msgid "Get profile from a Quickstart server" msgstr "Profil von einem Quickstart-Server laden" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Manueller Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Voreingestelltes Quickstart-Profil: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "FEHLER: %s existiert nicht" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Installation erfolgt in: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Stage 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Anzahl paralleler Build-Prozesse festlegen" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Zusätzliche Spiegelserver angeben (Leerzeichen als Trenner)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." -msgstr "" -"Liste von Paketen, die als Teil der Erstinstallation zu installieren sind." +msgstr "Liste von Paketen, die als Teil der Erstinstallation zu installieren sind." #: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format @@ -533,8 +500,7 @@ #: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:10 #, sh-format msgid "Path to chroot-creator cache" -msgstr "" -"Pfad zum Cache, der vom Erstellungs-Prozess des Chroot verwendet werden soll" +msgstr "Pfad zum Cache, der vom Erstellungs-Prozess des Chroot verwendet werden soll" #: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 #, sh-format @@ -559,8 +525,7 @@ #: ../server/ltsp-build-client:133 #, sh-format msgid "display help for all available commandline options" -msgstr "" -"Hilfe für alle zur Verfügung stehenden Kommandozeilen-Optionen anzeigen" +msgstr "Hilfe für alle zur Verfügung stehenden Kommandozeilen-Optionen anzeigen" #: ../server/ltsp-build-client:137 #, sh-format @@ -586,3 +551,4 @@ #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "Fehler: Die LTSP-Client-Installation ist fehlgeschlagen" + diff -Nru ltsp-5.2.8/po/el.po ltsp-5.2.6/po/el.po --- ltsp-5.2.8/po/el.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/el.po 2011-03-03 21:09:09.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: ltsp 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-04 22:12+0200\n" "Last-Translator: Alkis Georgopoulos \n" "Language-Team: Greek\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -82,9 +81,7 @@ #: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format msgid "set the list of packages to install after base-install is completed" -msgstr "" -"ορισμός της λίστας πακέτων προς εγκατάσταση μετά την ολοκλήρωση του base-" -"install" +msgstr "ορισμός της λίστας πακέτων προς εγκατάσταση μετά την ολοκλήρωση του base-install" #: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 #: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 @@ -95,7 +92,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "ορισμός της προεπιλεγμένης εντοπιότητας (locale)" @@ -119,9 +116,7 @@ #: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 #, sh-format msgid "prompt to set the root password, defaults to disabled" -msgstr "" -"προτρέπει για τον ορισμό συνθηματικού του υπερχρήστη, απενεργοποιημένο από " -"προεπιλογής" +msgstr "προτρέπει για τον ορισμό συνθηματικού του υπερχρήστη, απενεργοποιημένο από προεπιλογής" #: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 #: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 @@ -145,15 +140,13 @@ #: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 #, sh-format msgid "add a mirror, which takes priority over the default mirror" -msgstr "" -"προσθήκη ενός καθρέπτη, που έχει προτεραιότητα έναντι του προεπιλεγμένου" +msgstr "προσθήκη ενός καθρέπτη, που έχει προτεραιότητα έναντι του προεπιλεγμένου" #: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 #: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 #, sh-format msgid "add a mirror, with lower priority than the default mirror" -msgstr "" -"προσθήκη ενός καθρέπτη, με μικρότερη προτεραιότητα από τον προεπιλεγμένο" +msgstr "προσθήκη ενός καθρέπτη, με μικρότερη προτεραιότητα από τον προεπιλεγμένο" #: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 @@ -236,14 +229,11 @@ #: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 #, sh-format msgid "mount a server directory as the chroot package cache dir" -msgstr "" -"προσάρτηση ενός καταλόγου του εξυπηρετητή ως μνήμη αποθήκευσης πακέτων του " -"chroot" +msgstr "προσάρτηση ενός καταλόγου του εξυπηρετητή ως μνήμη αποθήκευσης πακέτων του chroot" #: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" +msgid "install to the chroot all the .deb files contained in the provided directory" msgstr "εγκατάσταση στο chroot όλων των αρχείων .deb του δοθέντος καταλόγου" #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 @@ -274,9 +264,7 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:29 #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"ΣΗΜΕΙΩΣΗ: γίνεται προσθήκη της προεπιλεγμένης διανομής και συστατικών στον " -"καθρέπτη backports:" +msgstr "ΣΗΜΕΙΩΣΗ: γίνεται προσθήκη της προεπιλεγμένης διανομής και συστατικών στον καθρέπτη backports:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -332,8 +320,7 @@ #: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 #, sh-format msgid "create image for use with NBD of the specified filesystem" -msgstr "" -"δημιουργία εικόνας για χρήση με το NBD για το καθορισμένο σύστημα αρχείων" +msgstr "δημιουργία εικόνας για χρήση με το NBD για το καθορισμένο σύστημα αρχείων" #: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 #, sh-format @@ -348,16 +335,12 @@ #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 #, sh-format msgid "NOTE: adding default dist and components to security mirror:" -msgstr "" -"ΣΗΜΕΙΩΣΗ: γίνεται προσθήκη της προεπιλεγμένης διανομής και συστατικών στον " -"καθρέπτη ασφαλείας:" +msgstr "ΣΗΜΕΙΩΣΗ: γίνεται προσθήκη της προεπιλεγμένης διανομής και συστατικών στον καθρέπτη ασφαλείας:" #: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "" -"ΣΗΜΕΙΩΣΗ: απενεργοποιείται η πηγή APT για τις ενημερώσεις ασφαλείας για το " -"sid. Δεν υπάρχει." +msgstr "ΣΗΜΕΙΩΣΗ: απενεργοποιείται η πηγή APT για τις ενημερώσεις ασφαλείας για το sid. Δεν υπάρχει." #: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format @@ -393,8 +376,7 @@ #: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "" -"ΣΦΑΛΜΑ: μη υποστηριζόμενη αρχιτεκτονική. Ελέγξτε την παράμετρο --arch: %s" +msgstr "ΣΦΑΛΜΑ: μη υποστηριζόμενη αρχιτεκτονική. Ελέγξτε την παράμετρο --arch: %s" #: ../server/plugins/ltsp-build-client/common/001-set-arch:52 #: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 @@ -443,8 +425,7 @@ #: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 #, sh-format msgid "force to skip the squashfs build (for debian-installer)" -msgstr "" -"εξαναγκασμένη παράλειψη του χτισίματος του squashfs (για το debian-installer)" +msgstr "εξαναγκασμένη παράλειψη του χτισίματος του squashfs (για το debian-installer)" #: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 #, sh-format @@ -466,46 +447,45 @@ msgid "Get profile from a Quickstart server" msgstr "Λήψη προφίλ από έναν εξυπηρετητή Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Χειρωκίνητο Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Προεπιλεγμένο προφίλ Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ΣΦΑΛΜΑ: το %s δεν υπάρχει" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Εγκατάσταση σε: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "URI επιπέδου 3" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Ορισμός του αριθμού των παράλληλων διεργασιών για το build" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Ορισμός επιπλέον καθρεπτικών τοποθεσιών (χωρισμένες με κενά)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." -msgstr "" -"λίστα επιπλέον πακέτων προς εγκατάσταση ως μέρος της αρχικής εγκατάστασης." +msgstr "λίστα επιπλέον πακέτων προς εγκατάσταση ως μέρος της αρχικής εγκατάστασης." #: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format @@ -576,15 +556,12 @@ #~ msgstr "" #~ "ορισμός της λίστας πακέτων προς εγκατάσταση μετά την ολοκλήρωση του base-" #~ "install" - #~ msgid "list of packages to install as part of the final installation." #~ msgstr "λίστα πακέτων προς εγκατάσταση ως μέρος της τελικής εγκατάστασης" - #~ msgid "Set the default locale" #~ msgstr "ορισμός της προεπιλεγμένης εντοπιότητας (locale)" - #~ msgid "Set the mirror location" #~ msgstr "ορισμός τοποθεσίας καθρέπτη" - #~ msgid "Set the distribution to be used for install" #~ msgstr "ορισμός της διανομής που θα χρησιμοποιηθεί για την εγκατάσταση" + diff -Nru ltsp-5.2.8/po/es.po ltsp-5.2.6/po/es.po --- ltsp-5.2.8/po/es.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/es.po 2011-03-03 21:09:09.000000000 +0000 @@ -10,11 +10,10 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-05 09:46+0200\n" "Last-Translator: José L. Redrejo Rodríguez \n" "Language-Team: spanish \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -95,7 +94,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "Establecer configuraciones locales predeterminadas" @@ -244,11 +243,8 @@ #: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" -"instalar en el chroot todos los archivos .deb que están en el directorio " -"proporcionado" +msgid "install to the chroot all the .deb files contained in the provided directory" +msgstr "instalar en el chroot todos los archivos .deb que están en el directorio proporcionado" #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format @@ -278,9 +274,7 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:29 #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"Nota: agregando distribución predterminada y componentes al servidor de " -"backports:" +msgstr "Nota: agregando distribución predterminada y componentes al servidor de backports:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -465,42 +459,42 @@ msgid "Get profile from a Quickstart server" msgstr "Obtener el perfil desde un servidor Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Quickstart manual: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Perfil por defecto de Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ERROR: %s no existe" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Instalando en: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Etapa 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Fijar el número de procesos en paralelo al comprimir" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Añadir mirror extra (separados por espacios)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "lista de paquetes a instalar como parte de la instalación inicial." @@ -563,10 +557,10 @@ #: ../server/ltsp-build-client:157 #, sh-format msgid "info: LTSP client installation completed successfully" -msgstr "" -"información: la instalación del cliente LTSP se completó satisfactoriamente" +msgstr "información: la instalación del cliente LTSP se completó satisfactoriamente" #: ../server/ltsp-build-client:159 #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "error: la instalación del cliente LTSP no finalizó correctamente" + diff -Nru ltsp-5.2.8/po/fi.po ltsp-5.2.6/po/fi.po --- ltsp-5.2.8/po/fi.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/fi.po 2011-03-03 21:09:09.000000000 +0000 @@ -1,18 +1,17 @@ -# Esko Arajärvi , 2009, 2011. +# Esko Arajärvi , 2009. msgid "" msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" -"PO-Revision-Date: 2011-03-19 13:16+0300\n" +"POT-Creation-Date: 2009-10-18 18:04-0700\n" +"PO-Revision-Date: 2009-10-23 21:27+0300\n" "Last-Translator: Esko Arajärvi \n" -"Language-Team: debian-10n-finnish@lists.debian.org\n" -"Language: fi\n" +"Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.6.1\n" #: ../server/configs/ALTLinux/ltsp-login.sh:30 #: ../server/configs/ALTLinux/ltsp-login.sh:33 @@ -72,431 +71,388 @@ msgid "Cancel" msgstr "Keskeytä" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 -#, sh-format -msgid "set the list of packages to install after base-install is completed" -msgstr "Luo luettelo perusasennuksen jälkeen asennettavista paketeista" - -#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 -#, sh-format -msgid "list of packages to install as part of the final installation" -msgstr "Luettelo lopullisen asennuksen osana asennettavista paketeista" - -#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 -#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 -#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 -#, sh-format -msgid "set the default locale" -msgstr "Aseta oletusmaa-asetus" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 -#, sh-format -msgid "Enable progress reporting" -msgstr "Ota edistymisen raportointi käyttöön" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 -#, sh-format -msgid "Print stage times (seconds)" -msgstr "Tulostusvaiheiden ajat (sekunteina)" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 +#: ../server/plugins/ltsp-build-client/common/010-set-base:3 #, sh-format -msgid "Draw progress bar" -msgstr "Piirrä edistymisen ilmaisin" +msgid "Set the default base install directory" +msgstr "Aseta oletushakemisto perusasennukselle" -#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format -msgid "prompt to set the root password, defaults to disabled" -msgstr "Pyydä asettamaan pääkäyttäjän salasana, oletuksena ei käytössä" +msgid "Load a user specific configuration file" +msgstr "Lataa käyttäjäkohtainen asetustiedosto" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 #, sh-format -msgid "enable serial console" -msgstr "Ota sarjakonsoli käyttöön" +msgid "set the target architecture" +msgstr "Aseta kohdearkkitehtuuri" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 #, sh-format -msgid "Enabling serial console..." -msgstr "Sarjakonsolia otetaan käyttöön..." - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 -#, fuzzy, sh-format -msgid "set the mirror location" -msgstr "Aseta peilipalvelimen sijainti" +msgid "ERROR: --arch %s called on unsupported arch: %s" +msgstr "VIRHE: --arch %s kutsui arkkitehtuuria ”%s”, jota ei tueta" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format -msgid "add a mirror, which takes priority over the default mirror" +msgid "ERROR: unsupported architecture. Check your --arch argument: %s" msgstr "" -"Lisää peilipalvelin, joka ohittaa tärkeysjärjestyksessä " -"oletuspeilipalvelimen" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 -#, sh-format -msgid "add a mirror, with lower priority than the default mirror" -msgstr "Lisää peilipalvelin, joka on tärkeysjärjestyksessä oletuspeilin jälkeen" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 -#, sh-format -msgid "add a security mirror" -msgstr "Lisää turvapeilipalvelin" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 -#, sh-format -msgid "set the kernel package to install." -msgstr "Valitse asennettava ydinpaketti" +"VIRHE: arkkitehtuuri, jota ei tueta. Tarkista valitsimen --arch argumentti: " +"%s" -#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 -#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 #, sh-format -msgid "keep cache of downloaded package files" -msgstr "Varastoi ladatut pakettitiedostot" +msgid " supported values are: %s" +msgstr " tuetut arvot ovat: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 #: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 #, sh-format -msgid "set the distribution to be used for install" +msgid "Set the distribution to be used for install" msgstr "Aseta asennuksessa käytettävä jakelu" -#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 #, sh-format -msgid "Set the i18n langs" -msgstr "Aseta i18n-kielet" +msgid "purge existing LTSP chroot if present" +msgstr "Siivoa LTSP-chroot, jos sellainen on olemassa" -#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 #, sh-format -msgid "set the kernel modules packages to install." -msgstr "Aseta asennettavien ydinmoduulipakettien luettelo" +msgid "Set the name of the chroot." +msgstr "Aseta chroot-ympäristön nimi" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/common/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 #, sh-format -msgid "set the target architecture" -msgstr "Aseta kohdearkkitehtuuri" +msgid "prompt to set the root password, defaults to disabled" +msgstr "Pyydä asettamaan pääkäyttäjän salasana, oletuksena ei käytössä" -#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format -msgid "include the listed keys in the apt keyring" -msgstr "Sisällytä listatut avaimet apt-avainrenkaaseen" +msgid "exclude packages from the initial chroot" +msgstr "Jätä pois paketteja ensimmäisestä chroot-ympäristöstä" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 +#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 #, sh-format -msgid "cache downloaded packages" -msgstr "Varastoi ladatut paketit" +msgid "Enable debug support" +msgstr "Ota käyttöön tuki ohjelmavirheiden jäljitykselle" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 #, sh-format -msgid "Copying packages" -msgstr "Paketteja kopioidaan" +msgid "Path to Quickstart profile" +msgstr "Quickstart-profiilin polku" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 #, sh-format -msgid "done." -msgstr "valmis." +msgid "Debug Quickstart" +msgstr "Käynnistä Quickstartin virheenjäljitys" -#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 -#, fuzzy, sh-format -msgid "create squashfs image for use with NBD" -msgstr "Luo squashfs-kuva käytettäväksi NBD:n kanssa" +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#, sh-format +msgid "Show external command output" +msgstr "Näytä ulkoisen komennon tuloste" -#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 #, sh-format -msgid "load debconf seeding in the chroot after install" -msgstr "" -"Lataa debconf-oletukset (seeding) chroot-ympäristössä asennuksen jälkeen" +msgid "Get profile from a Quickstart server" +msgstr "Hae profiili Quickstart-palvelimelta" -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format -msgid "mount package cache dir from server" -msgstr "Liitä pakettivarastohakemisto palvelimelta" +msgid "Manual Quickstart: %s" +msgstr "Manuaalinen Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format -msgid "mount a server directory as the chroot package cache dir" -msgstr "Liitä chroot-ympäristön pakettivarastohakemisto palvelimelta" +msgid "Default Quickstart profile: %s" +msgstr "Quickstartin oletusprofiili: %s" -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" -"Asenna chroot-ympäristöön kaikki annetussa hakemistossa olevat .deb-" -"tiedostot." +msgid "ERROR: %s does not exist" +msgstr "VIRHE: ”%s” ei ole olemassa" -#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format -msgid "allow unsigned packages during install" -msgstr "Salli allekirjoittamat paketit asennuksen aikana" +msgid "Installing into: %s" +msgstr "Asennetaan sijaintiin: %s" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format -msgid "copy apt Packages files from server" -msgstr "Kopioi aptit Packages-tiedostot palvelimelta" +msgid "Stage 3 URI" +msgstr "Vaiheen 3 URI" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format -msgid "add a backports mirror" -msgstr "Lisää backports-peilipalvelin" +msgid "Set the number of parallel build processes" +msgstr "Anna rinnakkaisten käännösprosessien lukumäärä" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "Backports-varastosta asennettavien pakettien luettelo" +msgid "Set extra mirror locations (space-separated)" +msgstr "Anna lisäpeilien sijainnit (välilyönnein eroteltuna)" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 +#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #, sh-format -msgid "distribution to pull backports from" -msgstr "Jakelu, jonka paketteja backportsista haetaan" +msgid "Set the default locale" +msgstr "Aseta oletusmaa-asetus" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 -#, fuzzy, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"HUOM: oletusjakelu ja -komponentit lisätään backports-peilipalvelimelle:" +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 +#, sh-format +msgid "list of extra packages to install as part of the initial installation." +msgstr "Luettelo ensiasennuksen osana asennettavista lisäpaketeista." -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 #, sh-format -msgid "distribution to set up apt pinning" -msgstr "Jakelu, jota aptin tulisi seurata" +msgid "Enable LTSP-Cluster" +msgstr "Ota LTSP-Cluster käyttöön" -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 #, sh-format -msgid "list of packages to install from the pinned distribution" -msgstr "Valitusta jakelusta asennettavien pakettien luettelo" +msgid "force to skip the squashfs build (for debian-installer)." +msgstr "Pakota ohittamaan squashfs:n kääntäminen (debian-asentimelle)" -#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #, sh-format -msgid "a simple webkiosk mode" +msgid "a simple webkiosk mode." msgstr "Yksinkertainen verkkokioskitila" -#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 #, sh-format -msgid "mounts CDROM before installation" -msgstr "Liittä CDROM ennen asennusta" +msgid "use the servers sources.list instead of generating one" +msgstr "Käytä palvelimen sources.list-tiedostoa äläkä luo uutta" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 #, sh-format -msgid "use specified http proxy" -msgstr "Käytä määritettyä http-välityspalvelinta" +msgid "Set the mirror location" +msgstr "Aseta peilipalvelimen sijainti" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 #, sh-format -msgid "do not autodetect apt proxy configuration" -msgstr "Älä selvitä automaattisesti aptin välityspalvelinasetuksia" +msgid "add a mirror, which takes priority over the default mirror" +msgstr "" +"Lisää peilipalvelin, joka ohittaa tärkeysjärjestyksessä oletuspeilipalvelimen" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 #, sh-format -msgid "enable popularity-contest in the chroot" -msgstr "Ota popularity-contest käyttöön chroot-ympäristössä" +msgid "add a mirror, with lower priority than the default mirror" +msgstr "" +"Lisää peilipalvelin, joka on tärkeysjärjestyksessä oletuspeilin jälkeen" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 -#, sh-format -msgid "Enabling popularity contest..." -msgstr "Popularity contest otetaan käyttöön..." +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:6, sh-format +msgid "Set the security mirror location" +msgstr "Aseta turvapeilipalvelimen sijainti" -#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-manage-mirror:7, sh-format +msgid "Set the update mirror location" +msgstr "Aseta päivityspeilipalvelimen sijainti" + +#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 #, sh-format -msgid "set the components to be used in mirror" -msgstr "Aseta peilipalvelimella käytettävät komponentit" +msgid "Set the i18n langs" +msgstr "Aseta i18n-kielet" -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 #, sh-format -msgid "create ext2 image for use with NBD" -msgstr "Luo ext2-kuva käytettäväksi NBD:n kanssa" +msgid "keep cache of downloaded package files" +msgstr "Varastoi ladatut pakettitiedostot" -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 #, sh-format -msgid "create image for use with NBD of the specified filesystem" -msgstr "Luo levykuva käytettäväksi annetun tiedostojärjestelmän NBD:n kanssa." +msgid "set the kernel modules packages to install." +msgstr "Aseta asennettavien ydinmoduulipakettien lista" -#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:6 #, sh-format -msgid "skip upgrade of installed packages" -msgstr "Ohita asennettujen pakettien päivitys" +msgid "add a security mirror" +msgstr "Lisää turvapeilipalvelin" -#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format -msgid "set the list of kernel packages to install" -msgstr "Valitse asennettavien ydinpakettien lista." +msgid "set the list of packages to install after base-install is completed." +msgstr "" +"Aseta lista perusasennuksen päättymisen jälkeen asennettavista paketeista" -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 #, sh-format -msgid "NOTE: adding default dist and components to security mirror:" -msgstr "HUOM: oletusjakelu ja -komponentit lisätään turvapeilipalvelimelle:" +msgid "Enable progress reporting" +msgstr "Ota edistymisen raportointi käyttöön" -#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 #, sh-format -msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "" -"HUOM: jakelun sid APT-turvapäivityslähde poistetaan käytöstä. Sitä ei ole " -"olemassa." +msgid "Print stage times (seconds)" +msgstr "Tulostusvaiheiden ajat (sekunteina)" -#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 #, sh-format -msgid "exclude packages from the initial chroot" -msgstr "Jätä pois paketteja ensimmäisestä chroot-ympäristöstä" +msgid "Draw progress bar" +msgstr "Piirrä edistymisen ilmaisin" -#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 #, sh-format -msgid "load a user specific configuration file" -msgstr "Lataa käyttäjäkohtainen asetustiedosto" +msgid "set the kernel package to install." +msgstr "Aseta asennettava ydinpaketti" -#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 #, sh-format -msgid "purge existing LTSP chroot if present" -msgstr "Siivoa LTSP-chroot, jos sellainen on olemassa" +msgid "list of packages to install as part of the final installation." +msgstr "Lista lopullisen asennuksen osana asennettavista paketeista" -#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 #, sh-format -msgid "enable debug support" -msgstr "Ota käyttöön tuki ohjelmavirheiden jäljitykselle" +msgid "enable serial console" +msgstr "Ota sarjakonsoli käyttöön" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 #, sh-format -msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "VIRHE: --arch %s kutsui arkkitehtuuria ”%s”, jota ei tueta" +msgid "Enabling serial console..." +msgstr "Otetaan sarjakonsoli käyttöön..." -#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 #, sh-format -msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "" -"VIRHE: arkkitehtuuri, jota ei tueta. Tarkista valitsimen --arch argumentti: " -"%s" +msgid "include the listed keys in the apt keyring" +msgstr "Sisällytä listatut avaimet apt-avainrenkaaseen" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 #, sh-format -msgid " supported values are: %s" -msgstr " tuetut arvot ovat: %s" +msgid "mount package cache dir from server" +msgstr "Liitä pakettivarastohakemisto palvelimelta" -#: ../server/plugins/ltsp-build-client/common/010-set-base:3 +#: ../server/plugins/ltsp-build-client/Debian/010-security-mirror:8 #, sh-format -msgid "set the default base install directory" -msgstr "Aseta oletushakemisto perusasennukselle" +msgid "NOTE: adding default dist and components to security mirror:" +msgstr "HUOM: oletusjakelu ja -komponentit lisätään turvapeilipalvelimelle:" -#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 +#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 #, sh-format -msgid "set the name of the chroot" -msgstr "Aseta chroot-ympäristön nimi" +msgid "create squashfs image for use with NBD." +msgstr "Luo squashfs-kuva käytettäväksi NBD:n kanssa" -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 +#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 #, sh-format -msgid "set the security mirror location" -msgstr "Aseta turvapeilipalvelimen sijainti" +msgid "load debconf seeding in the chroot after install" +msgstr "Lataa debconf seeding chroot-ympäristössä asennuksen jälkeen" -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 #, sh-format -msgid "set the update mirror location" -msgstr "Aseta päivityspeilipalvelimen sijainti" +msgid "copy apt Packages files from server" +msgstr "Kopioi apt-pakettitiedostot palvelimelta" -#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 #, sh-format -msgid "use the servers sources.list instead of generating one" -msgstr "Käytä palvelimen sources.list-tiedostoa äläkä luo uutta" +msgid "cache downloaded packages" +msgstr "Varastoi ladatut paketit" -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 #, sh-format -msgid "run most or all applications locally" -msgstr "Aja useimmat tai kaikki ohjelmat paikallisesti" +msgid "Copying packages" +msgstr "Paketteja kopioidaan" -#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 #, sh-format -msgid "enable LTSP-Cluster" -msgstr "Ota LTSP-Cluster käyttöön" +msgid "done." +msgstr "valmis." -#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 +#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 #, sh-format -msgid "force to skip the squashfs build (for debian-installer)" -msgstr "Pakota ohittamaan squashfs:n kääntäminen (debian-asentimelle)" +msgid "skip upgrade of installed packages." +msgstr "Ohita asennettujen pakettien päivitys" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 #, sh-format -msgid "Path to Quickstart profile" -msgstr "Quickstart-profiilin polku" +msgid "set the list of kernel packages to install." +msgstr "Aseta asennettavien ydinpakettien lista." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 +#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format -msgid "Debug Quickstart" -msgstr "Käynnistä Quickstartin virheenjäljitys" +msgid "NOTE: disabling security APT source for sid. It does not exist." +msgstr "" +"HUOM: jakelun sid APT-turvapäivityslähde poistetaan käytöstä. Sitä ei ole " +"olemassa." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format -msgid "Show external command output" -msgstr "Näytä ulkoisen komennon tuloste" +msgid "allow unsigned packages during install." +msgstr "Salli allekirjoittamat paketit asennuksen aikana" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 +#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 #, sh-format -msgid "Get profile from a Quickstart server" -msgstr "Hae profiili Quickstart-palvelimelta" +msgid "Set the components to be used in mirror" +msgstr "Aseta peilipalvelimella käytettävät komponentit" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 #, sh-format -msgid "Manual Quickstart: %s" -msgstr "Manuaalinen Quickstart: %s" +msgid "create ext2 image for use with NBD" +msgstr "Luo ext2-kuva käytettäväksi NBD:n kanssa" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 #, sh-format -msgid "Default Quickstart profile: %s" -msgstr "Quickstartin oletusprofiili: %s" +msgid "create image for use with NBD of the specified filesystem" +msgstr "Luo levykuva käytettäväksi annetun tiedostojärjestelmän NBD:n kanssa." -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 #, sh-format -msgid "ERROR: %s does not exist" -msgstr "VIRHE: ”%s” ei ole olemassa" +msgid "use specified http proxy" +msgstr "Käytä määriteltyä http-välityspalvelinta" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 #, sh-format -msgid "Installing into: %s" -msgstr "Asennetaan sijaintiin: %s" +msgid "do not autodetect apt proxy configuration" +msgstr "Älä selvitä automaattisesti apt-välityspalvelimen asetuksia" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format -msgid "Stage 3 URI" -msgstr "Vaiheen 3 URI" +msgid "distribution to set up apt pinning" +msgstr "Jakelu, jota aptin tulisi seurata" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format -msgid "Set the number of parallel build processes" -msgstr "Anna rinnakkaisten käännösprosessien lukumäärä" +msgid "list of packages to install from the pinned distribution" +msgstr "Valitusta jakelusta asennettavien pakettien luettelo" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 #, sh-format -msgid "Set extra mirror locations (space-separated)" -msgstr "Anna lisäpeilien sijainnit (välilyönnein eroteltuna)" +msgid "enable popularity-contest in the chroot" +msgstr "Ota popularity-contest käyttöön chroot-ympäristössä" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 #, sh-format -msgid "list of extra packages to install as part of the initial installation." -msgstr "Luettelo ensiasennuksen osana asennettavista lisäpaketeista." +msgid "Enabling popularity contest..." +msgstr "Otetaan popularity contest käyttöön..." -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 #, sh-format -msgid "Load a user specific configuration file" -msgstr "Lataa käyttäjäkohtainen asetustiedosto" +msgid "mounts CDROM before installation" +msgstr "Liittää CDROM:in ennen asennusta" #: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 #, sh-format @@ -518,42 +474,42 @@ msgid "Distro name" msgstr "Jakelun nimi" -#: ../server/ltsp-build-client:89 +#: ../server/ltsp-build-client:83 #, sh-format msgid "API ERROR: you need to provide true or false." msgstr "API-VIRHE: sinun tulee antaa tosi (true) tai epätosi (false)" -#: ../server/ltsp-build-client:132 +#: ../server/ltsp-build-client:126 #, sh-format -msgid "display this help message" +msgid "Display this help message" msgstr "Näytä tämä ohjeviesti" -#: ../server/ltsp-build-client:133 +#: ../server/ltsp-build-client:127 #, sh-format -msgid "display help for all available commandline options" +msgid "Display help for all available commandline options" msgstr "Näytä kaikkien käytettävissä olevien komentorivivalitsimien ohje" -#: ../server/ltsp-build-client:137 +#: ../server/ltsp-build-client:131 #, sh-format msgid "LTSP Build Client usage:" -msgstr "LTSP Build Clientin (käännösohjelman) käyttö:" +msgstr "LTSP Build Clientin käyttö:" -#: ../server/ltsp-build-client:141 +#: ../server/ltsp-build-client:135 #, sh-format msgid " Regular options:" msgstr " Normaalit valitsimet:" -#: ../server/ltsp-build-client:145 +#: ../server/ltsp-build-client:139 #, sh-format msgid " Advanced options:" msgstr " Lisävalitsimet:" -#: ../server/ltsp-build-client:157 +#: ../server/ltsp-build-client:151 #, sh-format msgid "info: LTSP client installation completed successfully" -msgstr "Info: LTSP-asiakkaan asennus päättyi onnistuneesti" +msgstr "info: LTSP-asiakkaan asennus päättyi onnistuneesti" -#: ../server/ltsp-build-client:159 +#: ../server/ltsp-build-client:153 #, sh-format msgid "error: LTSP client installation ended abnormally" -msgstr "Virhe: LTSP-asiakkaan asennus päättyi poikkeavasti" +msgstr "virhe: LTSP-asiakkaan asennus päättyi poikkeavasti" diff -Nru ltsp-5.2.8/po/fr.po ltsp-5.2.6/po/fr.po --- ltsp-5.2.8/po/fr.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/fr.po 2011-03-03 21:09:09.000000000 +0000 @@ -9,11 +9,10 @@ msgstr "" "Project-Id-Version: ltsp 5.1.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-01-15 12:06+0100\n" "Last-Translator: Jean-Baka Domelevo Entfellner \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -93,7 +92,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "indiquer les paramètres régionaux (« locale ») par défaut" @@ -257,7 +256,8 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:4 #, sh-format msgid "list of packages to install from the backports repositories" -msgstr "liste des paquets à installer depuis les backports" +msgstr "" +"liste des paquets à installer depuis les backports" #: ../server/plugins/ltsp-build-client/Debian/015-backports:5 #, sh-format @@ -268,8 +268,8 @@ #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" msgstr "" -"Note : ajout des distributions et des composants par défaut au miroir de " -"backports :" +"Note : ajout des distributions et des composants par défaut au miroir " +"de backports :" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -462,42 +462,42 @@ msgid "Get profile from a Quickstart server" msgstr "Récupérer le profil depuis un serveur Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Quickstart manuel: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Profil Quickstart par défaut: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ERREUR : %s n'existe pas" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Installation dans: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "URL de l'étape 3" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Définir le nombre de processus de compilation simultanés" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Indiquer d'autres adresses de miroir (séparées par un espace)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "" diff -Nru ltsp-5.2.8/po/it.po ltsp-5.2.6/po/it.po --- ltsp-5.2.8/po/it.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/it.po 2011-03-03 21:09:09.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-05 08:17+0200\n" "Last-Translator: Vincenzo Campanella \n" "Language-Team: Italian \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -92,7 +91,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "imposta la localizzazione predefinita" @@ -458,42 +457,42 @@ msgid "Get profile from a Quickstart server" msgstr "Ottieni il profilo da un server Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Quickstart manuale: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Profilo Quickstart predefinito: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ERRORE: %s inesistente" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Installazione in corso in: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Passo 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Imposta il numero di processi di compilazione paralleli" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Imposta percorsi di mirror supplementari (separati da spazi)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "" diff -Nru ltsp-5.2.8/po/ja.po ltsp-5.2.6/po/ja.po --- ltsp-5.2.8/po/ja.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/ja.po 2011-03-03 21:09:09.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-09 09:58+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -89,7 +88,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "デフォルトのロケールを設定する" @@ -228,16 +227,16 @@ #, sh-format msgid "mount a server directory as the chroot package cache dir" msgstr "" -"サーバのディレクトリを chroot のパッケージキャッシュディレクトリとしてマウン" -"トする" +"サーバのディレクトリを chroot のパッケージキャッシュディレクトリとして" +"マウントする" #: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 #, sh-format msgid "" "install to the chroot all the .deb files contained in the provided directory" msgstr "" -"指定したディレクトリ内に含まれているすべての .deb ファイルを chroot にインス" -"トールする" +"指定したディレクトリ内に含まれているすべての .deb ファイルを chroot に" +"インストールする" #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format @@ -257,7 +256,8 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:4 #, sh-format msgid "list of packages to install from the backports repositories" -msgstr "backports リポジトリからインストールするパッケージの一覧" +msgstr "" +"backports リポジトリからインストールするパッケージの一覧" #: ../server/plugins/ltsp-build-client/Debian/015-backports:5 #, sh-format @@ -267,7 +267,8 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:29 #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "注意: デフォルトの dist と components を backports ミラーに追加します:" +msgstr "" +"注意: デフォルトの dist と components を backports ミラーに追加します:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -277,7 +278,8 @@ #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format msgid "list of packages to install from the pinned distribution" -msgstr "pin が設定されたディストリビューションからインストールするパッケージ群" +msgstr "" +"pin が設定されたディストリビューションからインストールするパッケージ群" #: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 @@ -456,42 +458,42 @@ msgid "Get profile from a Quickstart server" msgstr "Quickstart サーバからプロファイルを取得する" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "手動での Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "デフォルトの Quickstart プロファイル: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "エラー: %s は存在しません" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "以下にインストールしています: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Stage 3 の URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "並列ビルドのプロセス数を設定する" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "外部ミラーを指定する (空白で区切ること)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "初期インストールの一部としてインストールする追加パッケージ群" @@ -560,3 +562,5 @@ #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "エラー: LTSP クライアントのインストールは途中で異常終了しました" + + diff -Nru ltsp-5.2.8/po/ltsp.pot ltsp-5.2.6/po/ltsp.pot --- ltsp-5.2.8/po/ltsp.pot 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/ltsp.pot 2011-03-03 21:09:09.000000000 +0000 @@ -6,13 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ltsp 5.2.6\n" +"Project-Id-Version: ltsp 5.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -90,7 +89,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "" @@ -446,42 +445,42 @@ msgid "Get profile from a Quickstart server" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "" diff -Nru ltsp-5.2.8/po/pl.po ltsp-5.2.6/po/pl.po --- ltsp-5.2.8/po/pl.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/pl.po 2011-03-03 21:09:09.000000000 +0000 @@ -7,11 +7,10 @@ msgstr "" "Project-Id-Version: ltsp 5.1.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-01-23 13:12-0800\n" "PO-Revision-Date: 2010-01-23 18:01+0100\n" "Last-Translator: Wiktor Wandachowicz \n" "Language-Team: Polish \n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -90,7 +89,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "określ domyślne ustawienia językowe" @@ -111,7 +110,7 @@ msgstr "Wyświetlaj pasek postępu" #: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/common/095-rootpass:3 #, sh-format msgid "prompt to set the root password, defaults to disabled" msgstr "wyświetlaj prośbę o zmianę hasła administratora, domyślnie wyłączone" @@ -233,12 +232,6 @@ msgid "mount a server directory as the chroot package cache dir" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 -#, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" - #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format msgid "allow unsigned packages during install" @@ -249,29 +242,6 @@ msgid "copy apt Packages files from server" msgstr "kopiuj pliki Packages dla apt z serwera" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 -#, fuzzy, sh-format -msgid "add a backports mirror" -msgstr "dodaj źródło z poprawkami bezpieczeństwa" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 -#, fuzzy, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "" -"lista pakietów do instalacji z dystrybucji z ustawionym przypinaniem pakietów" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 -#, fuzzy, sh-format -msgid "distribution to pull backports from" -msgstr "dystrybucja dla której ustawić przypinanie pakietów" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 -#, fuzzy, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"UWAGA: włączanie domyślnej dystrybucji i komponentów do źródła poprawek " -"bezpieczeństwa:" - #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format msgid "distribution to set up apt pinning" @@ -459,43 +429,43 @@ msgid "Get profile from a Quickstart server" msgstr "Pobierz profil z serwera Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Ręczny Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Domyślny profil Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "BŁĄD: %s nie istnieje" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Instalowanie do: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "URI dla etapu 3" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Określ ilość równoczesnych procesów budowania" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "" "Określ dodatkowe adresy serwerów dla źródeł pakietów (rozdzielone spacjami)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "" diff -Nru ltsp-5.2.8/po/pt_BR.po ltsp-5.2.6/po/pt_BR.po --- ltsp-5.2.8/po/pt_BR.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/pt_BR.po 2011-03-03 21:09:09.000000000 +0000 @@ -9,267 +9,158 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2009-01-23 22:44-0500\n" "PO-Revision-Date: 2007-10-24 02:08-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../server/configs/ALTLinux/ltsp-login.sh:30 -#: ../server/configs/ALTLinux/ltsp-login.sh:33 -#: ../server/configs/ALTLinux/ltsp-login.sh:40 -#: ../server/configs/ALTLinux/ltsp-login.sh:50 +#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 #, sh-format -msgid "Login Error" -msgstr "" +msgid "Set the distribution to be used for install" +msgstr "Definir a distribuição a ser usada para instalação" -#: ../server/configs/ALTLinux/ltsp-login.sh:31 -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:44 -#: ../server/configs/ALTLinux/ltsp-login.sh:52 -#: ../server/configs/ALTLinux/ltsp-login.sh:62 -#: ../server/configs/ALTLinux/ltsp-login.sh:81 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:95 -#: ../server/configs/ALTLinux/ltsp-login.sh:105 -#: ../server/configs/ALTLinux/ltsp-login.sh:115 +#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format -msgid "User" -msgstr "" +msgid "Load a user specific configuration file" +msgstr "Carregar um arquivo de configuração específico do usuário" -#: ../server/configs/ALTLinux/ltsp-login.sh:31 -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:44 -#: ../server/configs/ALTLinux/ltsp-login.sh:52 -#: ../server/configs/ALTLinux/ltsp-login.sh:62 -#: ../server/configs/ALTLinux/ltsp-login.sh:81 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:95 -#: ../server/configs/ALTLinux/ltsp-login.sh:105 -#: ../server/configs/ALTLinux/ltsp-login.sh:115 +#: ../server/plugins/ltsp-build-client/common/010-set-base:3 #, sh-format -msgid "already logged in!" -msgstr "" +msgid "Set the default base install directory" +msgstr "Definir o diretório de instalação do sistema básico" -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:43 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:93 -#: ../server/configs/ALTLinux/ltsp-login.sh:117 +#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 #, sh-format -msgid "Continue" -msgstr "" +msgid "Set the name of the chroot." +msgstr "Definir o nome do chroot." -#: ../server/configs/ALTLinux/ltsp-login.sh:80 -#: ../server/configs/ALTLinux/ltsp-login.sh:83 -#: ../server/configs/ALTLinux/ltsp-login.sh:90 -#: ../server/configs/ALTLinux/ltsp-login.sh:103 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 #, sh-format -msgid "Login Warning" -msgstr "" +msgid "set the target architecture" +msgstr "definir a arquitetura alvo" -#: ../server/configs/ALTLinux/ltsp-login.sh:94 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:20 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:42 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 #, sh-format -msgid "Cancel" -msgstr "" - -#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 -#, fuzzy, sh-format -msgid "set the list of packages to install after base-install is completed" -msgstr "" -"definir a lista de pacotes a serem instalados após a instalação básica " -"finalizar." - -#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 -#, fuzzy, sh-format -msgid "list of packages to install as part of the final installation" -msgstr "lista de pacotes para instalar como parte da instalação final." - -#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 -#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 -#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 -#, fuzzy, sh-format -msgid "set the default locale" -msgstr "Definir o locale padrão" +msgid "ERROR: --arch %s called on unsupported arch: %s" +msgstr "ERRO: --arch %s chamado em uma arquitetura não suportada: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:49 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 #, sh-format -msgid "Enable progress reporting" -msgstr "" +msgid "ERROR: unsupported architecture. Check your --arch argument: %s" +msgstr "ERRO: arquitetura não suportada. Confira seu argumento --arch: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:50 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 #, sh-format -msgid "Print stage times (seconds)" -msgstr "" +msgid " supported values are: %s" +msgstr " valores suportados são: %s" -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 +#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 #, sh-format -msgid "Draw progress bar" -msgstr "" +msgid "exclude packages from the initial chroot" +msgstr "excluir pacotes do chroot inicial" +#: ../server/plugins/ltsp-build-client/common/095-rootpass:3 #: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 #, sh-format msgid "prompt to set the root password, defaults to disabled" msgstr "questionar se deve definir a senha de root, o padrão é desabilitá-la" -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 -#, sh-format -msgid "enable serial console" -msgstr "habilitar console serial" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 #, sh-format -msgid "Enabling serial console..." -msgstr "Habilitando console serial..." - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 -#, fuzzy, sh-format -msgid "set the mirror location" -msgstr "Definir a localização do espelho" +msgid "Enable debug support" +msgstr "Habilitar suporte a depuração" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format -msgid "add a mirror, which takes priority over the default mirror" +msgid "Stage 3 URI" msgstr "" -"adicionar um espelho que receberá uma prioridade maior que o espelho padrão" -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format -msgid "add a mirror, with lower priority than the default mirror" +msgid "Set the number of parallel build processes" msgstr "" -"adicionar um espelho que receberá uma prioridade menor que o espelho padrão" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 -#, sh-format -msgid "add a security mirror" -msgstr "adicionar um espelho de segurança" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 -#, fuzzy, sh-format -msgid "set the kernel package to install." -msgstr "definir a lista de pacotes de kernel a serem instalados." - -#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 -#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 -#, sh-format -msgid "keep cache of downloaded package files" -msgstr "manter cache de arquivos de pacotes baixados" -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 -#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 -#, fuzzy, sh-format -msgid "set the distribution to be used for install" -msgstr "Definir a distribuição a ser usada para instalação" - -#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, fuzzy, sh-format -msgid "Set the i18n langs" +msgid "Set extra mirror locations (space-separated)" msgstr "Definir a localização do espelho" -#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 -#, fuzzy, sh-format -msgid "set the kernel modules packages to install." -msgstr "definir a lista de pacotes de kernel a serem instalados." - -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 -#, sh-format -msgid "set the target architecture" -msgstr "definir a arquitetura alvo" - -#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 #, sh-format -msgid "include the listed keys in the apt keyring" -msgstr "incluir as chaves listadas no chaveiro do apt" +msgid "Set the default locale" +msgstr "Definir o locale padrão" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 -#, sh-format -msgid "cache downloaded packages" -msgstr "manter cache de pacotes baixados" +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 +#, fuzzy, sh-format +msgid "list of extra packages to install as part of the initial installation." +msgstr "lista de pacotes para instalar como parte da instalação final." -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 #, sh-format -msgid "Copying packages" +msgid "Path to Quickstart profile" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 #, sh-format -msgid "done." +msgid "Debug Quickstart" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 #, sh-format -msgid "create squashfs image for use with NBD" +msgid "Show external command output" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 -#, sh-format -msgid "load debconf seeding in the chroot after install" -msgstr "carregar pré-configuração debconf no chroot após a instalação" - -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 #, sh-format -msgid "mount package cache dir from server" +msgid "Get profile from a Quickstart server" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format -msgid "mount a server directory as the chroot package cache dir" +msgid "Manual Quickstart: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" +msgid "Default Quickstart profile: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 -#, fuzzy, sh-format -msgid "allow unsigned packages during install" -msgstr "permitir pacotes não assinados durante a instalação." - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format -msgid "copy apt Packages files from server" +msgid "ERROR: %s does not exist" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 -#, fuzzy, sh-format -msgid "add a backports mirror" -msgstr "adicionar um espelho de segurança" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 -#, fuzzy, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "lista de pacotes para instalar como parte da instalação final." - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format -msgid "distribution to pull backports from" +msgid "Installing into: %s" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 -#, fuzzy, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" +#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#, sh-format +msgid "mounts CDROM before installation" msgstr "" -"NOTA: adicionando dist padrão e components para o espelho de segurança:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -281,41 +172,53 @@ msgid "list of packages to install from the pinned distribution" msgstr "lista de pacotes para instalar como parte da instalação final." -#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 -#, fuzzy, sh-format -msgid "a simple webkiosk mode" -msgstr "um simples modo \"quiosque web\"" +#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 +#, sh-format +msgid "set the list of kernel packages to install." +msgstr "definir a lista de pacotes de kernel a serem instalados." -#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 #, sh-format -msgid "mounts CDROM before installation" -msgstr "" +msgid "include the listed keys in the apt keyring" +msgstr "incluir as chaves listadas no chaveiro do apt" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 #, sh-format -msgid "use specified http proxy" +msgid "mount package cache dir from server" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 #, sh-format -msgid "do not autodetect apt proxy configuration" +msgid "Set the mirror location" +msgstr "Definir a localização do espelho" + +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 +#, sh-format +msgid "add a mirror, which takes priority over the default mirror" msgstr "" +"adicionar um espelho que receberá uma prioridade maior que o espelho padrão" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 #, sh-format -msgid "enable popularity-contest in the chroot" -msgstr "habilitar popularity-contest no chroot" +msgid "add a mirror, with lower priority than the default mirror" +msgstr "" +"adicionar um espelho que receberá uma prioridade menor que o espelho padrão" -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 #, sh-format -msgid "Enabling popularity contest..." -msgstr "Habilitando concurso de popularidade..." +msgid "add a security mirror" +msgstr "adicionar um espelho de segurança" -#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 -#, fuzzy, sh-format -msgid "set the components to be used in mirror" -msgstr "Definir os componentes a serem usados no espelho" +#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/090-clean-package-cache:3 +#, sh-format +msgid "keep cache of downloaded package files" +msgstr "manter cache de arquivos de pacotes baixados" #: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 #, sh-format @@ -327,233 +230,281 @@ msgid "create image for use with NBD of the specified filesystem" msgstr "" -#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 -#, fuzzy, sh-format -msgid "skip upgrade of installed packages" -msgstr "manter cache de arquivos de pacotes baixados" - -#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 -#, fuzzy, sh-format -msgid "set the list of kernel packages to install" -msgstr "definir a lista de pacotes de kernel a serem instalados." - -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 +#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 #, sh-format -msgid "NOTE: adding default dist and components to security mirror:" +msgid "create squashfs image for use with NBD." msgstr "" -"NOTA: adicionando dist padrão e components para o espelho de segurança:" -#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 #, sh-format -msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "NOTA: desabilitando fonte APT de segurança para sid. Isto não existe." +msgid "enable serial console" +msgstr "habilitar console serial" -#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 #, sh-format -msgid "exclude packages from the initial chroot" -msgstr "excluir pacotes do chroot inicial" +msgid "Enabling serial console..." +msgstr "Habilitando console serial..." -#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 -#, fuzzy, sh-format -msgid "load a user specific configuration file" -msgstr "Carregar um arquivo de configuração específico do usuário" +#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#, sh-format +msgid "a simple webkiosk mode." +msgstr "um simples modo \"quiosque web\"" -#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 #, sh-format -msgid "purge existing LTSP chroot if present" -msgstr "" +msgid "enable popularity-contest in the chroot" +msgstr "habilitar popularity-contest no chroot" -#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 -#, fuzzy, sh-format -msgid "enable debug support" -msgstr "Habilitar suporte a depuração" +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 +#, sh-format +msgid "Enabling popularity contest..." +msgstr "Habilitando concurso de popularidade..." -#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 +#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format -msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "ERRO: --arch %s chamado em uma arquitetura não suportada: %s" +msgid "NOTE: disabling security APT source for sid. It does not exist." +msgstr "NOTA: desabilitando fonte APT de segurança para sid. Isto não existe." -#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 #, sh-format -msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "ERRO: arquitetura não suportada. Confira seu argumento --arch: %s" +msgid "Set the components to be used in mirror" +msgstr "Definir os componentes a serem usados no espelho" -#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 +#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format -msgid " supported values are: %s" -msgstr " valores suportados são: %s" +msgid "allow unsigned packages during install." +msgstr "permitir pacotes não assinados durante a instalação." -#: ../server/plugins/ltsp-build-client/common/010-set-base:3 -#, fuzzy, sh-format -msgid "set the default base install directory" -msgstr "Definir o diretório de instalação do sistema básico" +#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-early-packages:3 +#, sh-format +msgid "set the list of packages to install after base-install is completed." +msgstr "" +"definir a lista de pacotes a serem instalados após a instalação básica " +"finalizar." -#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 -#, fuzzy, sh-format -msgid "set the name of the chroot" -msgstr "Definir o nome do chroot." +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 +#, sh-format +msgid "copy apt Packages files from server" +msgstr "" -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 -#, fuzzy, sh-format -msgid "set the security mirror location" -msgstr "Definir a localização do espelho" +#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-late-packages:3 +#, sh-format +msgid "list of packages to install as part of the final installation." +msgstr "lista de pacotes para instalar como parte da instalação final." -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 +#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 #, fuzzy, sh-format -msgid "set the update mirror location" -msgstr "Definir a localização do espelho" +msgid "skip upgrade of installed packages." +msgstr "manter cache de arquivos de pacotes baixados" -#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 #, sh-format -msgid "use the servers sources.list instead of generating one" -msgstr "usar o sources.list dos servidores ao invés do que foi gerado" +msgid "cache downloaded packages" +msgstr "manter cache de pacotes baixados" -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 #, sh-format -msgid "run most or all applications locally" +msgid "Copying packages" msgstr "" -#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 #, sh-format -msgid "enable LTSP-Cluster" +msgid "done." msgstr "" -#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 -#, fuzzy, sh-format -msgid "force to skip the squashfs build (for debian-installer)" -msgstr "forçar pular a construção do squashfs (para o debian-installer)." +#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 +#, sh-format +msgid "load debconf seeding in the chroot after install" +msgstr "carregar pré-configuração debconf no chroot após a instalação" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 #, sh-format -msgid "Path to Quickstart profile" +msgid "use specified http proxy" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 #, sh-format -msgid "Debug Quickstart" +msgid "do not autodetect apt proxy configuration" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#: ../server/plugins/ltsp-build-client/Debian/010-security-mirror:8 +#: ../server/plugins/ltsp-build-client/Ubuntu/010-security-mirror:8 #, sh-format -msgid "Show external command output" +msgid "NOTE: adding default dist and components to security mirror:" msgstr "" +"NOTA: adicionando dist padrão e components para o espelho de segurança:" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 #, sh-format -msgid "Get profile from a Quickstart server" +msgid "Path to kickstart file" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:12 #, sh-format -msgid "Manual Quickstart: %s" +msgid "Path to chroot-creator cache" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:13 #, sh-format -msgid "Default Quickstart profile: %s" +msgid "Release version number" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:14 #, sh-format -msgid "ERROR: %s does not exist" +msgid "Distro name" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 +#, fuzzy, sh-format +msgid "set the kernel package to install." +msgstr "definir a lista de pacotes de kernel a serem instalados." + +#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#, fuzzy, sh-format +msgid "set the kernel modules packages to install." +msgstr "definir a lista de pacotes de kernel a serem instalados." + +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 #, sh-format -msgid "Installing into: %s" +msgid "Enable progress reporting" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 #, sh-format -msgid "Stage 3 URI" +msgid "Print stage times (seconds)" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 #, sh-format -msgid "Set the number of parallel build processes" +msgid "Draw progress bar" msgstr "" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 #, fuzzy, sh-format -msgid "Set extra mirror locations (space-separated)" +msgid "Set the i18n langs" msgstr "Definir a localização do espelho" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 -#, fuzzy, sh-format -msgid "list of extra packages to install as part of the initial installation." -msgstr "lista de pacotes para instalar como parte da instalação final." +#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 +#, sh-format +msgid "force to skip the squashfs build (for debian-installer)." +msgstr "forçar pular a construção do squashfs (para o debian-installer)." -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 #, sh-format -msgid "Load a user specific configuration file" -msgstr "Carregar um arquivo de configuração específico do usuário" +msgid "Enable LTSP-Cluster" +msgstr "" -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:4 #, sh-format -msgid "Path to kickstart file" +msgid "The IP of the LTSP Cluster Control Center" msgstr "" -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:10 +#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 #, sh-format -msgid "Path to chroot-creator cache" +msgid "use the servers sources.list instead of generating one" +msgstr "usar o sources.list dos servidores ao invés do que foi gerado" + +#: ../server/configs/ALTLinux/ltsp-login.sh:30 +#: ../server/configs/ALTLinux/ltsp-login.sh:33 +#: ../server/configs/ALTLinux/ltsp-login.sh:40 +#: ../server/configs/ALTLinux/ltsp-login.sh:50 +#, sh-format +msgid "Login Error" msgstr "" -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/configs/ALTLinux/ltsp-login.sh:31 +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:44 +#: ../server/configs/ALTLinux/ltsp-login.sh:52 +#: ../server/configs/ALTLinux/ltsp-login.sh:62 +#: ../server/configs/ALTLinux/ltsp-login.sh:81 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:95 +#: ../server/configs/ALTLinux/ltsp-login.sh:105 +#: ../server/configs/ALTLinux/ltsp-login.sh:115 #, sh-format -msgid "Release version number" +msgid "User" msgstr "" -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:12 +#: ../server/configs/ALTLinux/ltsp-login.sh:31 +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:44 +#: ../server/configs/ALTLinux/ltsp-login.sh:52 +#: ../server/configs/ALTLinux/ltsp-login.sh:62 +#: ../server/configs/ALTLinux/ltsp-login.sh:81 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:95 +#: ../server/configs/ALTLinux/ltsp-login.sh:105 +#: ../server/configs/ALTLinux/ltsp-login.sh:115 #, sh-format -msgid "Distro name" +msgid "already logged in!" msgstr "" -#: ../server/ltsp-build-client:89 +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:43 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:93 +#: ../server/configs/ALTLinux/ltsp-login.sh:117 +#, sh-format +msgid "Continue" +msgstr "" + +#: ../server/configs/ALTLinux/ltsp-login.sh:80 +#: ../server/configs/ALTLinux/ltsp-login.sh:83 +#: ../server/configs/ALTLinux/ltsp-login.sh:90 +#: ../server/configs/ALTLinux/ltsp-login.sh:103 +#, sh-format +msgid "Login Warning" +msgstr "" + +#: ../server/configs/ALTLinux/ltsp-login.sh:94 +#, sh-format +msgid "Cancel" +msgstr "" + +#: ../server/ltsp-build-client:54 #, sh-format msgid "API ERROR: you need to provide true or false." msgstr "ERRO DE API: você precisa informar verdadeiro ou falso." -#: ../server/ltsp-build-client:132 -#, fuzzy, sh-format -msgid "display this help message" +#: ../server/ltsp-build-client:97 +#, sh-format +msgid "Display this help message" msgstr "Exibe esta mensagem de ajuda" -#: ../server/ltsp-build-client:133 -#, fuzzy, sh-format -msgid "display help for all available commandline options" +#: ../server/ltsp-build-client:98 +#, sh-format +msgid "Display help for all available commandline options" msgstr "Exibe ajuda para todas as opções de linha de comando disponíveis" -#: ../server/ltsp-build-client:137 +#: ../server/ltsp-build-client:102 #, sh-format msgid "LTSP Build Client usage:" msgstr "Uso do LTSP Build Client:" -#: ../server/ltsp-build-client:141 +#: ../server/ltsp-build-client:106 #, sh-format msgid " Regular options:" msgstr " Opções comuns:" -#: ../server/ltsp-build-client:145 +#: ../server/ltsp-build-client:110 #, sh-format msgid " Advanced options:" msgstr " Opções avançadas:" -#: ../server/ltsp-build-client:157 +#: ../server/ltsp-build-client:122 #, sh-format msgid "info: LTSP client installation completed successfully" msgstr "info: instalação do cliente LTSP finalizada com sucesso" -#: ../server/ltsp-build-client:159 +#: ../server/ltsp-build-client:124 #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "erro: instalação do cliente LTSP terminou de maneira anormal" diff -Nru ltsp-5.2.8/po/pt.po ltsp-5.2.6/po/pt.po --- ltsp-5.2.8/po/pt.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/pt.po 2011-03-03 21:09:09.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-06 23:22+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -93,7 +92,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "definir o locale predefinido" @@ -457,42 +456,42 @@ msgid "Get profile from a Quickstart server" msgstr "Obter perfil de um servidor Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Quickstart manual: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Perfil predefinido do Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ERRO: %s não existe" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "A instalar em: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "URI de fase 3" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Definir o número de processos de compilação em paralelo" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Definir localizações de mirrors extra (separados por espaços)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "lista de pacotes extra para instalar como parte da instalação inicial." diff -Nru ltsp-5.2.8/po/ru.po ltsp-5.2.6/po/ru.po --- ltsp-5.2.8/po/ru.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/ru.po 2011-03-03 21:09:09.000000000 +0000 @@ -8,17 +8,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-05 20:41+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../server/configs/ALTLinux/ltsp-login.sh:30 #: ../server/configs/ALTLinux/ltsp-login.sh:33 @@ -93,7 +91,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "задать локаль по умолчанию" @@ -234,10 +232,8 @@ #: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 #, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" -"установить в chroot все файлы .deb, содержащиеся в предоставляемом каталоге" +msgid "install to the chroot all the .deb files contained in the provided directory" +msgstr "установить в chroot все файлы .deb, содержащиеся в предоставляемом каталоге" #: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 #, sh-format @@ -267,9 +263,7 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:29 #, sh-format msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"ЗАМЕЧАНИЕ: добавляется дистрибутив по умолчанию и компоненты с зеркала " -"backports:" +msgstr "ЗАМЕЧАНИЕ: добавляется дистрибутив по умолчанию и компоненты с зеркала backports:" #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 #, sh-format @@ -340,8 +334,7 @@ #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 #, sh-format msgid "NOTE: adding default dist and components to security mirror:" -msgstr "" -"ЗАМЕЧАНИЕ: добавляется дистрибутив и компоненты с зеркала безопасности:" +msgstr "ЗАМЕЧАНИЕ: добавляется дистрибутив и компоненты с зеркала безопасности:" #: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 #, sh-format @@ -384,8 +377,7 @@ #: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "" -"ОШИБКА: неподдерживаемая архитектура. Проверьте аргумент параметра --arch: %s" +msgstr "ОШИБКА: неподдерживаемая архитектура. Проверьте аргумент параметра --arch: %s" #: ../server/plugins/ltsp-build-client/common/001-set-arch:52 #: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 @@ -456,42 +448,42 @@ msgid "Get profile from a Quickstart server" msgstr "Получить профиль с сервера Quickstart" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Ручной Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Профиль Quickstart по умолчанию: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "ОШИБКА: %s не существует" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Установка в: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Этап 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Настройка числа процессов параллельной сборки" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Настройка расположения зеркал (через пробел)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "задать список дополнительных пакетов для установки в начале установки." @@ -560,3 +552,4 @@ #, sh-format msgid "error: LTSP client installation ended abnormally" msgstr "ошибка: установка клиента LTSP завершилась неудачно" + diff -Nru ltsp-5.2.8/po/sk.po ltsp-5.2.6/po/sk.po --- ltsp-5.2.8/po/sk.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/sk.po 2011-03-03 21:09:09.000000000 +0000 @@ -1,20 +1,18 @@ # ltsp gettext messages for slovak. -# Copyright (C) 2010 THE ltsp'S COPYRIGHT HOLDER +# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the ltsp package. -# Slavko , 2010, 2011. -# +# Slavko , 2010. msgid "" msgstr "" -"Project-Id-Version: ltsp 5.2.6\n" +"Project-Id-Version: ltsp 5.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" -"PO-Revision-Date: 2011-03-14 20:30+0100\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" +"PO-Revision-Date: 2010-04-21 22:00+0200\n" "Last-Translator: Slavko \n" -"Language-Team: Slovak \n" -"Language: \n" +"Language-Team: Slovenský \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: UTF-8\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: ../server/configs/ALTLinux/ltsp-login.sh:30 @@ -79,18 +77,18 @@ #: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 #, sh-format msgid "set the list of packages to install after base-install is completed" -msgstr "zoznam balíkov na nainštalovanie po dokončení základnej inštalácie" +msgstr "zoznam balíkov pre nainštalovanie po dokončení základnej inštalácie" #: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 #: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 #, sh-format msgid "list of packages to install as part of the final installation" -msgstr "zoznam balíkov na nainštalovanie počas konečnej inštalácie" +msgstr "zoznam balíkov pre nainštalovanie počas konečnej inštalácie" #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "nastaví predvolenú lokalizáciu" @@ -155,7 +153,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 #, sh-format msgid "set the kernel package to install." -msgstr "nastaví balík jadra na nainštalovanie" +msgstr "nastaví balík jadra pre inštaláciu" #: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 #: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 @@ -177,7 +175,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 #, sh-format msgid "set the kernel modules packages to install." -msgstr "nastaví balíky modulov jadra na nainštalovanie" +msgstr "nastaví balíky modulov jadra pre inštaláciu" #: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 #: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 @@ -192,7 +190,7 @@ #: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 #, sh-format msgid "include the listed keys in the apt keyring" -msgstr "zoznam kľúčov na zahrnutie do kľúčenky APT" +msgstr "zoznam kľúčov pre zahrnutie do kľúčenky APT" #: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 #, sh-format @@ -212,7 +210,7 @@ #: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 #, sh-format msgid "create squashfs image for use with NBD" -msgstr "vytvorí obraz squashfs na použitie s NBD" +msgstr "vytvorí obraz squashfs pre NBD" #: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 #, sh-format @@ -253,7 +251,7 @@ #: ../server/plugins/ltsp-build-client/Debian/015-backports:4 #, sh-format msgid "list of packages to install from the backports repositories" -msgstr "zoznam balíkov na inštaláciu z backportov" +msgstr "zoznam balíkov pre inštaláciu z backportov" #: ../server/plugins/ltsp-build-client/Debian/015-backports:5 #, sh-format @@ -273,7 +271,7 @@ #: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 #, sh-format msgid "list of packages to install from the pinned distribution" -msgstr "zoznam balíkov na inštaláciu z pinnovanej distribúcie" +msgstr "zoznam balíkov pre inštaláciu z pinnovanej distribúcie" #: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 #: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 @@ -329,7 +327,7 @@ #: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 #, sh-format msgid "set the list of kernel packages to install" -msgstr "nastaví zoznam balíkov jadra na inštaláciu" +msgstr "nastaví zoznam balíkov jadra pre inštaláciu" #: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 #, sh-format @@ -376,7 +374,8 @@ #: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 #, sh-format msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "CHYBA: nepodporovaná architektúra. Skontrolujte parameter --arch: %s" +msgstr "" +"CHYBA: nepodporovaná architektúra. Skontrolujte zadaný parameter --arch: %s" #: ../server/plugins/ltsp-build-client/common/001-set-arch:52 #: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 @@ -420,12 +419,12 @@ #: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 #, sh-format msgid "enable LTSP-Cluster" -msgstr "povolí LTSP-Cluster" +msgstr "povoliť LTSP-Cluster" #: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 #, sh-format msgid "force to skip the squashfs build (for debian-installer)" -msgstr "vynúti vynechanie tvorby squashfs (pre debian-installer)" +msgstr "vynútiť vynechanie tvorby squashfs (pre debian-installer)" #: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 #, sh-format @@ -445,47 +444,47 @@ #: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 #, sh-format msgid "Get profile from a Quickstart server" -msgstr "Získať profil zo servera Quickstart" +msgstr "Získať profil z Quickstart servera" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Manuálny Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Predvolený profil Quickstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "CHYBA: %s neexistuje" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Inštalácia do: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Fáza 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" -msgstr "Nastaví počet paralelných procesov zostavenia" +msgstr "Nastaví počet paralelných buildovacích procesov" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Nastaví umiestnenia ďalších zrkadiel (oddelené medzerami)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." -msgstr "zoznam ďalších balíkov, inštalovaných počas počiatočnej inštalácie." +msgstr "zoznam ďalších balíkov, inštalovaných pri počiatočnej inštalácii." #: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format @@ -530,7 +529,7 @@ #: ../server/ltsp-build-client:137 #, sh-format msgid "LTSP Build Client usage:" -msgstr "Použitie skriptu na zostavenie klienta LTSP:" +msgstr "Použitie skriptu pre vybudovanie LTSP klienta:" #: ../server/ltsp-build-client:141 #, sh-format @@ -545,9 +544,9 @@ #: ../server/ltsp-build-client:157 #, sh-format msgid "info: LTSP client installation completed successfully" -msgstr "INFO: Inštalácia klienta LTSP úspešne dokončená" +msgstr "INFO: Inštalácia LTSP klienta úspešne dokončená" #: ../server/ltsp-build-client:159 #, sh-format msgid "error: LTSP client installation ended abnormally" -msgstr "CHYBA: Inštalácia klienta LTSP skončila neúspešne" +msgstr "CHYBA: Inštalácia LTSP klienta skončila neúspešne" diff -Nru ltsp-5.2.8/po/sv.po ltsp-5.2.6/po/sv.po --- ltsp-5.2.8/po/sv.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/sv.po 2011-03-03 21:09:09.000000000 +0000 @@ -8,11 +8,10 @@ msgstr "" "Project-Id-Version: ltsp_sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-08 22:19+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -96,7 +95,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "ange standard för regionanpassning" @@ -459,42 +458,42 @@ msgid "Get profile from a Quickstart server" msgstr "Hämta profil från snabbstartsserver" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "Manuell snabbstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "Standardprofil för snabbstart: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "FEL: %s existerar inte" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "Installerar i: %s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "Steg 3 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "Ange antalet parallella byggprocesser" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "Ange extra spegelplatser (separera med mellanslag)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "" diff -Nru ltsp-5.2.8/po/vi.po ltsp-5.2.6/po/vi.po --- ltsp-5.2.8/po/vi.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/vi.po 2011-03-03 21:09:09.000000000 +0000 @@ -1,569 +1,551 @@ # Vietnamese translation for LTSP. # Copyright © 2010 Free Software Foundation, Inc. # Clytie Siddall , 2008-2010. -# -msgid "" -msgstr "" -"Project-Id-Version: ltsp 5.2.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" -"PO-Revision-Date: 2010-04-05 18:08+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"Language: vi\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LocFactoryEditor 1.8\n" - -#: ../server/configs/ALTLinux/ltsp-login.sh:30 -#: ../server/configs/ALTLinux/ltsp-login.sh:33 -#: ../server/configs/ALTLinux/ltsp-login.sh:40 -#: ../server/configs/ALTLinux/ltsp-login.sh:50 -#, sh-format -msgid "Login Error" -msgstr "Lỗi đăng nhập" - -#: ../server/configs/ALTLinux/ltsp-login.sh:31 -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:44 -#: ../server/configs/ALTLinux/ltsp-login.sh:52 -#: ../server/configs/ALTLinux/ltsp-login.sh:62 -#: ../server/configs/ALTLinux/ltsp-login.sh:81 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:95 -#: ../server/configs/ALTLinux/ltsp-login.sh:105 -#: ../server/configs/ALTLinux/ltsp-login.sh:115 -#, sh-format -msgid "User" -msgstr "Người dùng" - -#: ../server/configs/ALTLinux/ltsp-login.sh:31 -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:44 -#: ../server/configs/ALTLinux/ltsp-login.sh:52 -#: ../server/configs/ALTLinux/ltsp-login.sh:62 -#: ../server/configs/ALTLinux/ltsp-login.sh:81 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:95 -#: ../server/configs/ALTLinux/ltsp-login.sh:105 -#: ../server/configs/ALTLinux/ltsp-login.sh:115 -#, sh-format -msgid "already logged in!" -msgstr "đã đăng nhập !" - -#: ../server/configs/ALTLinux/ltsp-login.sh:34 -#: ../server/configs/ALTLinux/ltsp-login.sh:43 -#: ../server/configs/ALTLinux/ltsp-login.sh:84 -#: ../server/configs/ALTLinux/ltsp-login.sh:93 -#: ../server/configs/ALTLinux/ltsp-login.sh:117 -#, sh-format -msgid "Continue" -msgstr "Tiếp tục" - -#: ../server/configs/ALTLinux/ltsp-login.sh:80 -#: ../server/configs/ALTLinux/ltsp-login.sh:83 -#: ../server/configs/ALTLinux/ltsp-login.sh:90 -#: ../server/configs/ALTLinux/ltsp-login.sh:103 -#, sh-format -msgid "Login Warning" -msgstr "Cảnh báo Đăng nhập" - -#: ../server/configs/ALTLinux/ltsp-login.sh:94 -#, sh-format -msgid "Cancel" -msgstr "Thôi" - -#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 -#, sh-format -msgid "set the list of packages to install after base-install is completed" -msgstr "" -"đặt danh sách các gói cần cài đặt sau khi chạy xong tiến trình cài đặt cơ " -"bản (base-install)" - -#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 -#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 -#, sh-format -msgid "list of packages to install as part of the final installation" -msgstr "" -"danh sách các gói cần cài đặt như là phần của tiến trình cài đặt cuối cùng" - -#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 -#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 -#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 -#, sh-format -msgid "set the default locale" -msgstr "đặt miền địa phương mặc định" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 -#, sh-format -msgid "Enable progress reporting" -msgstr "Bật thông báo về tiến hành" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 -#, sh-format -msgid "Print stage times (seconds)" -msgstr "In ra thời gian chạy giai đoạn" - -#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 -#, sh-format -msgid "Draw progress bar" -msgstr "Vẽ thanh tiến hành" - -#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 -#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 -#, sh-format -msgid "prompt to set the root password, defaults to disabled" -msgstr "nhắc đặt mật khẩu người chủ (giá trị mặc định là « bị tắt »)" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 -#, sh-format -msgid "enable serial console" -msgstr "bật bàn giao tiếp nối tiếp" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 -#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 -#, sh-format -msgid "Enabling serial console..." -msgstr "Đang bật bàn giao tiếp nối tiếp..." - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 -#, sh-format -msgid "set the mirror location" -msgstr "đặt địa chỉ của máy nhân bản" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 -#, sh-format -msgid "add a mirror, which takes priority over the default mirror" -msgstr "thêm một máy nhân bản, mà có mức ưu tiên cao hơn máy nhân bản mặc định" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 -#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 -#, sh-format -msgid "add a mirror, with lower priority than the default mirror" -msgstr "" -"thêm một máy nhân bản, mà có mức ưu tiên thấp hơn máy nhân bản mặc định" - -#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 -#, sh-format -msgid "add a security mirror" -msgstr "thêm một máy nhân bản bảo mật" - -#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 -#, sh-format -msgid "set the kernel package to install." -msgstr "đặt gói hạt nhân cần cài đặt." - -#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 -#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 -#, sh-format -msgid "keep cache of downloaded package files" -msgstr "bảo tồn vùng nhớ tạm các tập tin gói đã tải về" - -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 -#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 -#, sh-format -msgid "set the distribution to be used for install" -msgstr "đặt bản phân phối cần dùng để cài đặt" - -#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 -#, sh-format -msgid "Set the i18n langs" -msgstr "Đặt các ngôn ngữ quốc tế hoá" - -#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 -#, sh-format -msgid "set the kernel modules packages to install." -msgstr "đặt các gói mô-đun hạt nhân cần cài đặt." - -#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 -#, sh-format -msgid "set the target architecture" -msgstr "đặt kiến trúc đích" - -#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 -#, sh-format -msgid "include the listed keys in the apt keyring" -msgstr "kèm thêm các khoá đã liệt kê trong vòng khoá apt" - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 -#, sh-format -msgid "cache downloaded packages" -msgstr "nhớ tạm các gói đã tải về" - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 -#, sh-format -msgid "Copying packages" -msgstr "Đang sao chép các gói" - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 -#, sh-format -msgid "done." -msgstr "hoàn tất." - -#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 -#, sh-format -msgid "create squashfs image for use with NBD" -msgstr "tạo ảnh squashfs để dùng với NBD" - -#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 -#, sh-format -msgid "load debconf seeding in the chroot after install" -msgstr "" -"nạp vào chroot chức năng chèn sẵn dữ liệu cấu hình debconf sau khi cài đặt" - -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 -#, sh-format -msgid "mount package cache dir from server" -msgstr "gắn thư mục nhớ tạm gói từ máy phục vụ" - -#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 -#, sh-format -msgid "mount a server directory as the chroot package cache dir" -msgstr "gắn kết một thư mục trình phục vụ làm thư mục nhớ tạm gói chroot" - -#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 -#, sh-format -msgid "" -"install to the chroot all the .deb files contained in the provided directory" -msgstr "" -"cài đặt vào chroot tất cả các tập tin « .deb » nằm trong thư mục đưa ra" - -#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 -#, sh-format -msgid "allow unsigned packages during install" -msgstr "cho phép các gói không ký trong khi cài đặt" - -#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 -#, sh-format -msgid "copy apt Packages files from server" -msgstr "sao chép các gói apt từ máy phục vụ" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 -#, sh-format -msgid "add a backports mirror" -msgstr "thêm một máy nhân bản nối cầu lùi" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 -#, sh-format -msgid "list of packages to install from the backports repositories" -msgstr "danh sách các gói cần cài đặt từ kho lưu nối cầu lùi" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 -#, sh-format -msgid "distribution to pull backports from" -msgstr "bản phân phối từ đó cần lấy nối cầu lùi" - -#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 -#, sh-format -msgid "NOTE: adding default dist and components to backports mirror:" -msgstr "" -"GHI CHÚ: đang thêm bản phân phối mặc định và các thành phần vào máy nhân bản " -"nối cầu lùi:" - -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 -#, sh-format -msgid "distribution to set up apt pinning" -msgstr "bản phân phối để thiết lập ghim apt" - -#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 -#, sh-format -msgid "list of packages to install from the pinned distribution" -msgstr "danh sách các gói cần cài đặt từ bản phân phối đã ghim" - -#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 -#, sh-format -msgid "a simple webkiosk mode" -msgstr "một chế độ truy cập hạn Web đơn giản" - -#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 -#, sh-format -msgid "mounts CDROM before installation" -msgstr "gắn đĩa CD-ROM trước khi cài đặt" - -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 -#, sh-format -msgid "use specified http proxy" -msgstr "dùng ủy nhiệm HTTP đưa ra" - -#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 -#, sh-format -msgid "do not autodetect apt proxy configuration" -msgstr "không tự động phát hiện cấu hình ủy nhiệm apt" - -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 -#, sh-format -msgid "enable popularity-contest in the chroot" -msgstr "" -"bật chức năng thông báo các gói đã cài đặt (popularity-contest) trong chroot" - -#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 -#, sh-format -msgid "Enabling popularity contest..." -msgstr "" -"Đang bật chức năng thông báo các gói đã cài đặt (popularity-contest)..." - -#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 -#, sh-format -msgid "set the components to be used in mirror" -msgstr "đặt các thành phần cần dùng khi nhân bản" - -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 -#, sh-format -msgid "create ext2 image for use with NBD" -msgstr "tạo ảnh ext2 để dùng với NBD." - -#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 -#, sh-format -msgid "create image for use with NBD of the specified filesystem" -msgstr "tạo ảnh hệ thống tập tin đưa ra để dùng với NBD" - -#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 -#, sh-format -msgid "skip upgrade of installed packages" -msgstr "bỏ qua bước nâng cấp các gói đã cài đặt" - -#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 -#, sh-format -msgid "set the list of kernel packages to install" -msgstr "đặt danh sách các gói hạt nhân cần cài đặt" - -#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 -#, sh-format -msgid "NOTE: adding default dist and components to security mirror:" -msgstr "" -"GHI CHÚ : đang thêm bản phát hành mặc định và các thành phần vào máy nhân " -"bản bảo mật:" - -#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 -#, sh-format -msgid "NOTE: disabling security APT source for sid. It does not exist." -msgstr "GHI CHÚ : đang tắt nguồn APT bảo mật cho sid (nó không tồn tại)." - -#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 -#, sh-format -msgid "exclude packages from the initial chroot" -msgstr "loại trừ các gói khỏi chroot đầu tiên" - -#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 -#, sh-format -msgid "load a user specific configuration file" -msgstr "nạp một tập tin cấu hình đặc trưng cho người dùng" - -#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 -#, sh-format -msgid "purge existing LTSP chroot if present" -msgstr "tẩy gốc LTSP đã có (nếu có)" - -#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 -#, sh-format -msgid "enable debug support" -msgstr "bật hỗ trợ chức năng gỡ rối" - -#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 -#, sh-format -msgid "ERROR: --arch %s called on unsupported arch: %s" -msgstr "LỖI: « --arch %s » được gọi trên kiến trúc không được hỗ trợ : %s" - -#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 -#, sh-format -msgid "ERROR: unsupported architecture. Check your --arch argument: %s" -msgstr "" -"LỖI: kiến trúc không được hỗ trợ. Hãy kiểm tra lại đối số « --arch »: %s" - -#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 -#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 -#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 -#, sh-format -msgid " supported values are: %s" -msgstr " các giá trị được hỗ trợ : %s" - -#: ../server/plugins/ltsp-build-client/common/010-set-base:3 -#, sh-format -msgid "set the default base install directory" -msgstr "đặt thư mục cài đặt cơ bản mặc định" - -#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 -#, sh-format -msgid "set the name of the chroot" -msgstr "đặt tên của chroot" - -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 -#, sh-format -msgid "set the security mirror location" -msgstr "đặt địa chỉ của máy nhân bản bảo mật" - -#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 -#, sh-format -msgid "set the update mirror location" -msgstr "đặt địa chỉ của máy nhân bản cập nhật" - -#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 -#, sh-format -msgid "use the servers sources.list instead of generating one" -msgstr "" -"dùng danh sách các nguồn (sources.list) của máy phục vụ, thay vì tạo ra một " -"danh sách riêng" - -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 -#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 -#, sh-format -msgid "run most or all applications locally" -msgstr "chạy cục bộ phần lớn hay tất cả các ứng dụng" - -#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 -#, sh-format -msgid "enable LTSP-Cluster" -msgstr "bật LTSP-Cluster" - -#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 -#, sh-format -msgid "force to skip the squashfs build (for debian-installer)" -msgstr "ép buộc bỏ qua tiến trình xây dựng squashfs (cho debian-installer)" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 -#, sh-format -msgid "Path to Quickstart profile" -msgstr "Đường dẫn đến hồ sơ Khởi Chạy Nhanh" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 -#, sh-format -msgid "Debug Quickstart" -msgstr "Gỡ lỗi Khởi Chạy Nhanh" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 -#, sh-format -msgid "Show external command output" -msgstr "Hiện kết xuất lệnh ngoài" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 -#, sh-format -msgid "Get profile from a Quickstart server" -msgstr "Lấy hồ sơ từ máy phục vụ Khởi Chạy Nhanh" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 -#, sh-format -msgid "Manual Quickstart: %s" -msgstr "Khởi Chạy Nhanh bằng tay: %s" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 -#, sh-format -msgid "Default Quickstart profile: %s" -msgstr "Hồ sơ Khởi Chạy Nhanh mặc định: %s" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 -#, sh-format -msgid "ERROR: %s does not exist" -msgstr "LỖI: %s không tồn tại" - -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 -#, sh-format -msgid "Installing into: %s" -msgstr "Đang cài đặt vào : %s" - -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 -#, sh-format -msgid "Stage 3 URI" -msgstr "URI giai đoạn 3" - -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 -#, sh-format -msgid "Set the number of parallel build processes" -msgstr "Đặt số các tiến trình xây dựng chạy song song" - -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 -#, sh-format -msgid "Set extra mirror locations (space-separated)" -msgstr "Đặt địa chỉ máy nhân bản bổ sung (định giới bằng dấu cách)" - -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 -#, sh-format -msgid "list of extra packages to install as part of the initial installation." -msgstr "" -"danh sách các gói bổ sung cần cài đặt như là phần của tiến trình cài đặt đầu " -"tiên." - -#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 -#, sh-format -msgid "Load a user specific configuration file" -msgstr "Nạp một tập tin cấu hình đặc trưng cho người dùng" - -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 -#, sh-format -msgid "Path to kickstart file" -msgstr "Đường dẫn đến tập tin kickstart" - -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:10 -#, sh-format -msgid "Path to chroot-creator cache" -msgstr "Đường dẫn đến vùng nhớ tạm chroot-creator" - -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 -#, sh-format -msgid "Release version number" -msgstr "Số thứ tự phiên bản phát hành" - -#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:12 -#, sh-format -msgid "Distro name" -msgstr "Tên bản phân phối" - -#: ../server/ltsp-build-client:89 -#, sh-format -msgid "API ERROR: you need to provide true or false." -msgstr "LỖI API: bạn cần phải cung cấp trả lời đúng (true) hay sai (false)." - -#: ../server/ltsp-build-client:132 -#, sh-format -msgid "display this help message" -msgstr "hiển thị trợ giúp này" - -#: ../server/ltsp-build-client:133 -#, sh-format -msgid "display help for all available commandline options" -msgstr "hiển thị trợ giúp về tất cả các tùy chọn dòng lệnh sẵn sàng" - -#: ../server/ltsp-build-client:137 -#, sh-format -msgid "LTSP Build Client usage:" -msgstr "Sử dụng trình khách xây dựng LTSP:" - -#: ../server/ltsp-build-client:141 -#, sh-format -msgid " Regular options:" -msgstr " Tùy chọn bình thường:" - -#: ../server/ltsp-build-client:145 -#, sh-format -msgid " Advanced options:" -msgstr " Tùy chọn cấp cao :" - -#: ../server/ltsp-build-client:157 -#, sh-format -msgid "info: LTSP client installation completed successfully" -msgstr "chú ý: tiến trình cài đặt trình khách LTSP đã chạy thành công" - -#: ../server/ltsp-build-client:159 -#, sh-format -msgid "error: LTSP client installation ended abnormally" -msgstr "lỗi: tiến trình cài đặt trình khách LTSP đã kết thúc bất thường" +# +msgid "" +msgstr "" +"Project-Id-Version: ltsp 5.2.2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" +"PO-Revision-Date: 2010-04-05 18:08+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#: ../server/configs/ALTLinux/ltsp-login.sh:30 +#: ../server/configs/ALTLinux/ltsp-login.sh:33 +#: ../server/configs/ALTLinux/ltsp-login.sh:40 +#: ../server/configs/ALTLinux/ltsp-login.sh:50 +#, sh-format +msgid "Login Error" +msgstr "Lỗi đăng nhập" + +#: ../server/configs/ALTLinux/ltsp-login.sh:31 +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:44 +#: ../server/configs/ALTLinux/ltsp-login.sh:52 +#: ../server/configs/ALTLinux/ltsp-login.sh:62 +#: ../server/configs/ALTLinux/ltsp-login.sh:81 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:95 +#: ../server/configs/ALTLinux/ltsp-login.sh:105 +#: ../server/configs/ALTLinux/ltsp-login.sh:115 +#, sh-format +msgid "User" +msgstr "Người dùng" + +#: ../server/configs/ALTLinux/ltsp-login.sh:31 +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:44 +#: ../server/configs/ALTLinux/ltsp-login.sh:52 +#: ../server/configs/ALTLinux/ltsp-login.sh:62 +#: ../server/configs/ALTLinux/ltsp-login.sh:81 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:95 +#: ../server/configs/ALTLinux/ltsp-login.sh:105 +#: ../server/configs/ALTLinux/ltsp-login.sh:115 +#, sh-format +msgid "already logged in!" +msgstr "đã đăng nhập !" + +#: ../server/configs/ALTLinux/ltsp-login.sh:34 +#: ../server/configs/ALTLinux/ltsp-login.sh:43 +#: ../server/configs/ALTLinux/ltsp-login.sh:84 +#: ../server/configs/ALTLinux/ltsp-login.sh:93 +#: ../server/configs/ALTLinux/ltsp-login.sh:117 +#, sh-format +msgid "Continue" +msgstr "Tiếp tục" + +#: ../server/configs/ALTLinux/ltsp-login.sh:80 +#: ../server/configs/ALTLinux/ltsp-login.sh:83 +#: ../server/configs/ALTLinux/ltsp-login.sh:90 +#: ../server/configs/ALTLinux/ltsp-login.sh:103 +#, sh-format +msgid "Login Warning" +msgstr "Cảnh báo Đăng nhập" + +#: ../server/configs/ALTLinux/ltsp-login.sh:94 +#, sh-format +msgid "Cancel" +msgstr "Thôi" + +#: ../server/plugins/ltsp-build-client/ALTLinux/030-early-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-early-packages:3 +#, sh-format +msgid "set the list of packages to install after base-install is completed" +msgstr "đặt danh sách các gói cần cài đặt sau khi chạy xong tiến trình cài đặt cơ bản (base-install)" + +#: ../server/plugins/ltsp-build-client/ALTLinux/050-late-packages:3 +#: ../server/plugins/ltsp-build-client/Debian/030-late-packages:3 +#, sh-format +msgid "list of packages to install as part of the final installation" +msgstr "danh sách các gói cần cài đặt như là phần của tiến trình cài đặt cuối cùng" + +#: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 +#: ../server/plugins/ltsp-build-client/Debian/025-locales:3 +#: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#, sh-format +msgid "set the default locale" +msgstr "đặt miền địa phương mặc định" + +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:3 +#, sh-format +msgid "Enable progress reporting" +msgstr "Bật thông báo về tiến hành" + +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:4 +#, sh-format +msgid "Print stage times (seconds)" +msgstr "In ra thời gian chạy giai đoạn" + +#: ../server/plugins/ltsp-build-client/ALTLinux/000-progress:5 +#, sh-format +msgid "Draw progress bar" +msgstr "Vẽ thanh tiến hành" + +#: ../server/plugins/ltsp-build-client/ALTLinux/095-rootpass:3 +#: ../server/plugins/ltsp-build-client/Debian/095-rootpass:3 +#, sh-format +msgid "prompt to set the root password, defaults to disabled" +msgstr "nhắc đặt mật khẩu người chủ (giá trị mặc định là « bị tắt »)" + +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:3 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:3 +#, sh-format +msgid "enable serial console" +msgstr "bật bàn giao tiếp nối tiếp" + +#: ../server/plugins/ltsp-build-client/ALTLinux/040-serial-console:12 +#: ../server/plugins/ltsp-build-client/Debian/010-serial-console:12 +#, sh-format +msgid "Enabling serial console..." +msgstr "Đang bật bàn giao tiếp nối tiếp..." + +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:3 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:3 +#, sh-format +msgid "set the mirror location" +msgstr "đặt địa chỉ của máy nhân bản" + +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:4 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:4 +#, sh-format +msgid "add a mirror, which takes priority over the default mirror" +msgstr "thêm một máy nhân bản, mà có mức ưu tiên cao hơn máy nhân bản mặc định" + +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:5 +#: ../server/plugins/ltsp-build-client/Debian/010-manage-mirror:5 +#, sh-format +msgid "add a mirror, with lower priority than the default mirror" +msgstr "thêm một máy nhân bản, mà có mức ưu tiên thấp hơn máy nhân bản mặc định" + +#: ../server/plugins/ltsp-build-client/ALTLinux/011-manage-mirror:6 +#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:3 +#, sh-format +msgid "add a security mirror" +msgstr "thêm một máy nhân bản bảo mật" + +#: ../server/plugins/ltsp-build-client/ALTLinux/040-kernel:3 +#, sh-format +msgid "set the kernel package to install." +msgstr "đặt gói hạt nhân cần cài đặt." + +#: ../server/plugins/ltsp-build-client/ALTLinux/090-clean-package-cache:3 +#: ../server/plugins/ltsp-build-client/Debian/090-clean-package-cache:3 +#, sh-format +msgid "keep cache of downloaded package files" +msgstr "bảo tồn vùng nhớ tạm các tập tin gói đã tải về" + +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-dist:3 +#: ../server/plugins/ltsp-build-client/common/001-set-dist:3 +#, sh-format +msgid "set the distribution to be used for install" +msgstr "đặt bản phân phối cần dùng để cài đặt" + +#: ../server/plugins/ltsp-build-client/ALTLinux/030-i18n:3 +#, sh-format +msgid "Set the i18n langs" +msgstr "Đặt các ngôn ngữ quốc tế hoá" + +#: ../server/plugins/ltsp-build-client/ALTLinux/041-kernel-modules:3 +#, sh-format +msgid "set the kernel modules packages to install." +msgstr "đặt các gói mô-đun hạt nhân cần cài đặt." + +#: ../server/plugins/ltsp-build-client/ALTLinux/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Debian/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:3 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:9 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:4 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:9 +#, sh-format +msgid "set the target architecture" +msgstr "đặt kiến trúc đích" + +#: ../server/plugins/ltsp-build-client/Debian/001-apt-keys:3 +#, sh-format +msgid "include the listed keys in the apt keyring" +msgstr "kèm thêm các khoá đã liệt kê trong vòng khoá apt" + +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:3 +#, sh-format +msgid "cache downloaded packages" +msgstr "nhớ tạm các gói đã tải về" + +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:13 +#, sh-format +msgid "Copying packages" +msgstr "Đang sao chép các gói" + +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-cache:24 +#, sh-format +msgid "done." +msgstr "hoàn tất." + +#: ../server/plugins/ltsp-build-client/Debian/095-squashfs-image:3 +#, sh-format +msgid "create squashfs image for use with NBD" +msgstr "tạo ảnh squashfs để dùng với NBD" + +#: ../server/plugins/ltsp-build-client/Debian/010-debconf-seeds:3 +#, sh-format +msgid "load debconf seeding in the chroot after install" +msgstr "nạp vào chroot chức năng chèn sẵn dữ liệu cấu hình debconf sau khi cài đặt" + +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:3 +#, sh-format +msgid "mount package cache dir from server" +msgstr "gắn thư mục nhớ tạm gói từ máy phục vụ" + +#: ../server/plugins/ltsp-build-client/Debian/040-mount-package-cache:4 +#, sh-format +msgid "mount a server directory as the chroot package cache dir" +msgstr "gắn kết một thư mục trình phục vụ làm thư mục nhớ tạm gói chroot" + +#: ../server/plugins/ltsp-build-client/Debian/035-install-debs:3 +#, sh-format +msgid "install to the chroot all the .deb files contained in the provided directory" +msgstr "cài đặt vào chroot tất cả các tập tin « .deb » nằm trong thư mục đưa ra" + +#: ../server/plugins/ltsp-build-client/Debian/001-set-accept-unsigned-packages:3 +#, sh-format +msgid "allow unsigned packages during install" +msgstr "cho phép các gói không ký trong khi cài đặt" + +#: ../server/plugins/ltsp-build-client/Debian/040-copy-package-lists:3 +#, sh-format +msgid "copy apt Packages files from server" +msgstr "sao chép các gói apt từ máy phục vụ" + +#: ../server/plugins/ltsp-build-client/Debian/015-backports:3 +#, sh-format +msgid "add a backports mirror" +msgstr "thêm một máy nhân bản nối cầu lùi" + +#: ../server/plugins/ltsp-build-client/Debian/015-backports:4 +#, sh-format +msgid "list of packages to install from the backports repositories" +msgstr "danh sách các gói cần cài đặt từ kho lưu nối cầu lùi" + +#: ../server/plugins/ltsp-build-client/Debian/015-backports:5 +#, sh-format +msgid "distribution to pull backports from" +msgstr "bản phân phối từ đó cần lấy nối cầu lùi" + +#: ../server/plugins/ltsp-build-client/Debian/015-backports:29 +#, sh-format +msgid "NOTE: adding default dist and components to backports mirror:" +msgstr "GHI CHÚ: đang thêm bản phân phối mặc định và các thành phần vào máy nhân bản nối cầu lùi:" + +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:3 +#, sh-format +msgid "distribution to set up apt pinning" +msgstr "bản phân phối để thiết lập ghim apt" + +#: ../server/plugins/ltsp-build-client/Debian/010-apt-pinning:4 +#, sh-format +msgid "list of packages to install from the pinned distribution" +msgstr "danh sách các gói cần cài đặt từ bản phân phối đã ghim" + +#: ../server/plugins/ltsp-build-client/Debian/035-kiosk:7 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-kiosk:7 +#, sh-format +msgid "a simple webkiosk mode" +msgstr "một chế độ truy cập hạn Web đơn giản" + +#: ../server/plugins/ltsp-build-client/Debian/099-mount-cdrom:5 +#, sh-format +msgid "mounts CDROM before installation" +msgstr "gắn đĩa CD-ROM trước khi cài đặt" + +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:3 +#, sh-format +msgid "use specified http proxy" +msgstr "dùng ủy nhiệm HTTP đưa ra" + +#: ../server/plugins/ltsp-build-client/Debian/010-http-proxy:4 +#, sh-format +msgid "do not autodetect apt proxy configuration" +msgstr "không tự động phát hiện cấu hình ủy nhiệm apt" + +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:3 +#, sh-format +msgid "enable popularity-contest in the chroot" +msgstr "bật chức năng thông báo các gói đã cài đặt (popularity-contest) trong chroot" + +#: ../server/plugins/ltsp-build-client/Debian/010-enable-popcon:12 +#, sh-format +msgid "Enabling popularity contest..." +msgstr "Đang bật chức năng thông báo các gói đã cài đặt (popularity-contest)..." + +#: ../server/plugins/ltsp-build-client/Debian/001-set-components:3 +#, sh-format +msgid "set the components to be used in mirror" +msgstr "đặt các thành phần cần dùng khi nhân bản" + +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:3 +#, sh-format +msgid "create ext2 image for use with NBD" +msgstr "tạo ảnh ext2 để dùng với NBD." + +#: ../server/plugins/ltsp-build-client/Debian/035-create-fs-image:4 +#, sh-format +msgid "create image for use with NBD of the specified filesystem" +msgstr "tạo ảnh hệ thống tập tin đưa ra để dùng với NBD" + +#: ../server/plugins/ltsp-build-client/Debian/035-apt-get-upgrade:3 +#, sh-format +msgid "skip upgrade of installed packages" +msgstr "bỏ qua bước nâng cấp các gói đã cài đặt" + +#: ../server/plugins/ltsp-build-client/Debian/020-kernel-selection:3 +#, sh-format +msgid "set the list of kernel packages to install" +msgstr "đặt danh sách các gói hạt nhân cần cài đặt" + +#: ../server/plugins/ltsp-build-client/Debian/013-security-mirror:16 +#, sh-format +msgid "NOTE: adding default dist and components to security mirror:" +msgstr "GHI CHÚ : đang thêm bản phát hành mặc định và các thành phần vào máy nhân bản bảo mật:" + +#: ../server/plugins/ltsp-build-client/Debian/010-distribution-specific:5 +#, sh-format +msgid "NOTE: disabling security APT source for sid. It does not exist." +msgstr "GHI CHÚ : đang tắt nguồn APT bảo mật cho sid (nó không tồn tại)." + +#: ../server/plugins/ltsp-build-client/common/001-set-exclude:3 +#, sh-format +msgid "exclude packages from the initial chroot" +msgstr "loại trừ các gói khỏi chroot đầu tiên" + +#: ../server/plugins/ltsp-build-client/common/001-load-configuration-file:3 +#, sh-format +msgid "load a user specific configuration file" +msgstr "nạp một tập tin cấu hình đặc trưng cho người dùng" + +#: ../server/plugins/ltsp-build-client/common/020-rootpath:3 +#, sh-format +msgid "purge existing LTSP chroot if present" +msgstr "tẩy gốc LTSP đã có (nếu có)" + +#: ../server/plugins/ltsp-build-client/common/000-enable-debug:3 +#, sh-format +msgid "enable debug support" +msgstr "bật hỗ trợ chức năng gỡ rối" + +#: ../server/plugins/ltsp-build-client/common/001-set-arch:22 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/common/001-set-arch:44 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:21 +#, sh-format +msgid "ERROR: --arch %s called on unsupported arch: %s" +msgstr "LỖI: « --arch %s » được gọi trên kiến trúc không được hỗ trợ : %s" + +#: ../server/plugins/ltsp-build-client/common/001-set-arch:51 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:32 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:27 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:30 +#, sh-format +msgid "ERROR: unsupported architecture. Check your --arch argument: %s" +msgstr "LỖI: kiến trúc không được hỗ trợ. Hãy kiểm tra lại đối số « --arch »: %s" + +#: ../server/plugins/ltsp-build-client/common/001-set-arch:52 +#: ../server/plugins/ltsp-build-client/Gentoo/001-set-arch:33 +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-set-arch:28 +#: ../server/plugins/ltsp-build-client/Fedora/001-set-arch:31 +#, sh-format +msgid " supported values are: %s" +msgstr " các giá trị được hỗ trợ : %s" + +#: ../server/plugins/ltsp-build-client/common/010-set-base:3 +#, sh-format +msgid "set the default base install directory" +msgstr "đặt thư mục cài đặt cơ bản mặc định" + +#: ../server/plugins/ltsp-build-client/common/010-set-chroot:3 +#, sh-format +msgid "set the name of the chroot" +msgstr "đặt tên của chroot" + +#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 +#, sh-format +msgid "set the security mirror location" +msgstr "đặt địa chỉ của máy nhân bản bảo mật" + +#: ../server/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 +#, sh-format +msgid "set the update mirror location" +msgstr "đặt địa chỉ của máy nhân bản cập nhật" + +#: ../server/plugins/ltsp-build-client/Ubuntu/015-sources-list:3 +#, sh-format +msgid "use the servers sources.list instead of generating one" +msgstr "dùng danh sách các nguồn (sources.list) của máy phục vụ, thay vì tạo ra một danh sách riêng" + +#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:5 +#: ../server/plugins/ltsp-build-client/Ubuntu/030-fat-client:6 +#, sh-format +msgid "run most or all applications locally" +msgstr "chạy cục bộ phần lớn hay tất cả các ứng dụng" + +#: ../server/plugins/ltsp-build-client/Ubuntu/019-ltsp-cluster:3 +#, sh-format +msgid "enable LTSP-Cluster" +msgstr "bật LTSP-Cluster" + +#: ../server/plugins/ltsp-build-client/Ubuntu/095-update-image:3 +#, sh-format +msgid "force to skip the squashfs build (for debian-installer)" +msgstr "ép buộc bỏ qua tiến trình xây dựng squashfs (cho debian-installer)" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:3 +#, sh-format +msgid "Path to Quickstart profile" +msgstr "Đường dẫn đến hồ sơ Khởi Chạy Nhanh" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:4 +#, sh-format +msgid "Debug Quickstart" +msgstr "Gỡ lỗi Khởi Chạy Nhanh" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:5 +#, sh-format +msgid "Show external command output" +msgstr "Hiện kết xuất lệnh ngoài" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:6 +#, sh-format +msgid "Get profile from a Quickstart server" +msgstr "Lấy hồ sơ từ máy phục vụ Khởi Chạy Nhanh" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 +#, sh-format +msgid "Manual Quickstart: %s" +msgstr "Khởi Chạy Nhanh bằng tay: %s" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 +#, sh-format +msgid "Default Quickstart profile: %s" +msgstr "Hồ sơ Khởi Chạy Nhanh mặc định: %s" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 +#, sh-format +msgid "ERROR: %s does not exist" +msgstr "LỖI: %s không tồn tại" + +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 +#, sh-format +msgid "Installing into: %s" +msgstr "Đang cài đặt vào : %s" + +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#, sh-format +msgid "Stage 3 URI" +msgstr "URI giai đoạn 3" + +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#, sh-format +msgid "Set the number of parallel build processes" +msgstr "Đặt số các tiến trình xây dựng chạy song song" + +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#, sh-format +msgid "Set extra mirror locations (space-separated)" +msgstr "Đặt địa chỉ máy nhân bản bổ sung (định giới bằng dấu cách)" + +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 +#, sh-format +msgid "list of extra packages to install as part of the initial installation." +msgstr "danh sách các gói bổ sung cần cài đặt như là phần của tiến trình cài đặt đầu tiên." + +#: ../server/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 +#, sh-format +msgid "Load a user specific configuration file" +msgstr "Nạp một tập tin cấu hình đặc trưng cho người dùng" + +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:9 +#, sh-format +msgid "Path to kickstart file" +msgstr "Đường dẫn đến tập tin kickstart" + +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:10 +#, sh-format +msgid "Path to chroot-creator cache" +msgstr "Đường dẫn đến vùng nhớ tạm chroot-creator" + +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#, sh-format +msgid "Release version number" +msgstr "Số thứ tự phiên bản phát hành" + +#: ../server/plugins/ltsp-build-client/Fedora/010-chroot-creator:12 +#, sh-format +msgid "Distro name" +msgstr "Tên bản phân phối" + +#: ../server/ltsp-build-client:89 +#, sh-format +msgid "API ERROR: you need to provide true or false." +msgstr "LỖI API: bạn cần phải cung cấp trả lời đúng (true) hay sai (false)." + +#: ../server/ltsp-build-client:132 +#, sh-format +msgid "display this help message" +msgstr "hiển thị trợ giúp này" + +#: ../server/ltsp-build-client:133 +#, sh-format +msgid "display help for all available commandline options" +msgstr "hiển thị trợ giúp về tất cả các tùy chọn dòng lệnh sẵn sàng" + +#: ../server/ltsp-build-client:137 +#, sh-format +msgid "LTSP Build Client usage:" +msgstr "Sử dụng trình khách xây dựng LTSP:" + +#: ../server/ltsp-build-client:141 +#, sh-format +msgid " Regular options:" +msgstr " Tùy chọn bình thường:" + +#: ../server/ltsp-build-client:145 +#, sh-format +msgid " Advanced options:" +msgstr " Tùy chọn cấp cao :" + +#: ../server/ltsp-build-client:157 +#, sh-format +msgid "info: LTSP client installation completed successfully" +msgstr "chú ý: tiến trình cài đặt trình khách LTSP đã chạy thành công" + +#: ../server/ltsp-build-client:159 +#, sh-format +msgid "error: LTSP client installation ended abnormally" +msgstr "lỗi: tiến trình cài đặt trình khách LTSP đã kết thúc bất thường" + diff -Nru ltsp-5.2.8/po/zh_CN.po ltsp-5.2.6/po/zh_CN.po --- ltsp-5.2.8/po/zh_CN.po 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/po/zh_CN.po 2011-03-03 21:09:09.000000000 +0000 @@ -1,17 +1,17 @@ # ltsp gettext messages for LANGUAGE. # Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the ltsp package. -# +# # YunQiang Su , 2010. + msgid "" msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-14 11:29-0700\n" +"POT-Creation-Date: 2010-04-04 10:31-0700\n" "PO-Revision-Date: 2010-04-05 12:20+0800\n" "Last-Translator: YunQiang Su \n" "Language-Team: Chinese (simplified) <>\n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -89,7 +89,7 @@ #: ../server/plugins/ltsp-build-client/ALTLinux/010-locales:3 #: ../server/plugins/ltsp-build-client/Debian/025-locales:3 #: ../server/plugins/ltsp-build-client/Ubuntu/025-locales:3 -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 #, sh-format msgid "set the default locale" msgstr "设置默认区域" @@ -445,42 +445,42 @@ msgid "Get profile from a Quickstart server" msgstr "从快速启动服务器获取配置文件" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:11 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:12 #, sh-format msgid "Manual Quickstart: %s" msgstr "手动快速启动：%s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:14 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:15 #, sh-format msgid "Default Quickstart profile: %s" msgstr "默认快速启动配置文件：%s" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:18 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:19 #, sh-format msgid "ERROR: %s does not exist" msgstr "错误：%s 不存在" -#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:34 +#: ../server/plugins/ltsp-build-client/Gentoo/010-bootstrap:35 #, sh-format msgid "Installing into: %s" msgstr "正在安装到：%s" -#: ../server/plugins/ltsp-build-client/Gentoo/002-set-stage-file:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 #, sh-format msgid "Stage 3 URI" msgstr "3 段 URI" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:3 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 #, sh-format msgid "Set the number of parallel build processes" msgstr "设置并行构建进程的数目" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:4 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:5 #, sh-format msgid "Set extra mirror locations (space-separated)" msgstr "设置额外的镜像地址 (用空格分隔)" -#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:6 +#: ../server/plugins/ltsp-build-client/Gentoo/000-basic-configuration:7 #, sh-format msgid "list of extra packages to install as part of the initial installation." msgstr "要作为初始安装组成部分的额外软件包的清单。" diff -Nru ltsp-5.2.8/release.conf ltsp-5.2.6/release.conf --- ltsp-5.2.8/release.conf 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/release.conf 2011-03-03 21:09:09.000000000 +0000 @@ -1,3 +1,3 @@ NAME=ltsp -VERSION=5.2.8 +VERSION=5.2.6 EXPORTCHANGELOG=yes diff -Nru ltsp-5.2.8/server/ltsp-update-kernels ltsp-5.2.6/server/ltsp-update-kernels --- ltsp-5.2.8/server/ltsp-update-kernels 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/server/ltsp-update-kernels 2011-03-03 21:09:09.000000000 +0000 @@ -102,9 +102,6 @@ if [ "$COPYTFTP" = "true" ]; then mkdir -p $TFTPBOOT/$CHROOT_NAME cp -a $CHROOT/boot/. $TFTPBOOT/$CHROOT_NAME/ - - # Make sure permissions are always correct (LP: #759115) - chmod -f 644 $TFTPBOOT/$CHROOT_NAME/vmlinuz-* $TFTPBOOT/$CHROOT_NAME/initrd.img-* $TFTPBOOT/$CHROOT_NAME/nbi.img-* || true fi # OFW on Mac is lame, they cannot tftp from directories diff -Nru ltsp-5.2.8/server/plugins/ltsp-build-client/Gentoo/002-set-stage-file ltsp-5.2.6/server/plugins/ltsp-build-client/Gentoo/002-set-stage-file --- ltsp-5.2.8/server/plugins/ltsp-build-client/Gentoo/002-set-stage-file 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/server/plugins/ltsp-build-client/Gentoo/002-set-stage-file 2011-03-03 21:09:09.000000000 +0000 @@ -3,13 +3,8 @@ add_option "stage-uri" "`eval_gettext "Stage 3 URI"`" "advanced" "true" ;; configure) - if [ -n "$option_stage_uri_value" ] || [ -n "$STAGE_URI" ]; then + if [ -n "$option_stage_uri_value" ] || [ -n $STAGE_URI ]; then STAGE_URI="${option_stage_uri_value:-$STAGE_URI}" - PROTOCOL=$(echo ${STAGE_URI} | sed -e 's|://.\+$||') - fi - - # only download if stage not local - if [[ "$PROTOCOL" != "file" ]]; then STAGE_ARCH=${ARCH} DISTFILES_BASE="http://distfiles.gentoo.org/releases/${ARCH}/autobuilds" diff -Nru ltsp-5.2.8/server/plugins/ltsp-build-client/Gentoo/010-bootstrap ltsp-5.2.6/server/plugins/ltsp-build-client/Gentoo/010-bootstrap --- ltsp-5.2.8/server/plugins/ltsp-build-client/Gentoo/010-bootstrap 2011-04-13 18:29:54.000000000 +0000 +++ ltsp-5.2.6/server/plugins/ltsp-build-client/Gentoo/010-bootstrap 2011-03-03 21:09:09.000000000 +0000 @@ -6,7 +6,7 @@ add_option "quickstart-host" "`eval_gettext "Get profile from a Quickstart server"`" "advanced" "true" ;; configure) - if [ -n "$option_quickstart_profile_value" ] || [ -n "$QUICKSTART_PROFILE" ]; then + if [ -n "$option_quickstart_profile_value" ] || [ -n ${QUICKSTART_PROFILE} ]; then QUICKSTART_PROFILE=${option_quickstart_profile_value:-$QUICKSTART_PROFILE} printf "`eval_gettext "Manual Quickstart: %s"`\n" $QUICKSTART_PROFILE else @@ -26,8 +26,8 @@ if [ -n "$option_quickstart_verbose_value" ] || [ "${QUICKSTART_VERBOSE}" = true ]; then QUICKSTART_ARGS="$QUICKSTART_ARGS --verbose" fi - if [ -n "$option_quickstart_host_value" ] || [ -n "$QUICKSTART_HOST" ]; then - QUICKSTART_ARGS="$QUICKSTART_ARGS --client ${option_quickstart_host_value:-$QUICKSTART_HOST}" + if [ -n "$option_quickstart_host_value" ] || [ -n ${QUICKSTART_HOST} ]; then + QUICKSTART_ARGS="$QUICKSTART_ARGS --client=${option_quickstart_host_value:-$QUICKSTART_HOST}" fi ;; install)