From 65d6d14a16172c3a5128bb6732a3d1c35eeb0425 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 26 May 2018 16:06:07 +0200 Subject: xt transport for experiments: --- src/transport/plugin_transport_xt.c | 4101 +++++++++++++++++++++++++++++++++++ 1 file changed, 4101 insertions(+) create mode 100644 src/transport/plugin_transport_xt.c diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c new file mode 100644 index 0000000000..9ed0f43c9e --- /dev/null +++ b/src/transport/plugin_transport_xt.c @@ -0,0 +1,4101 @@ +/* + This file is part of GNUnet + Copyright (C) 2002--2015 GNUnet e.V. + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ +/** + * @file transport/plugin_transport_xt.c + * @brief Implementation of the TCP transport service + * @author Christian Grothoff + */ +#include "platform.h" +#include "gnunet_hello_lib.h" +#include "gnunet_constants.h" +#include "gnunet_util_lib.h" +#include "gnunet_nat_service.h" +#include "gnunet_protocols.h" +#include "gnunet_resolver_service.h" +#include "gnunet_signatures.h" +#include "gnunet_statistics_service.h" +#include "gnunet_transport_service.h" +#include "gnunet_transport_plugin.h" +#include "transport.h" + +#define LOG(kind,...) GNUNET_log_from (kind, "transport-xt",__VA_ARGS__) + +#define PLUGIN_NAME "xt" + +/** + * How long until we give up on establishing an NAT connection? + * Must be > 4 RTT + */ +#define NAT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) + +/** + * Opaque handle that can be used to cancel + * a transmit-ready notification. + */ +struct GNUNET_CONNECTION_TransmitHandle; + +/** + * @brief handle for a server + */ +struct GNUNET_SERVER_Handle; + +/** + * @brief opaque handle for a client of the server + */ +struct GNUNET_SERVER_Client; + +/** + * @brief opaque handle server returns for aborting transmission to a client. + */ +struct GNUNET_SERVER_TransmitHandle; + +/** + * @brief handle for a network connection + */ +struct GNUNET_CONNECTION_Handle; + +/** + * @brief handle for a network service + */ +struct LEGACY_SERVICE_Context; + + +/** + * Stops a service that was started with #GNUNET_SERVICE_start(). + * + * @param srv service to stop + */ +void +LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *srv); + + + +/** + * Function called to notify a client about the connection begin ready + * to queue more data. @a buf will be NULL and @a size zero if the + * connection was closed for writing in the meantime. + * + * @param cls closure + * @param size number of bytes available in @a buf + * @param buf where the callee should write the message + * @return number of bytes written to @a buf + */ +typedef size_t +(*GNUNET_CONNECTION_TransmitReadyNotify) (void *cls, + size_t size, + void *buf); + +/** + * Credentials for UNIX domain sockets. + */ +struct GNUNET_CONNECTION_Credentials +{ + /** + * UID of the other end of the connection. + */ + uid_t uid; + + /** + * GID of the other end of the connection. + */ + gid_t gid; +}; + + +/** + * Functions with this signature are called whenever a client + * is disconnected on the network level. + * + * @param cls closure + * @param client identification of the client; NULL + * for the last call when the server is destroyed + */ +typedef void +(*GNUNET_SERVER_DisconnectCallback) (void *cls, + struct GNUNET_SERVER_Client *client); + + +/** + * Functions with this signature are called whenever a client + * is connected on the network level. + * + * @param cls closure + * @param client identification of the client + */ +typedef void +(*GNUNET_SERVER_ConnectCallback) (void *cls, + struct GNUNET_SERVER_Client *client); + + + + +/** + * Function to call for access control checks. + * + * @param cls closure + * @param ucred credentials, if available, otherwise NULL + * @param addr address + * @param addrlen length of address + * @return GNUNET_YES to allow, GNUNET_NO to deny, GNUNET_SYSERR + * for unknown address family (will be denied). + */ +typedef int +(*GNUNET_CONNECTION_AccessCheck) (void *cls, + const struct + GNUNET_CONNECTION_Credentials * + ucred, + const struct sockaddr * addr, + socklen_t addrlen); + +/** + * Callback function for data received from the network. Note that + * both "available" and "err" would be 0 if the read simply timed out. + * + * @param cls closure + * @param buf pointer to received data + * @param available number of bytes availabe in "buf", + * possibly 0 (on errors) + * @param addr address of the sender + * @param addrlen size of addr + * @param errCode value of errno (on errors receiving) + */ +typedef void +(*GNUNET_CONNECTION_Receiver) (void *cls, const void *buf, + size_t available, + const struct sockaddr * addr, + socklen_t addrlen, int errCode); + + + +/** + * Close the connection and free associated resources. There must + * not be any pending requests for reading or writing to the + * connection at this time. + * + * @param connection connection to destroy + */ +void +GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *connection); + + +/** + * Signature of a function to create a custom tokenizer. + * + * @param cls closure from #GNUNET_SERVER_set_callbacks + * @param client handle to client the tokenzier will be used for + * @return handle to custom tokenizer ('mst') + */ +typedef void* +(*GNUNET_SERVER_MstCreateCallback) (void *cls, + struct GNUNET_SERVER_Client *client); + + +/** + * Signature of a function to destroy a custom tokenizer. + * + * @param cls closure from #GNUNET_SERVER_set_callbacks + * @param mst custom tokenizer handle + */ +typedef void +(*GNUNET_SERVER_MstDestroyCallback) (void *cls, + void *mst); + +/** + * Signature of a function to receive data for a custom tokenizer. + * + * @param cls closure from #GNUNET_SERVER_set_callbacks + * @param mst custom tokenizer handle + * @param client_identity ID of client for which this is a buffer, + * can be NULL (will be passed back to 'cb') + * @param buf input data to add + * @param size number of bytes in @a buf + * @param purge should any excess bytes in the buffer be discarded + * (i.e. for packet-based services like UDP) + * @param one_shot only call callback once, keep rest of message in buffer + * @return #GNUNET_OK if we are done processing (need more data) + * #GNUNET_NO if one_shot was set and we have another message ready + * #GNUNET_SYSERR if the data stream is corrupt + */ +typedef int +(*GNUNET_SERVER_MstReceiveCallback) (void *cls, void *mst, + struct GNUNET_SERVER_Client *client, + const char *buf, + size_t size, + int purge, + int one_shot); +/** + * Functions with this signature are called whenever a message is + * received. + * + * @param cls closure + * @param client identification of the client + * @param message the actual message + */ +typedef void +(*GNUNET_SERVER_MessageCallback) (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message); + +/** + * Message handler. Each struct specifies how to handle on particular + * type of message received. + */ +struct GNUNET_SERVER_MessageHandler +{ + /** + * Function to call for messages of "type". + */ + GNUNET_SERVER_MessageCallback callback; + + /** + * Closure argument for @e callback. + */ + void *callback_cls; + + /** + * Type of the message this handler covers. + */ + uint16_t type; + + /** + * Expected size of messages of this type. Use 0 for + * variable-size. If non-zero, messages of the given + * type will be discarded (and the connection closed) + * if they do not have the right size. + */ + uint16_t expected_size; + +}; + + +/** + * Options for the service (bitmask). + */ +enum LEGACY_SERVICE_Options +{ + /** + * Use defaults. Terminates all client connections and the listen + * sockets immediately upon receiving the shutdown signal. + */ + LEGACY_SERVICE_OPTION_NONE = 0, + + /** + * Do not trigger server shutdown on signal at all; instead, allow + * for the user to terminate the server explicitly when needed + * by calling #LEGACY_SERVICE_shutdown(). + */ + LEGACY_SERVICE_OPTION_MANUAL_SHUTDOWN = 1, + + /** + * Trigger a SOFT server shutdown on signals, allowing active + * non-monitor clients to complete their transactions. + */ + LEGACY_SERVICE_OPTION_SOFT_SHUTDOWN = 2 +}; + + + +/** + * Ask the server to disconnect from the given client. This is the + * same as passing #GNUNET_SYSERR to #GNUNET_SERVER_receive_done, + * except that it allows dropping of a client even when not handling a + * message from that client. + * + * @param client the client to disconnect from + */ +void +GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client); + +/** + * Return user context associated with the given client. + * Note: you should probably use the macro (call without the underscore). + * + * @param client client to query + * @param size number of bytes in user context struct (for verification only) + * @return pointer to user context + */ +void * +GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client, + size_t size); + + +/** + * Functions with this signature are called whenever a + * complete message is received by the tokenizer. + * + * Do not call #GNUNET_SERVER_mst_destroy from within + * the scope of this callback. + * + * @param cls closure + * @param client identification of the client + * @param message the actual message + * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing + */ +typedef int +(*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, + void *client, + const struct GNUNET_MessageHeader *message); + + +/** + * Create a message stream tokenizer. + * + * @param cb function to call on completed messages + * @param cb_cls closure for @a cb + * @return handle to tokenizer + */ +struct GNUNET_SERVER_MessageStreamTokenizer * +GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, + void *cb_cls); + +/** + * Add incoming data to the receive buffer and call the + * callback for all complete messages. + * + * @param mst tokenizer to use + * @param client_identity ID of client for which this is a buffer, + * can be NULL (will be passed back to 'cb') + * @param buf input data to add + * @param size number of bytes in @a buf + * @param purge should any excess bytes in the buffer be discarded + * (i.e. for packet-based services like UDP) + * @param one_shot only call callback once, keep rest of message in buffer + * @return #GNUNET_OK if we are done processing (need more data) + * #GNUNET_NO if one_shot was set and we have another message ready + * #GNUNET_SYSERR if the data stream is corrupt + */ +int +GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst, + void *client_identity, + const char *buf, size_t size, + int purge, int one_shot); + + + +/** + * Destroys a tokenizer. + * + * @param mst tokenizer to destroy + */ +void +GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst); + + +/** + * Set user context to be associated with the given client. + * Note: you should probably use the macro (call without the underscore). + * + * @param client client to query + * @param ptr pointer to user context + * @param size number of bytes in user context struct (for verification only) + */ +void +GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client, + void *ptr, + size_t size); +/** + * Return user context associated with the given client. + * + * @param client client to query + * @param type expected return type (i.e. 'struct Foo') + * @return pointer to user context of type 'type *'. + */ +#define GNUNET_SERVER_client_get_user_context(client,type) \ + (type *) GNUNET_SERVER_client_get_user_context_ (client, sizeof (type)) + +/** + * Set user context to be associated with the given client. + * + * @param client client to query + * @param value pointer to user context + */ +#define GNUNET_SERVER_client_set_user_context(client,value) \ + GNUNET_SERVER_client_set_user_context_ (client, value, sizeof (*value)) + + + +/** + * Notify us when the server has enough space to transmit + * a message of the given size to the given client. + * + * @param client client to transmit message to + * @param size requested amount of buffer space + * @param timeout after how long should we give up (and call + * notify with buf NULL and size 0)? + * @param callback function to call when space is available + * @param callback_cls closure for @a callback + * @return non-NULL if the notify callback was queued; can be used + * to cancel the request using + * #GNUNET_SERVER_notify_transmit_ready_cancel. + * NULL if we are already going to notify someone else (busy) + */ +struct GNUNET_SERVER_TransmitHandle * +GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, + size_t size, + struct GNUNET_TIME_Relative timeout, + GNUNET_CONNECTION_TransmitReadyNotify callback, + void *callback_cls); + +/** + * Abort transmission request. + * + * @param th request to abort + */ +void +GNUNET_SERVER_notify_transmit_ready_cancel (struct GNUNET_SERVER_TransmitHandle *th); + + + + +/** + * Notify the server that the given client handle should + * be kept (keeps the connection up if possible, increments + * the internal reference counter). + * + * @param client the client to keep + */ +void +GNUNET_SERVER_client_keep (struct GNUNET_SERVER_Client *client); + + +/** + * Notify the server that the given client handle is no + * longer required. Decrements the reference counter. If + * that counter reaches zero an inactive connection maybe + * closed. + * + * @param client the client to drop + */ +void +GNUNET_SERVER_client_drop (struct GNUNET_SERVER_Client *client); + + +/** + * Function called by the service's run + * method to run service-specific setup code. + * + * @param cls closure + * @param server the initialized server + * @param cfg configuration to use + */ +typedef void +(*LEGACY_SERVICE_Main) (void *cls, + struct GNUNET_SERVER_Handle *server, + const struct GNUNET_CONFIGURATION_Handle *cfg); + + + +/** + * Suspend accepting connections from the listen socket temporarily. + * Resume activity using #GNUNET_SERVER_resume. + * + * @param server server to stop accepting connections. + */ +void +GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server); + +/** + * Notify us when the server has enough space to transmit + * a message of the given size to the given client. + * + * @param client client to transmit message to + * @param size requested amount of buffer space + * @param timeout after how long should we give up (and call + * notify with buf NULL and size 0)? + * @param callback function to call when space is available + * @param callback_cls closure for @a callback + * @return non-NULL if the notify callback was queued; can be used + * to cancel the request using + * #GNUNET_SERVER_notify_transmit_ready_cancel. + * NULL if we are already going to notify someone else (busy) + */ +struct GNUNET_SERVER_TransmitHandle * +GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, + size_t size, + struct GNUNET_TIME_Relative timeout, + GNUNET_CONNECTION_TransmitReadyNotify callback, + void *callback_cls); + + +/** + * Add a TCP socket-based connection to the set of handles managed by + * this server. Use this function for outgoing (P2P) connections that + * we initiated (and where this server should process incoming + * messages). + * + * @param server the server to use + * @param connection the connection to manage (client must + * stop using this connection from now on) + * @return the client handle + */ +struct GNUNET_SERVER_Client * +GNUNET_SERVER_connect_socket (struct GNUNET_SERVER_Handle *server, + struct GNUNET_CONNECTION_Handle *connection); + + +/** + * Resume accepting connections from the listen socket. + * + * @param server server to resume accepting connections. + */ +void +GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server); + +/** + * Free resources held by this server. + * + * @param server server to destroy + */ +void +GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server); + + + + +#include "tcp_connection_legacy.c" +#include "tcp_server_mst_legacy.c" +#include "tcp_server_legacy.c" +#include "tcp_service_legacy.c" + +GNUNET_NETWORK_STRUCT_BEGIN + +/** + * Initial handshake message for a session. + */ +struct WelcomeMessage +{ + /** + * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME. + */ + struct GNUNET_MessageHeader header; + + /** + * Identity of the node connecting (TCP client) + */ + struct GNUNET_PeerIdentity clientIdentity; + +}; + +/** + * Basically a WELCOME message, but with the purpose + * of giving the waiting peer a client handle to use + */ +struct TCP_NAT_ProbeMessage +{ + /** + * Type is #GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE. + */ + struct GNUNET_MessageHeader header; + + /** + * Identity of the sender of the message. + */ + struct GNUNET_PeerIdentity clientIdentity; + +}; +GNUNET_NETWORK_STRUCT_END + +/** + * Context for sending a NAT probe via TCP. + */ +struct TCPProbeContext +{ + + /** + * Active probes are kept in a DLL. + */ + struct TCPProbeContext *next; + + /** + * Active probes are kept in a DLL. + */ + struct TCPProbeContext *prev; + + /** + * Probe connection. + */ + struct GNUNET_CONNECTION_Handle *sock; + + /** + * Message to be sent. + */ + struct TCP_NAT_ProbeMessage message; + + /** + * Handle to the transmission. + */ + struct GNUNET_CONNECTION_TransmitHandle *transmit_handle; + + /** + * Transport plugin handle. + */ + struct Plugin *plugin; +}; + +/** + * Bits in the `options` field of TCP addresses. + */ +enum TcpAddressOptions +{ + + /** + * No bits set. + */ + TCP_OPTIONS_NONE = 0, + + /** + * See #HTTP_OPTIONS_VERIFY_CERTIFICATE. + */ + TCP_OPTIONS_RESERVED = 1, + + /** + * Enable TCP Stealth-style port knocking. + */ + TCP_OPTIONS_TCP_STEALTH = 2 +}; + +GNUNET_NETWORK_STRUCT_BEGIN + +/** + * Network format for IPv4 addresses. + */ +struct IPv4TcpAddress +{ + /** + * Optional options and flags for this address, + * see `enum TcpAddressOptions` + */ + uint32_t options GNUNET_PACKED; + + /** + * IPv4 address, in network byte order. + */ + uint32_t ipv4_addr GNUNET_PACKED; + + /** + * Port number, in network byte order. + */ + uint16_t t4_port GNUNET_PACKED; + +}; + +/** + * Network format for IPv6 addresses. + */ +struct IPv6TcpAddress +{ + /** + * Optional flags for this address + * see `enum TcpAddressOptions` + */ + uint32_t options GNUNET_PACKED; + + /** + * IPv6 address. + */ + struct in6_addr ipv6_addr GNUNET_PACKED; + + /** + * Port number, in network byte order. + */ + uint16_t t6_port GNUNET_PACKED; + +}; +GNUNET_NETWORK_STRUCT_END + +/** + * Encapsulation of all of the state of the plugin. + */ +struct Plugin; + +/** + * Information kept for each message that is yet to + * be transmitted. + */ +struct PendingMessage +{ + + /** + * This is a doubly-linked list. + */ + struct PendingMessage *next; + + /** + * This is a doubly-linked list. + */ + struct PendingMessage *prev; + + /** + * The pending message + */ + const char *msg; + + /** + * Continuation function to call once the message + * has been sent. Can be NULL if there is no + * continuation to call. + */ + GNUNET_TRANSPORT_TransmitContinuation transmit_cont; + + /** + * Closure for @e transmit_cont. + */ + void *transmit_cont_cls; + + /** + * Timeout value for the pending message. + */ + struct GNUNET_TIME_Absolute timeout; + + /** + * So that the gnunet-service-transport can group messages together, + * these pending messages need to accept a message buffer and size + * instead of just a `struct GNUNET_MessageHeader`. + */ + size_t message_size; + +}; + +/** + * Session handle for TCP connections. + */ +struct GNUNET_ATS_Session +{ + /** + * To whom are we talking to (set to our identity + * if we are still waiting for the welcome message) + */ + struct GNUNET_PeerIdentity target; + + /** + * Pointer to the global plugin struct. + */ + struct Plugin *plugin; + + /** + * The client (used to identify this connection) + */ + struct GNUNET_SERVER_Client *client; + + /** + * Task cleaning up a NAT client connection establishment attempt; + */ + struct GNUNET_SCHEDULER_Task *nat_connection_timeout; + + /** + * Messages currently pending for transmission + * to this peer, if any. + */ + struct PendingMessage *pending_messages_head; + + /** + * Messages currently pending for transmission + * to this peer, if any. + */ + struct PendingMessage *pending_messages_tail; + + /** + * Handle for pending transmission request. + */ + struct GNUNET_SERVER_TransmitHandle *transmit_handle; + + /** + * Address of the other peer. + */ + struct GNUNET_HELLO_Address *address; + + /** + * ID of task used to delay receiving more to throttle sender. + */ + struct GNUNET_SCHEDULER_Task *receive_delay_task; + + /** + * Session timeout task + */ + struct GNUNET_SCHEDULER_Task *timeout_task; + + /** + * When will this session time out? + */ + struct GNUNET_TIME_Absolute timeout; + + /** + * When will we continue to read from the socket? + * (used to enforce inbound quota). + */ + struct GNUNET_TIME_Absolute receive_delay; + + /** + * Last activity on this connection. Used to select preferred + * connection. + */ + struct GNUNET_TIME_Absolute last_activity; + + /** + * Number of bytes waiting for transmission to this peer. + */ + unsigned long long bytes_in_queue; + + /** + * Number of messages waiting for transmission to this peer. + */ + unsigned int msgs_in_queue; + + /** + * Network type of the address. + */ + enum GNUNET_ATS_Network_Type scope; + + /** + * Are we still expecting the welcome message? (#GNUNET_YES/#GNUNET_NO) + */ + int expecting_welcome; + + /** + * Was this session created using NAT traversal? + */ + int is_nat; + +}; + + +/** + * Context for address to string conversion, closure + * for #append_port(). + */ +struct PrettyPrinterContext +{ + /** + * DLL + */ + struct PrettyPrinterContext *next; + + /** + * DLL + */ + struct PrettyPrinterContext *prev; + + /** + * Our plugin. + */ + struct Plugin *plugin; + + /** + * Timeout task + */ + struct GNUNET_SCHEDULER_Task *timeout_task; + + /** + * Resolver handle + */ + struct GNUNET_RESOLVER_RequestHandle *resolver_handle; + + /** + * Function to call with the result. + */ + GNUNET_TRANSPORT_AddressStringCallback asc; + + /** + * Clsoure for @e asc. + */ + void *asc_cls; + + /** + * IPv6 address + */ + int ipv6; + + /** + * Options + */ + uint32_t options; + + /** + * Port to add after the IP address. + */ + uint16_t port; +}; + + +/** + * Encapsulation of all of the state of the plugin. + */ +struct Plugin +{ + /** + * Our environment. + */ + struct GNUNET_TRANSPORT_PluginEnvironment *env; + + /** + * The listen socket. + */ + struct GNUNET_CONNECTION_Handle *lsock; + + /** + * Our handle to the NAT module. + */ + struct GNUNET_NAT_Handle *nat; + + /** + * Map from peer identities to sessions for the given peer. + */ + struct GNUNET_CONTAINER_MultiPeerMap *sessionmap; + + /** + * Handle to the network service. + */ + struct LEGACY_SERVICE_Context *service; + + /** + * Handle to the server for this service. + */ + struct GNUNET_SERVER_Handle *server; + + /** + * Copy of the handler array where the closures are + * set to this struct's instance. + */ + struct GNUNET_SERVER_MessageHandler *handlers; + + /** + * Map of peers we have tried to contact behind a NAT + */ + struct GNUNET_CONTAINER_MultiPeerMap *nat_wait_conns; + + /** + * List of active TCP probes. + */ + struct TCPProbeContext *probe_head; + + /** + * List of active TCP probes. + */ + struct TCPProbeContext *probe_tail; + + /** + * Function to call about session status changes. + */ + GNUNET_TRANSPORT_SessionInfoCallback sic; + + /** + * Closure for @e sic. + */ + void *sic_cls; + + /** + * ID of task used to update our addresses when one expires. + */ + struct GNUNET_SCHEDULER_Task *address_update_task; + + /** + * Running pretty printers: head + */ + struct PrettyPrinterContext *ppc_dll_head; + + /** + * Running pretty printers: tail + */ + struct PrettyPrinterContext *ppc_dll_tail; + + /** + * Welcome message used by this peer. + */ + struct WelcomeMessage my_welcome; + + /** + * How many more TCP sessions are we allowed to open right now? + */ + unsigned long long max_connections; + + /** + * How many more TCP sessions do we have right now? + */ + unsigned long long cur_connections; + + /** + * Address options + */ + uint32_t myoptions; + + /** + * Port that we are actually listening on. + */ + uint16_t open_port; + + /** + * Port that the user said we would have visible to the + * rest of the world. + */ + uint16_t adv_port; + +}; + + +/** + * Get the list of addresses that a server for the given service + * should bind to. + * + * @param service_name name of the service + * @param cfg configuration (which specifies the addresses) + * @param addrs set (call by reference) to an array of pointers to the + * addresses the server should bind to and listen on; the + * array will be NULL-terminated (on success) + * @param addr_lens set (call by reference) to an array of the lengths + * of the respective `struct sockaddr` struct in the @a addrs + * array (on success) + * @return number of addresses found on success, + * #GNUNET_SYSERR if the configuration + * did not specify reasonable finding information or + * if it specified a hostname that could not be resolved; + * #GNUNET_NO if the number of addresses configured is + * zero (in this case, `*addrs` and `*addr_lens` will be + * set to NULL). + */ +static int +get_server_addresses (const char *service_name, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct sockaddr ***addrs, + socklen_t ** addr_lens) +{ + int disablev6; + struct GNUNET_NETWORK_Handle *desc; + unsigned long long port; + char *unixpath; + struct addrinfo hints; + struct addrinfo *res; + struct addrinfo *pos; + struct addrinfo *next; + unsigned int i; + int resi; + int ret; + int abstract; + struct sockaddr **saddrs; + socklen_t *saddrlens; + char *hostname; + + *addrs = NULL; + *addr_lens = NULL; + desc = NULL; + if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "DISABLEV6")) + { + if (GNUNET_SYSERR == + (disablev6 = + GNUNET_CONFIGURATION_get_value_yesno (cfg, service_name, "DISABLEV6"))) + return GNUNET_SYSERR; + } + else + disablev6 = GNUNET_NO; + + if (! disablev6) + { + /* probe IPv6 support */ + desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0); + if (NULL == desc) + { + if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) || + (EACCES == errno)) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); + return GNUNET_SYSERR; + } + LOG (GNUNET_ERROR_TYPE_INFO, + _("Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"), + service_name, STRERROR (errno)); + disablev6 = GNUNET_YES; + } + else + { + GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); + desc = NULL; + } + } + + port = 0; + if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT")) + { + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (cfg, service_name, + "PORT", &port)) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Require valid port number for service `%s' in configuration!\n"), + service_name); + } + if (port > 65535) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Require valid port number for service `%s' in configuration!\n"), + service_name); + return GNUNET_SYSERR; + } + } + + if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO")) + { + GNUNET_break (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (cfg, service_name, + "BINDTO", &hostname)); + } + else + hostname = NULL; + + unixpath = NULL; + abstract = GNUNET_NO; +#ifdef AF_UNIX + if ((GNUNET_YES == + GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) && + (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_filename (cfg, service_name, "UNIXPATH", + &unixpath)) && + (0 < strlen (unixpath))) + { + /* probe UNIX support */ + struct sockaddr_un s_un; + + if (strlen (unixpath) >= sizeof (s_un.sun_path)) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("UNIXPATH `%s' too long, maximum length is %llu\n"), unixpath, + (unsigned long long) sizeof (s_un.sun_path)); + unixpath = GNUNET_NETWORK_shorten_unixpath (unixpath); + LOG (GNUNET_ERROR_TYPE_INFO, + _("Using `%s' instead\n"), + unixpath); + } +#ifdef LINUX + abstract = GNUNET_CONFIGURATION_get_value_yesno (cfg, + "TESTING", + "USE_ABSTRACT_SOCKETS"); + if (GNUNET_SYSERR == abstract) + abstract = GNUNET_NO; +#endif + if ((GNUNET_YES != abstract) + && (GNUNET_OK != + GNUNET_DISK_directory_create_for_file (unixpath))) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, + "mkdir", + unixpath); + } + if (NULL != unixpath) + { + desc = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0); + if (NULL == desc) + { + if ((ENOBUFS == errno) || (ENOMEM == errno) || (ENFILE == errno) || + (EACCES == errno)) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket"); + GNUNET_free_non_null (hostname); + GNUNET_free (unixpath); + return GNUNET_SYSERR; + } + LOG (GNUNET_ERROR_TYPE_INFO, + _("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"), + service_name, + STRERROR (errno)); + GNUNET_free (unixpath); + unixpath = NULL; + } + else + { + GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); + desc = NULL; + } + } +#endif + + if ((0 == port) && (NULL == unixpath)) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), + service_name); + GNUNET_free_non_null (hostname); + return GNUNET_SYSERR; + } + if (0 == port) + { + saddrs = GNUNET_malloc (2 * sizeof (struct sockaddr *)); + saddrlens = GNUNET_malloc (2 * sizeof (socklen_t)); + add_unixpath (saddrs, saddrlens, unixpath, abstract); + GNUNET_free_non_null (unixpath); + GNUNET_free_non_null (hostname); + *addrs = saddrs; + *addr_lens = saddrlens; + return 1; + } + + if (NULL != hostname) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Resolving `%s' since that is where `%s' will bind to.\n", + hostname, + service_name); + memset (&hints, 0, sizeof (struct addrinfo)); + if (disablev6) + hints.ai_family = AF_INET; + hints.ai_protocol = IPPROTO_TCP; + if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) || + (NULL == res)) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Failed to resolve `%s': %s\n"), + hostname, + gai_strerror (ret)); + GNUNET_free (hostname); + GNUNET_free_non_null (unixpath); + return GNUNET_SYSERR; + } + next = res; + i = 0; + while (NULL != (pos = next)) + { + next = pos->ai_next; + if ((disablev6) && (pos->ai_family == AF_INET6)) + continue; + i++; + } + if (0 == i) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Failed to find %saddress for `%s'.\n"), + disablev6 ? "IPv4 " : "", + hostname); + freeaddrinfo (res); + GNUNET_free (hostname); + GNUNET_free_non_null (unixpath); + return GNUNET_SYSERR; + } + resi = i; + if (NULL != unixpath) + resi++; + saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); + saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); + i = 0; + if (NULL != unixpath) + { + add_unixpath (saddrs, saddrlens, unixpath, abstract); + i++; + } + next = res; + while (NULL != (pos = next)) + { + next = pos->ai_next; + if ((disablev6) && (AF_INET6 == pos->ai_family)) + continue; + if ((IPPROTO_TCP != pos->ai_protocol) && (0 != pos->ai_protocol)) + continue; /* not TCP */ + if ((SOCK_STREAM != pos->ai_socktype) && (0 != pos->ai_socktype)) + continue; /* huh? */ + LOG (GNUNET_ERROR_TYPE_DEBUG, "Service `%s' will bind to `%s'\n", + service_name, GNUNET_a2s (pos->ai_addr, pos->ai_addrlen)); + if (AF_INET == pos->ai_family) + { + GNUNET_assert (sizeof (struct sockaddr_in) == pos->ai_addrlen); + saddrlens[i] = pos->ai_addrlen; + saddrs[i] = GNUNET_malloc (saddrlens[i]); + GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); + ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); + } + else + { + GNUNET_assert (AF_INET6 == pos->ai_family); + GNUNET_assert (sizeof (struct sockaddr_in6) == pos->ai_addrlen); + saddrlens[i] = pos->ai_addrlen; + saddrs[i] = GNUNET_malloc (saddrlens[i]); + GNUNET_memcpy (saddrs[i], pos->ai_addr, saddrlens[i]); + ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); + } + i++; + } + GNUNET_free (hostname); + freeaddrinfo (res); + resi = i; + } + else + { + /* will bind against everything, just set port */ + if (disablev6) + { + /* V4-only */ + resi = 1; + if (NULL != unixpath) + resi++; + i = 0; + saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); + saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); + if (NULL != unixpath) + { + add_unixpath (saddrs, saddrlens, unixpath, abstract); + i++; + } + saddrlens[i] = sizeof (struct sockaddr_in); + saddrs[i] = GNUNET_malloc (saddrlens[i]); +#if HAVE_SOCKADDR_IN_SIN_LEN + ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[i]; +#endif + ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET; + ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); + } + else + { + /* dual stack */ + resi = 2; + if (NULL != unixpath) + resi++; + saddrs = GNUNET_malloc ((resi + 1) * sizeof (struct sockaddr *)); + saddrlens = GNUNET_malloc ((resi + 1) * sizeof (socklen_t)); + i = 0; + if (NULL != unixpath) + { + add_unixpath (saddrs, saddrlens, unixpath, abstract); + i++; + } + saddrlens[i] = sizeof (struct sockaddr_in6); + saddrs[i] = GNUNET_malloc (saddrlens[i]); +#if HAVE_SOCKADDR_IN_SIN_LEN + ((struct sockaddr_in6 *) saddrs[i])->sin6_len = saddrlens[0]; +#endif + ((struct sockaddr_in6 *) saddrs[i])->sin6_family = AF_INET6; + ((struct sockaddr_in6 *) saddrs[i])->sin6_port = htons (port); + i++; + saddrlens[i] = sizeof (struct sockaddr_in); + saddrs[i] = GNUNET_malloc (saddrlens[i]); +#if HAVE_SOCKADDR_IN_SIN_LEN + ((struct sockaddr_in *) saddrs[i])->sin_len = saddrlens[1]; +#endif + ((struct sockaddr_in *) saddrs[i])->sin_family = AF_INET; + ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port); + } + } + GNUNET_free_non_null (unixpath); + *addrs = saddrs; + *addr_lens = saddrlens; + return resi; +} +/* end ancient copy-and-paste */ + + +/** + * If a session monitor is attached, notify it about the new + * session state. + * + * @param plugin our plugin + * @param session session that changed state + * @param state new state of the session + */ +static void +notify_session_monitor (struct Plugin *plugin, + struct GNUNET_ATS_Session *session, + enum GNUNET_TRANSPORT_SessionState state) +{ + struct GNUNET_TRANSPORT_SessionInfo info; + + if (NULL == plugin->sic) + return; + memset (&info, 0, sizeof (info)); + info.state = state; + info.is_inbound = GNUNET_HELLO_address_check_option (session->address, + GNUNET_HELLO_ADDRESS_INFO_INBOUND); + info.num_msg_pending = session->msgs_in_queue; + info.num_bytes_pending = session->bytes_in_queue; + if (NULL != session->receive_delay_task) + info.receive_delay = session->receive_delay; + info.session_timeout = session->timeout; + info.address = session->address; + plugin->sic (plugin->sic_cls, + session, + &info); +} + + +/** + * Our external IP address/port mapping has changed. + * + * @param cls closure, the `struct Plugin` + * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean + * the previous (now invalid) one + * @param ac address class the address belongs to + * @param addr either the previous or the new public IP address + * @param addrlen actual length of @a addr + */ +static void +tcp_nat_port_map_callback (void *cls, + int add_remove, + enum GNUNET_NAT_AddressClass ac, + const struct sockaddr *addr, + socklen_t addrlen) +{ + struct Plugin *plugin = cls; + struct GNUNET_HELLO_Address *address; + struct IPv4TcpAddress t4; + struct IPv6TcpAddress t6; + void *arg; + size_t args; + + LOG (GNUNET_ERROR_TYPE_INFO, + "NAT notification to %s address `%s'\n", + (GNUNET_YES == add_remove) ? "add" : "remove", + GNUNET_a2s (addr, addrlen)); + /* convert 'addr' to our internal format */ + switch (addr->sa_family) + { + case AF_INET: + GNUNET_assert(addrlen == sizeof(struct sockaddr_in)); + memset (&t4, 0, sizeof(t4)); + t4.options = htonl (plugin->myoptions); + t4.ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr; + t4.t4_port = ((struct sockaddr_in *) addr)->sin_port; + arg = &t4; + args = sizeof (t4); + break; + case AF_INET6: + GNUNET_assert(addrlen == sizeof(struct sockaddr_in6)); + memset (&t6, 0, sizeof(t6)); + GNUNET_memcpy (&t6.ipv6_addr, + &((struct sockaddr_in6 *) addr)->sin6_addr, + sizeof(struct in6_addr)); + t6.options = htonl (plugin->myoptions); + t6.t6_port = ((struct sockaddr_in6 *) addr)->sin6_port; + arg = &t6; + args = sizeof (t6); + break; + default: + GNUNET_break(0); + return; + } + /* modify our published address list */ + GNUNET_assert ((args == sizeof (struct IPv4TcpAddress)) || + (args == sizeof (struct IPv6TcpAddress))); + /* TODO: use 'ac' here in the future... */ + address = GNUNET_HELLO_address_allocate (plugin->env->my_identity, + PLUGIN_NAME, + arg, + args, + GNUNET_HELLO_ADDRESS_INFO_NONE); + plugin->env->notify_address (plugin->env->cls, + add_remove, + address); + GNUNET_HELLO_address_free (address); +} + + +/** + * Function called for a quick conversion of the binary address to + * a numeric address. Note that the caller must not free the + * address and that the next call to this function is allowed + * to override the address again. + * + * @param cls closure (`struct Plugin*`) + * @param addr binary address + * @param addrlen length of @a addr + * @return string representing the same address + */ +static const char * +tcp_plugin_address_to_string (void *cls, + const void *addr, + size_t addrlen) +{ + static char rbuf[INET6_ADDRSTRLEN + 12]; + char buf[INET6_ADDRSTRLEN]; + const void *sb; + struct in_addr a4; + struct in6_addr a6; + const struct IPv4TcpAddress *t4; + const struct IPv6TcpAddress *t6; + int af; + uint16_t port; + uint32_t options; + + switch (addrlen) + { + case sizeof(struct IPv6TcpAddress): + t6 = addr; + af = AF_INET6; + port = ntohs (t6->t6_port); + options = ntohl (t6->options); + GNUNET_memcpy (&a6, &t6->ipv6_addr, sizeof(a6)); + sb = &a6; + break; + case sizeof(struct IPv4TcpAddress): + t4 = addr; + af = AF_INET; + port = ntohs (t4->t4_port); + options = ntohl (t4->options); + GNUNET_memcpy (&a4, &t4->ipv4_addr, sizeof(a4)); + sb = &a4; + break; + default: + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Unexpected address length: %u bytes\n"), + (unsigned int) addrlen); + return NULL ; + } + if (NULL == inet_ntop (af, sb, buf, INET6_ADDRSTRLEN)) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "inet_ntop"); + return NULL ; + } + GNUNET_snprintf (rbuf, sizeof(rbuf), + (af == AF_INET6) ? "%s.%u.[%s]:%u" : "%s.%u.%s:%u", + PLUGIN_NAME, + options, + buf, + port); + return rbuf; +} + + +/** + * Function called to convert a string address to + * a binary address. + * + * @param cls closure (`struct Plugin*`) + * @param addr string address + * @param addrlen length of the address + * @param buf location to store the buffer + * @param added location to store the number of bytes in the buffer. + * If the function returns #GNUNET_SYSERR, its contents are undefined. + * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure + */ +static int +tcp_plugin_string_to_address (void *cls, + const char *addr, + uint16_t addrlen, + void **buf, + size_t *added) +{ + struct sockaddr_storage socket_address; + char *address; + char *plugin; + char *optionstr; + uint32_t options; + + /* Format tcp.options.address:port */ + address = NULL; + plugin = NULL; + optionstr = NULL; + if ((NULL == addr) || (0 == addrlen)) + { + GNUNET_break(0); + return GNUNET_SYSERR; + } + if ('\0' != addr[addrlen - 1]) + { + GNUNET_break(0); + return GNUNET_SYSERR; + } + if (strlen (addr) != addrlen - 1) + { + GNUNET_break(0); + return GNUNET_SYSERR; + } + plugin = GNUNET_strdup (addr); + optionstr = strchr (plugin, '.'); + if (NULL == optionstr) + { + GNUNET_break(0); + GNUNET_free(plugin); + return GNUNET_SYSERR; + } + optionstr[0] = '\0'; + optionstr++; + options = atol (optionstr); + address = strchr (optionstr, '.'); + if (NULL == address) + { + GNUNET_break(0); + GNUNET_free(plugin); + return GNUNET_SYSERR; + } + address[0] = '\0'; + address++; + + if (GNUNET_OK != + GNUNET_STRINGS_to_address_ip (address, + strlen (address), + &socket_address)) + { + GNUNET_break(0); + GNUNET_free(plugin); + return GNUNET_SYSERR; + } + + GNUNET_free(plugin); + switch (socket_address.ss_family) + { + case AF_INET: + { + struct IPv4TcpAddress *t4; + struct sockaddr_in *in4 = (struct sockaddr_in *) &socket_address; + t4 = GNUNET_new (struct IPv4TcpAddress); + t4->options = htonl (options); + t4->ipv4_addr = in4->sin_addr.s_addr; + t4->t4_port = in4->sin_port; + *buf = t4; + *added = sizeof(struct IPv4TcpAddress); + return GNUNET_OK; + } + case AF_INET6: + { + struct IPv6TcpAddress *t6; + struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) &socket_address; + t6 = GNUNET_new (struct IPv6TcpAddress); + t6->options = htonl (options); + t6->ipv6_addr = in6->sin6_addr; + t6->t6_port = in6->sin6_port; + *buf = t6; + *added = sizeof(struct IPv6TcpAddress); + return GNUNET_OK; + } + default: + return GNUNET_SYSERR; + } +} + + +/** + * Find the session handle for the given client. + * Currently uses both the hashmap and the client + * context, as the client context is new and the + * logic still needs to be tested. + * + * @param plugin the plugin + * @param client which client to find the session handle for + * @return NULL if no matching session exists + */ +static struct GNUNET_ATS_Session * +lookup_session_by_client (struct Plugin *plugin, + struct GNUNET_SERVER_Client *client) +{ + return GNUNET_SERVER_client_get_user_context (client, + struct GNUNET_ATS_Session); +} + + +/** + * Functions with this signature are called whenever we need + * to close a session due to a disconnect or failure to + * establish a connection. + * + * @param cls the `struct Plugin` + * @param session session to close down + * @return #GNUNET_OK on success + */ +static int +tcp_plugin_disconnect_session (void *cls, + struct GNUNET_ATS_Session *session) +{ + struct Plugin *plugin = cls; + struct PendingMessage *pm; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Disconnecting session of peer `%s' address `%s'\n", + GNUNET_i2s (&session->target), + tcp_plugin_address_to_string (session->plugin, + session->address->address, + session->address->address_length)); + + if (NULL != session->timeout_task) + { + GNUNET_SCHEDULER_cancel (session->timeout_task); + session->timeout_task = NULL; + session->timeout = GNUNET_TIME_UNIT_ZERO_ABS; + } + + if (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (plugin->sessionmap, + &session->target, + session)) + { + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# TCP sessions active"), + -1, + GNUNET_NO); + } + else + { + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns, + &session->target, + session)); + } + if (NULL != session->client) + GNUNET_SERVER_client_set_user_context (session->client, + NULL); + + /* clean up state */ + if (NULL != session->transmit_handle) + { + GNUNET_SERVER_notify_transmit_ready_cancel (session->transmit_handle); + session->transmit_handle = NULL; + } + session->plugin->env->session_end (session->plugin->env->cls, + session->address, + session); + + if (NULL != session->nat_connection_timeout) + { + GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); + session->nat_connection_timeout = NULL; + } + + while (NULL != (pm = session->pending_messages_head)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + (NULL != pm->transmit_cont) + ? "Could not deliver message to `%s' at %s.\n" + : "Could not deliver message to `%s' at %s, notifying.\n", + GNUNET_i2s (&session->target), + tcp_plugin_address_to_string (session->plugin, + session->address->address, + session->address->address_length)); + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), + -(int64_t) pm->message_size, GNUNET_NO); + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# bytes discarded by TCP (disconnect)"), + pm->message_size, + GNUNET_NO); + GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, + session->pending_messages_tail, + pm); + GNUNET_assert (0 < session->msgs_in_queue); + session->msgs_in_queue--; + GNUNET_assert (pm->message_size <= session->bytes_in_queue); + session->bytes_in_queue -= pm->message_size; + if (NULL != pm->transmit_cont) + pm->transmit_cont (pm->transmit_cont_cls, + &session->target, + GNUNET_SYSERR, + pm->message_size, + 0); + GNUNET_free (pm); + } + GNUNET_assert (0 == session->msgs_in_queue); + GNUNET_assert (0 == session->bytes_in_queue); + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_DONE); + + if (NULL != session->receive_delay_task) + { + GNUNET_SCHEDULER_cancel (session->receive_delay_task); + session->receive_delay_task = NULL; + } + if (NULL != session->client) + { + GNUNET_SERVER_client_disconnect (session->client); + session->client = NULL; + } + GNUNET_HELLO_address_free (session->address); + GNUNET_assert (NULL == session->transmit_handle); + GNUNET_free (session); + return GNUNET_OK; +} + + +/** + * Function that is called to get the keepalive factor. + * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to + * calculate the interval between keepalive packets. + * + * @param cls closure with the `struct Plugin` + * @return keepalive factor + */ +static unsigned int +tcp_plugin_query_keepalive_factor (void *cls) +{ + return 3; +} + + +/** + * Session was idle for too long, so disconnect it + * + * @param cls the `struct GNUNET_ATS_Session` of the idle session + */ +static void +session_timeout (void *cls) +{ + struct GNUNET_ATS_Session *s = cls; + struct GNUNET_TIME_Relative left; + + s->timeout_task = NULL; + left = GNUNET_TIME_absolute_get_remaining (s->timeout); + if (0 != left.rel_value_us) + { + /* not actually our turn yet, but let's at least update + the monitor, it may think we're about to die ... */ + notify_session_monitor (s->plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, + &session_timeout, + s); + return; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p was idle for %s, disconnecting\n", + s, + GNUNET_STRINGS_relative_time_to_string (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, + GNUNET_YES)); + /* call session destroy function */ + tcp_plugin_disconnect_session (s->plugin, + s); +} + + +/** + * Increment session timeout due to activity. + * + * @param s session to increment timeout for + */ +static void +reschedule_session_timeout (struct GNUNET_ATS_Session *s) +{ + GNUNET_assert (NULL != s->timeout_task); + s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); +} + + +/** + * Create a new session. Also queues a welcome message. + * + * @param plugin the plugin + * @param address the address to create the session for + * @param scope network scope the address is from + * @param client client to use, reference counter must have already been increased + * @param is_nat this a NAT session, we should wait for a client to + * connect to us from an address, then assign that to + * the session + * @return new session object + */ +static struct GNUNET_ATS_Session * +create_session (struct Plugin *plugin, + const struct GNUNET_HELLO_Address *address, + enum GNUNET_ATS_Network_Type scope, + struct GNUNET_SERVER_Client *client, + int is_nat) +{ + struct GNUNET_ATS_Session *session; + struct PendingMessage *pm; + + if (GNUNET_YES != is_nat) + GNUNET_assert (NULL != client); + else + GNUNET_assert (NULL == client); + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Creating new session for peer `%s' at address %s\n", + GNUNET_i2s (&address->peer), + tcp_plugin_address_to_string (plugin, + address->address, + address->address_length)); + session = GNUNET_new (struct GNUNET_ATS_Session); + session->last_activity = GNUNET_TIME_absolute_get (); + session->plugin = plugin; + session->is_nat = is_nat; + if (NULL != client) + { + session->client = client; + GNUNET_SERVER_client_set_user_context (client, + session); + } + session->address = GNUNET_HELLO_address_copy (address); + session->target = address->peer; + session->expecting_welcome = GNUNET_YES; + session->scope = scope; + pm = GNUNET_malloc (sizeof (struct PendingMessage) + + sizeof (struct WelcomeMessage)); + pm->msg = (const char *) &pm[1]; + pm->message_size = sizeof(struct WelcomeMessage); + GNUNET_memcpy (&pm[1], + &plugin->my_welcome, + sizeof(struct WelcomeMessage)); + pm->timeout = GNUNET_TIME_UNIT_FOREVER_ABS; + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), + pm->message_size, + GNUNET_NO); + GNUNET_CONTAINER_DLL_insert (session->pending_messages_head, + session->pending_messages_tail, + pm); + session->msgs_in_queue++; + session->bytes_in_queue += pm->message_size; + session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); + session->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, + &session_timeout, + session); + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_INIT); + if (GNUNET_YES != is_nat) + { + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# TCP sessions active"), + 1, + GNUNET_NO); + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_UP); + } + else + { + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_HANDSHAKE); + } + return session; +} + + +/** + * If we have pending messages, ask the server to + * transmit them (schedule the respective tasks, etc.) + * + * @param session for which session should we do this + */ +static void +process_pending_messages (struct GNUNET_ATS_Session *session); + + +/** + * Function called to notify a client about the socket + * being ready to queue more data. "buf" will be + * NULL and "size" zero if the socket was closed for + * writing in the meantime. + * + * @param cls closure + * @param size number of bytes available in @a buf + * @param buf where the callee should write the message + * @return number of bytes written to @a buf + */ +static size_t +do_transmit (void *cls, + size_t size, + void *buf) +{ + struct GNUNET_ATS_Session *session = cls; + struct GNUNET_PeerIdentity pid; + struct Plugin *plugin; + struct PendingMessage *pos; + struct PendingMessage *hd; + struct PendingMessage *tl; + struct GNUNET_TIME_Absolute now; + char *cbuf; + size_t ret; + + session->transmit_handle = NULL; + plugin = session->plugin; + if (NULL == buf) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Timeout trying to transmit to peer `%s', discarding message queue.\n", + GNUNET_i2s (&session->target)); + /* timeout; cancel all messages that have already expired */ + hd = NULL; + tl = NULL; + ret = 0; + now = GNUNET_TIME_absolute_get (); + while ( (NULL != (pos = session->pending_messages_head)) && + (pos->timeout.abs_value_us <= now.abs_value_us) ) + { + GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, + session->pending_messages_tail, + pos); + GNUNET_assert (0 < session->msgs_in_queue); + session->msgs_in_queue--; + GNUNET_assert (pos->message_size <= session->bytes_in_queue); + session->bytes_in_queue -= pos->message_size; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to transmit %u byte message to `%s'.\n", + pos->message_size, + GNUNET_i2s (&session->target)); + ret += pos->message_size; + GNUNET_CONTAINER_DLL_insert_after (hd, + tl, + tl, + pos); + } + /* do this call before callbacks (so that if callbacks destroy + * session, they have a chance to cancel actions done by this + * call) */ + process_pending_messages (session); + pid = session->target; + /* no do callbacks and do not use session again since + * the callbacks may abort the session */ + while (NULL != (pos = hd)) + { + GNUNET_CONTAINER_DLL_remove (hd, + tl, + pos); + if (NULL != pos->transmit_cont) + pos->transmit_cont (pos->transmit_cont_cls, + &pid, + GNUNET_SYSERR, + pos->message_size, + 0); + GNUNET_free (pos); + } + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), -(int64_t) ret, + GNUNET_NO); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes discarded by TCP (timeout)"), + ret, + GNUNET_NO); + if (0 < ret) + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_UPDATE); + return 0; + } + /* copy all pending messages that would fit */ + ret = 0; + cbuf = buf; + hd = NULL; + tl = NULL; + while (NULL != (pos = session->pending_messages_head)) + { + if (ret + pos->message_size > size) + break; + GNUNET_CONTAINER_DLL_remove (session->pending_messages_head, + session->pending_messages_tail, + pos); + GNUNET_assert (0 < session->msgs_in_queue); + session->msgs_in_queue--; + GNUNET_assert (pos->message_size <= session->bytes_in_queue); + session->bytes_in_queue -= pos->message_size; + GNUNET_assert(size >= pos->message_size); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting message of type %u size %u to peer %s at %s\n", + ntohs (((struct GNUNET_MessageHeader *) pos->msg)->type), + pos->message_size, + GNUNET_i2s (&session->target), + tcp_plugin_address_to_string (session->plugin, + session->address->address, + session->address->address_length)); + /* FIXME: this GNUNET_memcpy can be up to 7% of our total runtime */ + GNUNET_memcpy (cbuf, + pos->msg, + pos->message_size); + cbuf += pos->message_size; + ret += pos->message_size; + size -= pos->message_size; + GNUNET_CONTAINER_DLL_insert_tail (hd, + tl, + pos); + } + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_UPDATE); + /* schedule 'continuation' before callbacks so that callbacks that + * cancel everything don't cause us to use a session that no longer + * exists... */ + process_pending_messages (session); + session->last_activity = GNUNET_TIME_absolute_get (); + pid = session->target; + /* we'll now call callbacks that may cancel the session; hence + * we should not use 'session' after this point */ + while (NULL != (pos = hd)) + { + GNUNET_CONTAINER_DLL_remove (hd, tl, pos); + if (NULL != pos->transmit_cont) + pos->transmit_cont (pos->transmit_cont_cls, + &pid, + GNUNET_OK, + pos->message_size, + pos->message_size); /* FIXME: include TCP overhead */ + GNUNET_free (pos); + } + GNUNET_assert (NULL == hd); + GNUNET_assert (NULL == tl); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), + - (int64_t) ret, + GNUNET_NO); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes transmitted via TCP"), + ret, + GNUNET_NO); + return ret; +} + + +/** + * If we have pending messages, ask the server to + * transmit them (schedule the respective tasks, etc.) + * + * @param session for which session should we do this + */ +static void +process_pending_messages (struct GNUNET_ATS_Session *session) +{ + struct PendingMessage *pm; + + GNUNET_assert (NULL != session->client); + if (NULL != session->transmit_handle) + return; + if (NULL == (pm = session->pending_messages_head)) + return; + + session->transmit_handle + = GNUNET_SERVER_notify_transmit_ready (session->client, + pm->message_size, + GNUNET_TIME_absolute_get_remaining (pm->timeout), + &do_transmit, + session); +} + + +/** + * Function that can be used by the transport service to transmit + * a message using the plugin. Note that in the case of a + * peer disconnecting, the continuation MUST be called + * prior to the disconnect notification itself. This function + * will be called with this peer's HELLO message to initiate + * a fresh connection to another peer. + * + * @param cls closure + * @param session which session must be used + * @param msgbuf the message to transmit + * @param msgbuf_size number of bytes in @a msgbuf + * @param priority how important is the message (most plugins will + * ignore message priority and just FIFO) + * @param to how long to wait at most for the transmission (does not + * require plugins to discard the message after the timeout, + * just advisory for the desired delay; most plugins will ignore + * this as well) + * @param cont continuation to call once the message has + * been transmitted (or if the transport is ready + * for the next transmission call; or if the + * peer disconnected...); can be NULL + * @param cont_cls closure for @a cont + * @return number of bytes used (on the physical network, with overheads); + * -1 on hard errors (i.e. address invalid); 0 is a legal value + * and does NOT mean that the message was not transmitted (DV) + */ +static ssize_t +tcp_plugin_send (void *cls, + struct GNUNET_ATS_Session *session, + const char *msgbuf, + size_t msgbuf_size, + unsigned int priority, + struct GNUNET_TIME_Relative to, + GNUNET_TRANSPORT_TransmitContinuation cont, + void *cont_cls) +{ + struct Plugin * plugin = cls; + struct PendingMessage *pm; + + /* create new message entry */ + pm = GNUNET_malloc (sizeof (struct PendingMessage) + msgbuf_size); + pm->msg = (const char *) &pm[1]; + GNUNET_memcpy (&pm[1], msgbuf, msgbuf_size); + pm->message_size = msgbuf_size; + pm->timeout = GNUNET_TIME_relative_to_absolute (to); + pm->transmit_cont = cont; + pm->transmit_cont_cls = cont_cls; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Asked to transmit %u bytes to `%s', added message to list.\n", + msgbuf_size, + GNUNET_i2s (&session->target)); + + if (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap, + &session->target, + session)) + { + GNUNET_assert (NULL != session->client); + GNUNET_SERVER_client_set_timeout (session->client, + GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), + msgbuf_size, + GNUNET_NO); + + /* append pm to pending_messages list */ + GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, + session->pending_messages_tail, + pm); + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_UPDATE); + session->msgs_in_queue++; + session->bytes_in_queue += pm->message_size; + process_pending_messages (session); + return msgbuf_size; + } + if (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_contains_value (plugin->nat_wait_conns, + &session->target, + session)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "This NAT WAIT session for peer `%s' is not yet ready!\n", + GNUNET_i2s (&session->target)); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes currently in TCP buffers"), msgbuf_size, + GNUNET_NO); + /* append pm to pending_messages list */ + GNUNET_CONTAINER_DLL_insert_tail (session->pending_messages_head, + session->pending_messages_tail, + pm); + session->msgs_in_queue++; + session->bytes_in_queue += pm->message_size; + notify_session_monitor (session->plugin, + session, + GNUNET_TRANSPORT_SS_HANDSHAKE); + return msgbuf_size; + } + LOG (GNUNET_ERROR_TYPE_ERROR, + "Invalid session %p\n", + session); + if (NULL != cont) + cont (cont_cls, + &session->target, + GNUNET_SYSERR, + pm->message_size, + 0); + GNUNET_break (0); + GNUNET_free (pm); + return GNUNET_SYSERR; /* session does not exist here */ +} + + +/** + * Closure for #session_lookup_it(). + */ +struct GNUNET_ATS_SessionItCtx +{ + /** + * Address we are looking for. + */ + const struct GNUNET_HELLO_Address *address; + + /** + * Where to store the session (if we found it). + */ + struct GNUNET_ATS_Session *result; + +}; + + +/** + * Look for a session by address. + * + * @param cls the `struct GNUNET_ATS_SessionItCtx` + * @param key unused + * @param value a `struct GNUNET_ATS_Session` + * @return #GNUNET_YES to continue looking, #GNUNET_NO if we found the session + */ +static int +session_lookup_it (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct GNUNET_ATS_SessionItCtx *si_ctx = cls; + struct GNUNET_ATS_Session *session = value; + + if (0 != + GNUNET_HELLO_address_cmp (si_ctx->address, + session->address)) + return GNUNET_YES; + si_ctx->result = session; + return GNUNET_NO; +} + + +/** + * Task cleaning up a NAT connection attempt after timeout + * + * @param cls the `struct GNUNET_ATS_Session` + */ +static void +nat_connect_timeout (void *cls) +{ + struct GNUNET_ATS_Session *session = cls; + + session->nat_connection_timeout = NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "NAT WAIT connection to `%4s' at `%s' could not be established, removing session\n", + GNUNET_i2s (&session->target), + tcp_plugin_address_to_string (session->plugin, + session->address->address, + session->address->address_length)); + tcp_plugin_disconnect_session (session->plugin, + session); +} + + +/** + * Function that will be called whenever the transport service wants to + * notify the plugin that a session is still active and in use and + * therefore the session timeout for this session has to be updated + * + * @param cls closure + * @param peer which peer was the session for + * @param session which session is being updated + */ +static void +tcp_plugin_update_session_timeout (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_ATS_Session *session) +{ + reschedule_session_timeout (session); +} + + +/** + * Task to signal the server that we can continue + * receiving from the TCP client now. + * + * @param cls the `struct GNUNET_ATS_Session *` + */ +static void +delayed_done (void *cls) +{ + struct GNUNET_ATS_Session *session = cls; + + session->receive_delay_task = NULL; + reschedule_session_timeout (session); + GNUNET_SERVER_receive_done (session->client, + GNUNET_OK); +} + + +/** + * Function that will be called whenever the transport service wants to + * notify the plugin that the inbound quota changed and that the plugin + * should update it's delay for the next receive value + * + * @param cls closure + * @param peer which peer was the session for + * @param session which session is being updated + * @param delay new delay to use for receiving + */ +static void +tcp_plugin_update_inbound_delay (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_ATS_Session *session, + struct GNUNET_TIME_Relative delay) +{ + if (NULL == session->receive_delay_task) + return; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "New inbound delay %s\n", + GNUNET_STRINGS_relative_time_to_string (delay, + GNUNET_NO)); + session->receive_delay = GNUNET_TIME_relative_to_absolute (delay); + GNUNET_SCHEDULER_cancel (session->receive_delay_task); + session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay, + &delayed_done, + session); +} + + +/** + * Create a new session to transmit data to the target + * This session will used to send data to this peer and the plugin will + * notify us by calling the env->session_end function + * + * @param cls closure + * @param address the address to use + * @return the session if the address is valid, NULL otherwise + */ +static struct GNUNET_ATS_Session * +tcp_plugin_get_session (void *cls, + const struct GNUNET_HELLO_Address *address) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = NULL; + int af; + const void *sb; + size_t sbs; + struct GNUNET_CONNECTION_Handle *sa; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4TcpAddress *t4; + const struct IPv6TcpAddress *t6; + unsigned int options; + enum GNUNET_ATS_Network_Type net_type; + unsigned int is_natd = GNUNET_NO; + size_t addrlen; +#ifdef TCP_STEALTH + struct GNUNET_NETWORK_Handle *s; +#endif + + addrlen = address->address_length; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Trying to get session for `%s' address of peer `%s'\n", + tcp_plugin_address_to_string (plugin, + address->address, + address->address_length), + GNUNET_i2s (&address->peer)); + + if (GNUNET_HELLO_address_check_option (address, + GNUNET_HELLO_ADDRESS_INFO_INBOUND)) + { + GNUNET_break (0); + return NULL; + } + + /* look for existing session */ + if (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_contains (plugin->sessionmap, + &address->peer)) + { + struct GNUNET_ATS_SessionItCtx si_ctx; + + si_ctx.address = address; + si_ctx.result = NULL; + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, + &address->peer, + &session_lookup_it, + &si_ctx); + if (NULL != si_ctx.result) + { + session = si_ctx.result; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found existing session for `%s' address `%s'\n", + GNUNET_i2s (&address->peer), + tcp_plugin_address_to_string (plugin, + address->address, + address->address_length)); + return session; + } + /* This is a bit of a hack, limiting TCP to never allow more than + one TCP connection to any given peer at the same time. + Without this, peers sometimes disagree about which of the TCP + connections they should use, causing one side to believe that + they transmit successfully, while the other receives nothing. */ + return NULL; /* Refuse to have more than one TCP connection per + peer pair at the same time. */ + } + + if (addrlen == sizeof(struct IPv6TcpAddress)) + { + GNUNET_assert (NULL != address->address); /* make static analysis happy */ + t6 = address->address; + options = t6->options; + af = AF_INET6; + memset (&a6, 0, sizeof(a6)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_family = AF_INET6; + a6.sin6_port = t6->t6_port; + if (t6->t6_port == 0) + is_natd = GNUNET_YES; + GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); + sb = &a6; + sbs = sizeof(a6); + } + else if (addrlen == sizeof(struct IPv4TcpAddress)) + { + GNUNET_assert(NULL != address->address); /* make static analysis happy */ + t4 = address->address; + options = t4->options; + af = AF_INET; + memset (&a4, 0, sizeof(a4)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_family = AF_INET; + a4.sin_port = t4->t4_port; + if (t4->t4_port == 0) + is_natd = GNUNET_YES; + a4.sin_addr.s_addr = t4->ipv4_addr; + sb = &a4; + sbs = sizeof(a4); + } + else + { + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# requests to create session with invalid address"), + 1, + GNUNET_NO); + return NULL; + } + + net_type = plugin->env->get_address_type (plugin->env->cls, + sb, + sbs); + GNUNET_break (net_type != GNUNET_ATS_NET_UNSPECIFIED); + + if ( (is_natd == GNUNET_YES) && + (addrlen == sizeof(struct IPv6TcpAddress)) ) + { + /* NAT client only works with IPv4 addresses */ + return NULL; + } + + if (plugin->cur_connections >= plugin->max_connections) + { + /* saturated */ + return NULL; + } + + if ( (is_natd == GNUNET_YES) && + (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, + &address->peer))) + { + /* Only do one NAT punch attempt per peer identity */ + return NULL; + } + + if ( (is_natd == GNUNET_YES) && + (NULL != plugin->nat) && + (GNUNET_NO == + GNUNET_CONTAINER_multipeermap_contains (plugin->nat_wait_conns, + &address->peer))) + { + struct sockaddr_in local_sa; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found valid IPv4 NAT address (creating session)!\n"); + session = create_session (plugin, + address, + net_type, + NULL, + GNUNET_YES); + session->nat_connection_timeout = GNUNET_SCHEDULER_add_delayed (NAT_TIMEOUT, + &nat_connect_timeout, + session); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (plugin->nat_wait_conns, + &session->target, + session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Created NAT WAIT connection to `%s' at `%s'\n", + GNUNET_i2s (&session->target), + GNUNET_a2s (sb, sbs)); + memset (&local_sa, + 0, + sizeof (local_sa)); + local_sa.sin_family = AF_INET; + local_sa.sin_port = htons (plugin->open_port); + /* We leave sin_address at 0, let the kernel figure it out, + even if our bind() is more specific. (May want to reconsider + later.) */ + if (GNUNET_OK == + GNUNET_NAT_request_reversal (plugin->nat, + &local_sa, + &a4)) + return session; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Running NAT client for `%s' at `%s' failed\n", + GNUNET_i2s (&session->target), + GNUNET_a2s (sb, sbs)); + tcp_plugin_disconnect_session (plugin, + session); + return NULL; + } + + /* create new outbound session */ + if (0 != (options & TCP_OPTIONS_TCP_STEALTH)) + { +#ifdef TCP_STEALTH + s = GNUNET_NETWORK_socket_create (af, SOCK_STREAM, 0); + if (NULL == s) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, + "socket"); + sa = NULL; + } + else + { + if ( (GNUNET_OK != + GNUNET_NETWORK_socket_setsockopt (s, + IPPROTO_TCP, + TCP_STEALTH, + &session->target, + sizeof (struct GNUNET_PeerIdentity))) || + (GNUNET_OK != + GNUNET_NETWORK_socket_setsockopt (s, + IPPROTO_TCP, + TCP_STEALTH_INTEGRITY, + &plugin->my_welcome, + sizeof (struct WelcomeMessage))) ) + { + /* TCP STEALTH not supported by kernel */ + GNUNET_break (GNUNET_OK == + GNUNET_NETWORK_socket_close (s)); + sa = NULL; + } + else + { + sa = GNUNET_CONNECTION_connect_socket (s, sb, sbs); + } + } +#else + sa = NULL; +#endif + } + else + { + sa = GNUNET_CONNECTION_create_from_sockaddr (af, sb, sbs); + } + if (NULL == sa) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to create connection to `%s' at `%s'\n", + GNUNET_i2s (&address->peer), + GNUNET_a2s (sb, sbs)); + return NULL; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Asked to transmit to `%s', creating fresh session using address `%s'.\n", + GNUNET_i2s (&address->peer), + GNUNET_a2s (sb, sbs)); + + session = create_session (plugin, + address, + net_type, + GNUNET_SERVER_connect_socket (plugin->server, + sa), + GNUNET_NO); + (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, + &session->target, + session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + /* Send TCP Welcome */ + process_pending_messages (session); + + return session; +} + + +/** + * We have been asked to destroy all connections to a particular peer. + * This function is called on each applicable session and must tear it + * down. + * + * @param cls the `struct Plugin *` + * @param key the peer which the session belongs to (unused) + * @param value the `struct GNUNET_ATS_Session` + * @return #GNUNET_YES (continue to iterate) + */ +static int +session_disconnect_it (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = value; + + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# transport-service disconnect requests for TCP"), + 1, + GNUNET_NO); + tcp_plugin_disconnect_session (plugin, + session); + return GNUNET_YES; +} + + +/** + * Function that can be called to force a disconnect from the + * specified neighbour. This should also cancel all previously + * scheduled transmissions. Obviously the transmission may have been + * partially completed already, which is OK. The plugin is supposed + * to close the connection (if applicable) and no longer call the + * transmit continuation(s). + * + * Finally, plugin MUST NOT call the services's receive function to + * notify the service that the connection to the specified target was + * closed after a getting this call. + * + * @param cls closure + * @param target peer for which the last transmission is + * to be cancelled + */ +static void +tcp_plugin_disconnect (void *cls, + const struct GNUNET_PeerIdentity *target) +{ + struct Plugin *plugin = cls; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Disconnecting peer `%s'\n", + GNUNET_i2s (target)); + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessionmap, + target, + &session_disconnect_it, + plugin); + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->nat_wait_conns, + target, + &session_disconnect_it, + plugin); +} + + +/** + * We are processing an address pretty printing request and finished + * the IP resolution (if applicable). Append our port and forward the + * result. If called with @a hostname NULL, we are done and should + * clean up the pretty printer (otherwise, there might be multiple + * hostnames for the IP address and we might receive more). + * + * @param cls the `struct PrettyPrinterContext *` + * @param hostname hostname part of the address + */ +static void +append_port (void *cls, + const char *hostname) +{ + struct PrettyPrinterContext *ppc = cls; + struct Plugin *plugin = ppc->plugin; + char *ret; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "append_port called with hostname `%s'\n", + hostname); + if (NULL == hostname) + { + /* Final call, done */ + ppc->resolver_handle = NULL; + GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + ppc); + ppc->asc (ppc->asc_cls, + NULL, + GNUNET_OK); + GNUNET_free (ppc); + return; + } + if (GNUNET_YES == ppc->ipv6) + GNUNET_asprintf (&ret, + "%s.%u.[%s]:%d", + PLUGIN_NAME, + ppc->options, + hostname, + ppc->port); + else + GNUNET_asprintf (&ret, + "%s.%u.%s:%d", + PLUGIN_NAME, + ppc->options, + hostname, + ppc->port); + ppc->asc (ppc->asc_cls, + ret, + GNUNET_OK); + GNUNET_free (ret); +} + + +/** + * Convert the transports address to a nice, human-readable format. + * + * @param cls closure with the `struct Plugin` + * @param type name of the transport that generated the address + * @param addr one of the addresses of the host, NULL for the last address + * the specific address format depends on the transport + * @param addrlen length of the @a addr + * @param numeric should (IP) addresses be displayed in numeric form? + * @param timeout after how long should we give up? + * @param asc function to call on each string + * @param asc_cls closure for @a asc + */ +static void +tcp_plugin_address_pretty_printer (void *cls, + const char *type, + const void *addr, + size_t addrlen, + int numeric, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback asc, + void *asc_cls) +{ + struct Plugin *plugin = cls; + struct PrettyPrinterContext *ppc; + const void *sb; + size_t sbs; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4TcpAddress *t4; + const struct IPv6TcpAddress *t6; + uint16_t port; + uint32_t options; + + if (sizeof(struct IPv6TcpAddress) == addrlen) + { + t6 = addr; + memset (&a6, 0, sizeof(a6)); + a6.sin6_family = AF_INET6; + a6.sin6_port = t6->t6_port; + GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); + port = ntohs (t6->t6_port); + options = ntohl (t6->options); + sb = &a6; + sbs = sizeof(a6); + } + else if (sizeof(struct IPv4TcpAddress) == addrlen) + { + t4 = addr; + memset (&a4, 0, sizeof(a4)); + a4.sin_family = AF_INET; + a4.sin_port = t4->t4_port; + a4.sin_addr.s_addr = t4->ipv4_addr; + port = ntohs (t4->t4_port); + options = ntohl (t4->options); + sb = &a4; + sbs = sizeof(a4); + } + else + { + /* invalid address */ + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Unexpected address length: %u bytes\n"), + (unsigned int) addrlen); + asc (asc_cls, NULL, GNUNET_SYSERR); + asc (asc_cls, NULL, GNUNET_OK); + return; + } + ppc = GNUNET_new (struct PrettyPrinterContext); + ppc->plugin = plugin; + if (addrlen == sizeof(struct IPv6TcpAddress)) + ppc->ipv6 = GNUNET_YES; + else + ppc->ipv6 = GNUNET_NO; + ppc->asc = asc; + ppc->asc_cls = asc_cls; + ppc->port = port; + ppc->options = options; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting DNS reverse lookup\n"); + ppc->resolver_handle = GNUNET_RESOLVER_hostname_get (sb, + sbs, + ! numeric, + timeout, + &append_port, + ppc); + if (NULL == ppc->resolver_handle) + { + GNUNET_break (0); + GNUNET_free (ppc); + return; + } + GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + ppc); +} + + +/** + * Function that will be called to check if a binary address for this + * plugin is well-formed and corresponds to an address for THIS peer + * (as per our configuration). Naturally, if absolutely necessary, + * plugins can be a bit conservative in their answer, but in general + * plugins should make sure that the address does not redirect + * traffic to a 3rd party that might try to man-in-the-middle our + * traffic. + * + * @param cls closure, our `struct Plugin *` + * @param addr pointer to the address + * @param addrlen length of @a addr + * @return #GNUNET_OK if this is a plausible address for this peer + * and transport, #GNUNET_SYSERR if not + */ +static int +tcp_plugin_check_address (void *cls, + const void *addr, + size_t addrlen) +{ + struct Plugin *plugin = cls; + const struct IPv4TcpAddress *v4; + const struct IPv6TcpAddress *v6; + + if ( (addrlen != sizeof(struct IPv4TcpAddress)) && + (addrlen != sizeof(struct IPv6TcpAddress)) ) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + + if (addrlen == sizeof(struct IPv4TcpAddress)) + { + struct sockaddr_in s4; + + v4 = (const struct IPv4TcpAddress *) addr; + if (0 != memcmp (&v4->options, + &plugin->myoptions, + sizeof(uint32_t))) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + memset (&s4, 0, sizeof (s4)); + s4.sin_family = AF_INET; +#if HAVE_SOCKADDR_IN_SIN_LEN + s4.sin_len = sizeof (s4); +#endif + s4.sin_port = v4->t4_port; + s4.sin_addr.s_addr = v4->ipv4_addr; + + if (GNUNET_OK != + GNUNET_NAT_test_address (plugin->nat, + &s4, + sizeof (struct sockaddr_in))) + return GNUNET_SYSERR; + } + else + { + struct sockaddr_in6 s6; + + v6 = (const struct IPv6TcpAddress *) addr; + if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + if (0 != memcmp (&v6->options, + &plugin->myoptions, + sizeof (uint32_t))) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + memset (&s6, 0, sizeof (s6)); + s6.sin6_family = AF_INET6; +#if HAVE_SOCKADDR_IN_SIN_LEN + s6.sin6_len = sizeof (s6); +#endif + s6.sin6_port = v6->t6_port; + s6.sin6_addr = v6->ipv6_addr; + + if (GNUNET_OK != + GNUNET_NAT_test_address (plugin->nat, + &s6, + sizeof(struct sockaddr_in6))) + return GNUNET_SYSERR; + } + return GNUNET_OK; +} + + +/** + * We've received a nat probe from this peer via TCP. Finish + * creating the client session and resume sending of queued + * messages. + * + * @param cls closure + * @param client identification of the client + * @param message the actual message + */ +static void +handle_tcp_nat_probe (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session; + const struct TCP_NAT_ProbeMessage *tcp_nat_probe; + size_t alen; + void *vaddr; + struct IPv4TcpAddress *t4; + struct IPv6TcpAddress *t6; + const struct sockaddr_in *s4; + const struct sockaddr_in6 *s6; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Received NAT probe\n"); + /* We have received a TCP NAT probe, meaning we (hopefully) initiated + * a connection to this peer by running gnunet-nat-client. This peer + * received the punch message and now wants us to use the new connection + * as the default for that peer. Do so and then send a WELCOME message + * so we can really be connected! + */ + if (ntohs (message->size) != sizeof(struct TCP_NAT_ProbeMessage)) + { + GNUNET_break_op(0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + + tcp_nat_probe = (const struct TCP_NAT_ProbeMessage *) message; + if (0 == memcmp (&tcp_nat_probe->clientIdentity, plugin->env->my_identity, + sizeof(struct GNUNET_PeerIdentity))) + { + /* refuse connections from ourselves */ + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + + session = GNUNET_CONTAINER_multipeermap_get (plugin->nat_wait_conns, + &tcp_nat_probe->clientIdentity); + if (NULL == session) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Did NOT find session for NAT probe!\n"); + GNUNET_SERVER_receive_done (client, + GNUNET_OK); + return; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found session for NAT probe!\n"); + + if (NULL != session->nat_connection_timeout) + { + GNUNET_SCHEDULER_cancel (session->nat_connection_timeout); + session->nat_connection_timeout = NULL; + } + + if (GNUNET_OK != + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen)) + { + GNUNET_break(0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + tcp_plugin_disconnect_session (plugin, + session); + return; + } + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (plugin->nat_wait_conns, + &tcp_nat_probe->clientIdentity, + session)); + GNUNET_SERVER_client_set_user_context (client, + session); + (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, + &session->target, + session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + session->last_activity = GNUNET_TIME_absolute_get (); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found address `%s' for incoming connection\n", + GNUNET_a2s (vaddr, alen)); + switch (((const struct sockaddr *) vaddr)->sa_family) + { + case AF_INET: + s4 = vaddr; + t4 = GNUNET_new (struct IPv4TcpAddress); + t4->options = htonl (TCP_OPTIONS_NONE); + t4->t4_port = s4->sin_port; + t4->ipv4_addr = s4->sin_addr.s_addr; + session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity, + PLUGIN_NAME, + &t4, + sizeof(struct IPv4TcpAddress), + GNUNET_HELLO_ADDRESS_INFO_NONE); + break; + case AF_INET6: + s6 = vaddr; + t6 = GNUNET_new (struct IPv6TcpAddress); + t6->options = htonl (TCP_OPTIONS_NONE); + t6->t6_port = s6->sin6_port; + GNUNET_memcpy (&t6->ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr)); + session->address = GNUNET_HELLO_address_allocate (&tcp_nat_probe->clientIdentity, + PLUGIN_NAME, + &t6, + sizeof(struct IPv6TcpAddress), + GNUNET_HELLO_ADDRESS_INFO_NONE); + break; + default: + GNUNET_break_op(0); + LOG(GNUNET_ERROR_TYPE_DEBUG, + "Bad address for incoming connection!\n"); + GNUNET_free(vaddr); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + tcp_plugin_disconnect_session (plugin, + session); + return; + } + GNUNET_free (vaddr); + GNUNET_break (NULL == session->client); + session->client = client; + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# TCP sessions active"), + 1, + GNUNET_NO); + process_pending_messages (session); + GNUNET_SERVER_receive_done (client, + GNUNET_OK); +} + + +/** + * We've received a welcome from this peer via TCP. Possibly create a + * fresh client record and send back our welcome. + * + * @param cls closure + * @param client identification of the client + * @param message the actual message + */ +static void +handle_tcp_welcome (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + struct Plugin *plugin = cls; + const struct WelcomeMessage *wm = (const struct WelcomeMessage *) message; + struct GNUNET_HELLO_Address *address; + struct GNUNET_ATS_Session *session; + size_t alen; + void *vaddr; + struct IPv4TcpAddress t4; + struct IPv6TcpAddress t6; + const struct sockaddr_in *s4; + const struct sockaddr_in6 *s6; + + if (0 == memcmp (&wm->clientIdentity, + plugin->env->my_identity, + sizeof(struct GNUNET_PeerIdentity))) + { + /* refuse connections from ourselves */ + if (GNUNET_OK == + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen)) + { + LOG (GNUNET_ERROR_TYPE_INFO, + "Received WELCOME message from my own identity `%s' on address `%s'\n", + GNUNET_i2s (&wm->clientIdentity), + GNUNET_a2s (vaddr, alen)); + GNUNET_free (vaddr); + } + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + + if (GNUNET_OK == + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen)) + { + LOG(GNUNET_ERROR_TYPE_DEBUG, + "Received WELCOME message from `%s' on address `%s'\n", + GNUNET_i2s (&wm->clientIdentity), + GNUNET_a2s (vaddr, alen)); + GNUNET_free (vaddr); + } + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# TCP WELCOME messages received"), + 1, + GNUNET_NO); + session = lookup_session_by_client (plugin, + client); + if (NULL != session) + { + if (GNUNET_OK == + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found existing session %p for peer `%s'\n", + session, + GNUNET_a2s (vaddr, alen)); + GNUNET_free (vaddr); + } + } + else + { + if (GNUNET_OK == + GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) + { + if (alen == sizeof(struct sockaddr_in)) + { + s4 = vaddr; + memset (&t4, '\0', sizeof (t4)); + t4.options = htonl (TCP_OPTIONS_NONE); + t4.t4_port = s4->sin_port; + t4.ipv4_addr = s4->sin_addr.s_addr; + address = GNUNET_HELLO_address_allocate (&wm->clientIdentity, + PLUGIN_NAME, + &t4, + sizeof(t4), + GNUNET_HELLO_ADDRESS_INFO_INBOUND); + } + else if (alen == sizeof(struct sockaddr_in6)) + { + s6 = vaddr; + memset (&t6, '\0', sizeof (t6)); + t6.options = htonl (TCP_OPTIONS_NONE); + t6.t6_port = s6->sin6_port; + GNUNET_memcpy (&t6.ipv6_addr, &s6->sin6_addr, sizeof(struct in6_addr)); + address = GNUNET_HELLO_address_allocate (&wm->clientIdentity, + PLUGIN_NAME, + &t6, + sizeof (t6), + GNUNET_HELLO_ADDRESS_INFO_INBOUND); + } + else + { + GNUNET_break (0); + GNUNET_free_non_null (vaddr); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + session = create_session (plugin, + address, + plugin->env->get_address_type (plugin->env->cls, + vaddr, + alen), + client, + GNUNET_NO); + GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != session->scope); + GNUNET_HELLO_address_free (address); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Creating new%s session %p for peer `%s' client %p\n", + GNUNET_HELLO_address_check_option (session->address, + GNUNET_HELLO_ADDRESS_INFO_INBOUND) + ? " inbound" : "", + session, + tcp_plugin_address_to_string (plugin, + session->address->address, + session->address->address_length), + client); + GNUNET_free (vaddr); + (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessionmap, + &session->target, + session, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + /* Notify transport and ATS about new session */ + plugin->env->session_start (plugin->env->cls, + session->address, + session, + session->scope); + } + else + { + LOG(GNUNET_ERROR_TYPE_DEBUG, + "Did not obtain TCP socket address for incoming connection\n"); + GNUNET_break(0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + } + + if (GNUNET_YES != session->expecting_welcome) + { + GNUNET_break_op (0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + return; + } + session->last_activity = GNUNET_TIME_absolute_get (); + session->expecting_welcome = GNUNET_NO; + + process_pending_messages (session); + GNUNET_SERVER_client_set_timeout (client, + GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); + GNUNET_SERVER_receive_done (client, + GNUNET_OK); +} + + +/** + * We've received data for this peer via TCP. Unbox, + * compute latency and forward. + * + * @param cls closure + * @param client identification of the client + * @param message the actual message + */ +static void +handle_tcp_data (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session; + struct GNUNET_TIME_Relative delay; + uint16_t type; + + type = ntohs (message->type); + if ( (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME == type) || + (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE == type) ) + { + /* We don't want to propagate WELCOME and NAT Probe messages up! */ + GNUNET_SERVER_receive_done (client, + GNUNET_OK); + return; + } + session = lookup_session_by_client (plugin, client); + if (NULL == session) + { + /* No inbound session found */ + void *vaddr = NULL; + size_t alen; + + GNUNET_assert (GNUNET_OK == + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen)); + LOG (GNUNET_ERROR_TYPE_ERROR, + "Received unexpected %u bytes of type %u from `%s'\n", + (unsigned int) ntohs (message->size), + (unsigned int) ntohs (message->type), + GNUNET_a2s (vaddr, + alen)); + GNUNET_break_op(0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + GNUNET_free_non_null (vaddr); + return; + } + if (GNUNET_YES == session->expecting_welcome) + { + /* Session is expecting WELCOME message */ + void *vaddr = NULL; + size_t alen; + + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen); + LOG (GNUNET_ERROR_TYPE_ERROR, + "Received unexpected %u bytes of type %u from `%s'\n", + (unsigned int) ntohs (message->size), + (unsigned int) ntohs (message->type), + GNUNET_a2s (vaddr, alen)); + GNUNET_break_op(0); + GNUNET_SERVER_receive_done (client, + GNUNET_SYSERR); + GNUNET_free_non_null (vaddr); + return; + } + + session->last_activity = GNUNET_TIME_absolute_get (); + { + void *vaddr = NULL; + size_t alen; + + GNUNET_SERVER_client_get_address (client, + &vaddr, + &alen); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Passing %u bytes of type %u from `%s' at %s to transport service.\n", + (unsigned int) ntohs (message->size), + (unsigned int) ntohs (message->type), + GNUNET_i2s (&session->target), + GNUNET_a2s (vaddr, alen)); + GNUNET_free_non_null (vaddr); + } + + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# bytes received via TCP"), + ntohs (message->size), + GNUNET_NO); + + GNUNET_assert (GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessionmap, + &session->target, + session)); + delay = plugin->env->receive (plugin->env->cls, + session->address, + session, + message); + reschedule_session_timeout (session); + if (0 == delay.rel_value_us) + { + GNUNET_SERVER_receive_done (client, + GNUNET_OK); + } + else + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Throttling receiving from `%s' for %s\n", + GNUNET_i2s (&session->target), + GNUNET_STRINGS_relative_time_to_string (delay, + GNUNET_YES)); + GNUNET_SERVER_disable_receive_done_warning (client); + GNUNET_assert (NULL == session->receive_delay_task); + session->receive_delay_task = GNUNET_SCHEDULER_add_delayed (delay, + &delayed_done, + session); + } +} + + +/** + * Function called whenever a peer is connected on the "SERVER" level. + * Increments number of active connections and suspends server if we + * have reached the limit. + * + * @param cls closure + * @param client identification of the client + */ +static void +connect_notify (void *cls, + struct GNUNET_SERVER_Client *client) +{ + struct Plugin *plugin = cls; + + if (NULL == client) + return; + plugin->cur_connections++; + GNUNET_STATISTICS_set (plugin->env->stats, + gettext_noop ("# TCP server connections active"), + plugin->cur_connections, + GNUNET_NO); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# TCP server connect events"), + 1, + GNUNET_NO); + if (plugin->cur_connections != plugin->max_connections) + return; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("TCP connection limit reached, suspending server\n")); + GNUNET_STATISTICS_update (plugin->env->stats, + gettext_noop ("# TCP service suspended"), + 1, + GNUNET_NO); + GNUNET_SERVER_suspend (plugin->server); /* Maximum number of connections rechead */ +} + + +/** + * Function called whenever a peer is disconnected on the "SERVER" + * level. Cleans up the connection, decrements number of active + * connections and if applicable resumes listening. + * + * @param cls closure + * @param client identification of the client + */ +static void +disconnect_notify (void *cls, + struct GNUNET_SERVER_Client *client) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session; + + if (NULL == client) + return; + GNUNET_assert (plugin->cur_connections >= 1); + plugin->cur_connections--; + session = lookup_session_by_client (plugin, + client); + if (NULL == session) + return; /* unknown, nothing to do */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Destroying session of `%s' with %s due to network-level disconnect.\n", + GNUNET_i2s (&session->target), + tcp_plugin_address_to_string (session->plugin, + session->address->address, + session->address->address_length)); + + if (plugin->cur_connections == plugin->max_connections) + { + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# TCP service resumed"), + 1, + GNUNET_NO); + GNUNET_SERVER_resume (plugin->server); /* Resume server */ + } + GNUNET_STATISTICS_set (plugin->env->stats, + gettext_noop ("# TCP server connections active"), + plugin->cur_connections, + GNUNET_NO); + GNUNET_STATISTICS_update (session->plugin->env->stats, + gettext_noop ("# network-level TCP disconnect events"), + 1, + GNUNET_NO); + tcp_plugin_disconnect_session (plugin, + session); +} + + +/** + * We can now send a probe message, copy into buffer to really send. + * + * @param cls closure, a `struct TCPProbeContext` + * @param size max size to copy + * @param buf buffer to copy message to + * @return number of bytes copied into @a buf + */ +static size_t +notify_send_probe (void *cls, + size_t size, + void *buf) +{ + struct TCPProbeContext *tcp_probe_ctx = cls; + struct Plugin *plugin = tcp_probe_ctx->plugin; + size_t ret; + + tcp_probe_ctx->transmit_handle = NULL; + GNUNET_CONTAINER_DLL_remove (plugin->probe_head, + plugin->probe_tail, + tcp_probe_ctx); + if (NULL == buf) + { + GNUNET_CONNECTION_destroy (tcp_probe_ctx->sock); + GNUNET_free(tcp_probe_ctx); + return 0; + } + GNUNET_assert(size >= sizeof(tcp_probe_ctx->message)); + GNUNET_memcpy (buf, + &tcp_probe_ctx->message, + sizeof(tcp_probe_ctx->message)); + GNUNET_SERVER_connect_socket (tcp_probe_ctx->plugin->server, + tcp_probe_ctx->sock); + ret = sizeof(tcp_probe_ctx->message); + GNUNET_free (tcp_probe_ctx); + return ret; +} + + +/** + * Function called by the NAT subsystem suggesting another peer wants + * to connect to us via connection reversal. Try to connect back to the + * given IP. + * + * @param cls closure + * @param addr address to try + * @param addrlen number of bytes in @a addr + */ +static void +try_connection_reversal (void *cls, + const struct sockaddr *addr, + socklen_t addrlen) +{ + struct Plugin *plugin = cls; + struct GNUNET_CONNECTION_Handle *sock; + struct TCPProbeContext *tcp_probe_ctx; + + /** + * We have received an ICMP response, ostensibly from a peer + * that wants to connect to us! Send a message to establish a connection. + */ + sock = GNUNET_CONNECTION_create_from_sockaddr (AF_INET, + addr, + addrlen); + if (NULL == sock) + { + /* failed for some odd reason (out of sockets?); ignore attempt */ + return; + } + + tcp_probe_ctx = GNUNET_new (struct TCPProbeContext); + tcp_probe_ctx->message.header.size + = htons (sizeof (struct TCP_NAT_ProbeMessage)); + tcp_probe_ctx->message.header.type + = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE); + tcp_probe_ctx->message.clientIdentity + = *plugin->env->my_identity; + tcp_probe_ctx->plugin = plugin; + tcp_probe_ctx->sock = sock; + GNUNET_CONTAINER_DLL_insert (plugin->probe_head, + plugin->probe_tail, + tcp_probe_ctx); + tcp_probe_ctx->transmit_handle + = GNUNET_CONNECTION_notify_transmit_ready (sock, + ntohs (tcp_probe_ctx->message.header.size), + GNUNET_TIME_UNIT_FOREVER_REL, + ¬ify_send_probe, + tcp_probe_ctx); +} + + +/** + * Function obtain the network type for a session + * + * @param cls closure (`struct Plugin *`) + * @param session the session + * @return the network type in HBO or #GNUNET_SYSERR + */ +static enum GNUNET_ATS_Network_Type +tcp_plugin_get_network (void *cls, + struct GNUNET_ATS_Session *session) +{ + return session->scope; +} + + +/** + * Function obtain the network type for an address. + * + * @param cls closure (`struct Plugin *`) + * @param address the address + * @return the network type + */ +static enum GNUNET_ATS_Network_Type +tcp_plugin_get_network_for_address (void *cls, + const struct GNUNET_HELLO_Address *address) +{ + struct Plugin *plugin = cls; + size_t addrlen; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4TcpAddress *t4; + const struct IPv6TcpAddress *t6; + const void *sb; + size_t sbs; + + addrlen = address->address_length; + if (addrlen == sizeof(struct IPv6TcpAddress)) + { + GNUNET_assert (NULL != address->address); /* make static analysis happy */ + t6 = address->address; + memset (&a6, 0, sizeof(a6)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_family = AF_INET6; + a6.sin6_port = t6->t6_port; + GNUNET_memcpy (&a6.sin6_addr, &t6->ipv6_addr, sizeof(struct in6_addr)); + sb = &a6; + sbs = sizeof(a6); + } + else if (addrlen == sizeof(struct IPv4TcpAddress)) + { + GNUNET_assert (NULL != address->address); /* make static analysis happy */ + t4 = address->address; + memset (&a4, 0, sizeof(a4)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_family = AF_INET; + a4.sin_port = t4->t4_port; + a4.sin_addr.s_addr = t4->ipv4_addr; + sb = &a4; + sbs = sizeof(a4); + } + else + { + GNUNET_break (0); + return GNUNET_ATS_NET_UNSPECIFIED; + } + return plugin->env->get_address_type (plugin->env->cls, + sb, + sbs); +} + + +/** + * Return information about the given session to the + * monitor callback. + * + * @param cls the `struct Plugin` with the monitor callback (`sic`) + * @param peer peer we send information about + * @param value our `struct GNUNET_ATS_Session` to send information about + * @return #GNUNET_OK (continue to iterate) + */ +static int +send_session_info_iter (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *value) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = value; + + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_INIT); + /* FIXME: cannot tell if this is up or not from current + session state... */ + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_UP); + return GNUNET_OK; +} + + +/** + * Begin monitoring sessions of a plugin. There can only + * be one active monitor per plugin (i.e. if there are + * multiple monitors, the transport service needs to + * multiplex the generated events over all of them). + * + * @param cls closure of the plugin + * @param sic callback to invoke, NULL to disable monitor; + * plugin will being by iterating over all active + * sessions immediately and then enter monitor mode + * @param sic_cls closure for @a sic + */ +static void +tcp_plugin_setup_monitor (void *cls, + GNUNET_TRANSPORT_SessionInfoCallback sic, + void *sic_cls) +{ + struct Plugin *plugin = cls; + + plugin->sic = sic; + plugin->sic_cls = sic_cls; + if (NULL != sic) + { + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap, + &send_session_info_iter, + plugin); + /* signal end of first iteration */ + sic (sic_cls, NULL, NULL); + } +} + + +/** + * Entry point for the plugin. + * + * @param cls closure, the `struct GNUNET_TRANSPORT_PluginEnvironment *` + * @return the `struct GNUNET_TRANSPORT_PluginFunctions *` or NULL on error + */ +void * +libgnunet_plugin_transport_xt_init (void *cls) +{ + static const struct GNUNET_SERVER_MessageHandler my_handlers[] = { + { &handle_tcp_welcome, NULL, + GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME, + sizeof(struct WelcomeMessage) }, + { &handle_tcp_nat_probe, NULL, + GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_NAT_PROBE, + sizeof(struct TCP_NAT_ProbeMessage) }, + { &handle_tcp_data, NULL, + GNUNET_MESSAGE_TYPE_ALL, 0 }, + { NULL, NULL, 0, 0 } + }; + struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; + struct GNUNET_TRANSPORT_PluginFunctions *api; + struct Plugin *plugin; + struct LEGACY_SERVICE_Context *service; + unsigned long long aport; + unsigned long long bport; + unsigned long long max_connections; + unsigned int i; + struct GNUNET_TIME_Relative idle_timeout; +#ifdef TCP_STEALTH + struct GNUNET_NETWORK_Handle *const*lsocks; +#endif + int ret; + int ret_s; + struct sockaddr **addrs; + socklen_t *addrlens; + + if (NULL == env->receive) + { + /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully + initialze the plugin or the API */ + api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); + api->cls = NULL; + api->address_pretty_printer = &tcp_plugin_address_pretty_printer; + api->address_to_string = &tcp_plugin_address_to_string; + api->string_to_address = &tcp_plugin_string_to_address; + return api; + } + + GNUNET_assert (NULL != env->cfg); + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (env->cfg, + "transport-xt", + "MAX_CONNECTIONS", + &max_connections)) + max_connections = 128; + + aport = 0; + if ((GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (env->cfg, + "transport-xt", + "PORT", &bport)) || + (bport > 65535) || + ((GNUNET_OK == + GNUNET_CONFIGURATION_get_value_number (env->cfg, + "transport-xt", + "ADVERTISED-PORT", &aport)) && + (aport > 65535) )) + { + LOG(GNUNET_ERROR_TYPE_ERROR, + _("Require valid port number for service `%s' in configuration!\n"), + "transport-xt"); + return NULL ; + } + if (0 == aport) + aport = bport; + if (0 == bport) + aport = 0; + if (0 != bport) + { + service = LEGACY_SERVICE_start ("transport-xt", + env->cfg, + LEGACY_SERVICE_OPTION_NONE); + if (NULL == service) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Failed to start service.\n")); + return NULL; + } + } + else + service = NULL; + + api = NULL; + plugin = GNUNET_new (struct Plugin); + plugin->sessionmap = GNUNET_CONTAINER_multipeermap_create (max_connections, + GNUNET_YES); + plugin->max_connections = max_connections; + plugin->open_port = bport; + plugin->adv_port = aport; + plugin->env = env; + plugin->my_welcome.header.size = htons (sizeof(struct WelcomeMessage)); + plugin->my_welcome.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME); + plugin->my_welcome.clientIdentity = *plugin->env->my_identity; + + if ( (NULL != service) && + (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_yesno (env->cfg, + "transport-xt", + "TCP_STEALTH")) ) + { +#ifdef TCP_STEALTH + plugin->myoptions |= TCP_OPTIONS_TCP_STEALTH; + lsocks = LEGACY_SERVICE_get_listen_sockets (service); + if (NULL != lsocks) + { + uint32_t len = sizeof (struct WelcomeMessage); + + for (i=0;NULL!=lsocks[i];i++) + { + if ( (GNUNET_OK != + GNUNET_NETWORK_socket_setsockopt (lsocks[i], + IPPROTO_TCP, + TCP_STEALTH, + env->my_identity, + sizeof (struct GNUNET_PeerIdentity))) || + (GNUNET_OK != + GNUNET_NETWORK_socket_setsockopt (lsocks[i], + IPPROTO_TCP, + TCP_STEALTH_INTEGRITY_LEN, + &len, + sizeof (len))) ) + { + /* TCP STEALTH not supported by kernel */ + GNUNET_assert (0 == i); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("TCP_STEALTH not supported on this platform.\n")); + goto die; + } + } + } +#else + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("TCP_STEALTH not supported on this platform.\n")); + goto die; +#endif + } + + if ( (NULL != service) && + (GNUNET_SYSERR != + (ret_s = + get_server_addresses ("transport-xt", + env->cfg, + &addrs, + &addrlens)))) + { + for (ret = ret_s-1; ret >= 0; ret--) + LOG (GNUNET_ERROR_TYPE_INFO, + "Binding to address `%s'\n", + GNUNET_a2s (addrs[ret], addrlens[ret])); + plugin->nat + = GNUNET_NAT_register (env->cfg, + "transport-xt", + IPPROTO_TCP, + (unsigned int) ret_s, + (const struct sockaddr **) addrs, + addrlens, + &tcp_nat_port_map_callback, + &try_connection_reversal, + plugin); + for (ret = ret_s -1; ret >= 0; ret--) + GNUNET_free (addrs[ret]); + GNUNET_free_non_null (addrs); + GNUNET_free_non_null (addrlens); + } + else + { + plugin->nat = GNUNET_NAT_register (plugin->env->cfg, + "transport-xt", + IPPROTO_TCP, + 0, + NULL, + NULL, + NULL, + &try_connection_reversal, + plugin); + } + api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); + api->cls = plugin; + api->send = &tcp_plugin_send; + api->get_session = &tcp_plugin_get_session; + api->disconnect_session = &tcp_plugin_disconnect_session; + api->query_keepalive_factor = &tcp_plugin_query_keepalive_factor; + api->disconnect_peer = &tcp_plugin_disconnect; + api->address_pretty_printer = &tcp_plugin_address_pretty_printer; + api->check_address = &tcp_plugin_check_address; + api->address_to_string = &tcp_plugin_address_to_string; + api->string_to_address = &tcp_plugin_string_to_address; + api->get_network = &tcp_plugin_get_network; + api->get_network_for_address = &tcp_plugin_get_network_for_address; + api->update_session_timeout = &tcp_plugin_update_session_timeout; + api->update_inbound_delay = &tcp_plugin_update_inbound_delay; + api->setup_monitor = &tcp_plugin_setup_monitor; + plugin->service = service; + if (NULL != service) + { + plugin->server = LEGACY_SERVICE_get_server (service); + } + else + { + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_time (env->cfg, + "transport-xt", + "TIMEOUT", + &idle_timeout)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "transport-xt", + "TIMEOUT"); + goto die; + } + plugin->server + = GNUNET_SERVER_create_with_sockets (NULL, + plugin, + NULL, + idle_timeout, + GNUNET_YES); + } + plugin->handlers = GNUNET_malloc (sizeof (my_handlers)); + GNUNET_memcpy (plugin->handlers, + my_handlers, + sizeof(my_handlers)); + for (i = 0;i < sizeof(my_handlers) / sizeof(struct GNUNET_SERVER_MessageHandler);i++) + plugin->handlers[i].callback_cls = plugin; + + GNUNET_SERVER_add_handlers (plugin->server, + plugin->handlers); + GNUNET_SERVER_connect_notify (plugin->server, + &connect_notify, + plugin); + GNUNET_SERVER_disconnect_notify (plugin->server, + &disconnect_notify, + plugin); + plugin->nat_wait_conns = GNUNET_CONTAINER_multipeermap_create (16, + GNUNET_YES); + if (0 != bport) + LOG (GNUNET_ERROR_TYPE_INFO, + _("XT transport listening on port %llu\n"), + bport); + else + LOG (GNUNET_ERROR_TYPE_INFO, + _("XT transport not listening on any port (client only)\n")); + if ( (aport != bport) && + (0 != bport) ) + LOG (GNUNET_ERROR_TYPE_INFO, + _("XT transport advertises itself as being on port %llu\n"), + aport); + /* Initially set connections to 0 */ + GNUNET_STATISTICS_set (plugin->env->stats, + gettext_noop ("# XT sessions active"), + 0, + GNUNET_NO); + return api; + + die: + if (NULL != plugin->nat) + GNUNET_NAT_unregister (plugin->nat); + GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap); + if (NULL != service) + LEGACY_SERVICE_stop (service); + GNUNET_free (plugin); + GNUNET_free_non_null (api); + return NULL; +} + + +/** + * Exit point from the plugin. + * + * @param cls the `struct GNUNET_TRANSPORT_PluginFunctions` + * @return NULL + */ +void * +libgnunet_plugin_transport_xt_done (void *cls) +{ + struct GNUNET_TRANSPORT_PluginFunctions *api = cls; + struct Plugin *plugin = api->cls; + struct TCPProbeContext *tcp_probe; + struct PrettyPrinterContext *cur; + struct PrettyPrinterContext *next; + + if (NULL == plugin) + { + GNUNET_free(api); + return NULL ; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Shutting down XT plugin\n"); + + /* Removing leftover sessions */ + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessionmap, + &session_disconnect_it, + plugin); + /* Removing leftover NAT sessions */ + GNUNET_CONTAINER_multipeermap_iterate (plugin->nat_wait_conns, + &session_disconnect_it, + plugin); + + for (cur = plugin->ppc_dll_head; NULL != cur; cur = next) + { + next = cur->next; + GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + cur); + GNUNET_RESOLVER_request_cancel (cur->resolver_handle); + cur->asc (cur->asc_cls, + NULL, + GNUNET_OK); + GNUNET_free (cur); + } + + if (NULL != plugin->service) + LEGACY_SERVICE_stop (plugin->service); + else + GNUNET_SERVER_destroy (plugin->server); + GNUNET_free (plugin->handlers); + if (NULL != plugin->nat) + GNUNET_NAT_unregister (plugin->nat); + while (NULL != (tcp_probe = plugin->probe_head)) + { + GNUNET_CONTAINER_DLL_remove (plugin->probe_head, + plugin->probe_tail, + tcp_probe); + GNUNET_CONNECTION_destroy (tcp_probe->sock); + GNUNET_free (tcp_probe); + } + GNUNET_CONTAINER_multipeermap_destroy (plugin->nat_wait_conns); + GNUNET_CONTAINER_multipeermap_destroy (plugin->sessionmap); + GNUNET_break (0 == plugin->cur_connections); + GNUNET_free (plugin); + GNUNET_free (api); + return NULL; +} + +/* end of plugin_transport_xt.c */ -- cgit v1.2.3-18-g5258 From 28cee751620724a0da631dfa8b9c1123871e1e32 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 26 May 2018 20:18:59 +0200 Subject: build xt --- src/transport/Makefile.am | 13 +++++++++++++ src/transport/transport.conf.in | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index e8c1f5d4aa..2b3f81567d 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -280,6 +280,7 @@ gnunet_service_transport_CFLAGS = \ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ + libgnunet_plugin_transport_xt.la \ libgnunet_plugin_transport_udp.la \ $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ @@ -306,6 +307,18 @@ libgnunet_plugin_transport_tcp_la_LIBADD = \ libgnunet_plugin_transport_tcp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_transport_xt_la_SOURCES = \ + plugin_transport_xt.c +libgnunet_plugin_transport_xt_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/nat/libgnunetnatnew.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunet_plugin_transport_xt_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_transport_template_la_SOURCES = \ plugin_transport_template.c libgnunet_plugin_transport_template_la_LIBADD = \ diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index 2c99af000d..a541080ce7 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -68,6 +68,38 @@ MAX_CONNECTIONS = 128 TCP_STEALTH = NO + +[transport-xt] +# Use 0 to ONLY advertise as a peer behind NAT (no port binding) +PORT = 2087 + +# Obsolete option, to be replaced by HOLE_EXTERNAL (soon) +ADVERTISED_PORT = 2087 + +# If we have a manually punched NAT, what is the external IP and port? +# Can use DNS names for DynDNS-based detection of external IP. +# Can use IPv6 addresses ([fefc::]:PORT). +# Use "AUTO" for the hostname to automatically detect external IP. +# Do not set if NAT is not manually punched. +# HOLE_EXTERNAL = AUTO:2087 + +TESTING_IGNORE_KEYS = ACCEPT_FROM; + +# Maximum number of open TCP connections allowed +MAX_CONNECTIONS = 128 + +TIMEOUT = 5 s +# ACCEPT_FROM = +# ACCEPT_FROM6 = +# REJECT_FROM = +# REJECT_FROM6 = +# BINDTO = +MAX_CONNECTIONS = 128 + +# Enable TCP stealth? +TCP_STEALTH = NO + + [transport-udp] # Use PORT = 0 to autodetect a port available PORT = 2086 -- cgit v1.2.3-18-g5258 From c62b46170dfbd969f8cbadc4f3069a45832b804f Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 26 May 2018 20:44:29 +0200 Subject: disable LAN/loopback for AC --- src/transport/plugin_transport_xt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c index 9ed0f43c9e..21ed19da5a 100644 --- a/src/transport/plugin_transport_xt.c +++ b/src/transport/plugin_transport_xt.c @@ -1450,6 +1450,12 @@ tcp_nat_port_map_callback (void *cls, void *arg; size_t args; + if (GNUNET_NAT_AC_LOOPBACK == ac) + return; + if (GNUNET_NAT_AC_LAN == ac) + return; + if (GNUNET_NAT_AC_LAN_PRIVATE == ac) + return; LOG (GNUNET_ERROR_TYPE_INFO, "NAT notification to %s address `%s'\n", (GNUNET_YES == add_remove) ? "add" : "remove", -- cgit v1.2.3-18-g5258 From 0e70daa01fc872938ce4a23e84747a319d6909fd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 28 May 2018 01:39:40 +0200 Subject: track hello passing --- src/peerinfo/peerinfo_api.c | 3 +++ src/transport/gnunet-service-transport_validation.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index 8b47ed444b..09ec04bf8e 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c @@ -565,7 +565,10 @@ GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h, struct GNUNET_PeerIdentity peer; if (NULL == h->mq) + { + GNUNET_break (0); return NULL; + } GNUNET_assert (GNUNET_OK == GNUNET_HELLO_get_id (hello, &peer)); diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index cd5aeb5e27..91acc18ed5 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -1623,15 +1623,20 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, GNUNET_TRANSPORT_VS_UPDATE); /* build HELLO to store in PEERINFO */ + GNUNET_STATISTICS_update (GST_stats, + gettext_noop ("# HELLOs given to peerinfo"), + 1, + GNUNET_NO); ve->copied = GNUNET_NO; hello = GNUNET_HELLO_create (&ve->address->peer.public_key, &add_valid_peer_address, ve, GNUNET_NO); - GNUNET_PEERINFO_add_peer (GST_peerinfo, - hello, - NULL, - NULL); + GNUNET_break (NULL != + GNUNET_PEERINFO_add_peer (GST_peerinfo, + hello, + NULL, + NULL)); GNUNET_free (hello); return GNUNET_OK; } -- cgit v1.2.3-18-g5258 From b6b79a4c4b97c40b510bc60e93664496492a604e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 28 May 2018 01:48:13 +0200 Subject: skip validation logic --- src/hostlist/gnunet-daemon-hostlist_client.c | 65 ++++++---------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index 207cc4a811..2283efe6c3 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c @@ -28,6 +28,7 @@ #include "gnunet_hello_lib.h" #include "gnunet_statistics_service.h" #include "gnunet_transport_service.h" +#include "gnunet_peerinfo_service.h" #include "gnunet-daemon-hostlist.h" #if HAVE_CURL_CURL_H #include @@ -142,14 +143,6 @@ struct Hostlist }; -struct HelloOffer -{ - struct HelloOffer *next; - struct HelloOffer *prev; - struct GNUNET_TRANSPORT_OfferHelloHandle *ohh; -}; - - /** * Our configuration. */ @@ -315,24 +308,10 @@ static unsigned int stat_hellos_obtained; */ static unsigned int stat_connection_count; -static struct HelloOffer *ho_head; - -static struct HelloOffer *ho_tail; - - /** - * Hello offer complete. Clean up. + * Handle to peerinfo service. */ -static void -done_offer_hello (void *cls) -{ - struct HelloOffer *ho = cls; - - GNUNET_CONTAINER_DLL_remove (ho_head, - ho_tail, - ho); - GNUNET_free (ho); -} +static struct GNUNET_PEERINFO_Handle *pi; /** @@ -353,7 +332,6 @@ callback_download (void *ptr, static char download_buffer[GNUNET_MAX_MESSAGE_SIZE - 1]; const char *cbuf = ptr; const struct GNUNET_MessageHeader *msg; - struct HelloOffer *ho; size_t total; size_t cpy; size_t left; @@ -413,22 +391,10 @@ callback_download (void *ptr, ("# valid HELLOs downloaded from hostlist servers"), 1, GNUNET_NO); stat_hellos_obtained++; - - ho = GNUNET_new (struct HelloOffer); - ho->ohh = GNUNET_TRANSPORT_offer_hello (cfg, - msg, - &done_offer_hello, - ho); - if (NULL == ho->ohh) - { - GNUNET_free (ho); - } - else - { - GNUNET_CONTAINER_DLL_insert (ho_head, - ho_tail, - ho); - } + (void) GNUNET_PEERINFO_add_peer (pi, + (const struct GNUNET_HELLO_Message *) msg, + NULL, + NULL); } else { @@ -1567,6 +1533,7 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, stats = st; /* Read proxy configuration */ + pi = GNUNET_PEERINFO_connect (c); if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, "HOSTLIST", @@ -1723,18 +1690,8 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c, void GNUNET_HOSTLIST_client_stop () { - struct HelloOffer *ho; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist client shutdown\n"); - while (NULL != (ho = ho_head)) - { - GNUNET_CONTAINER_DLL_remove (ho_head, - ho_tail, - ho); - GNUNET_TRANSPORT_offer_hello_cancel (ho->ohh); - GNUNET_free (ho); - } if (NULL != sget) { GNUNET_STATISTICS_get_cancel (sget); @@ -1777,7 +1734,11 @@ GNUNET_HOSTLIST_client_stop () proxy_username = NULL; GNUNET_free_non_null (proxy_password); proxy_password = NULL; - + if (NULL != pi) + { + GNUNET_PEERINFO_disconnect (pi); + pi = NULL; + } cfg = NULL; } -- cgit v1.2.3-18-g5258 From 6f0c1fd78400bbf1d6808e9266a364b063ad36a2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 28 May 2018 01:51:01 +0200 Subject: skip validation logic --- src/topology/gnunet-daemon-topology.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 4415d0a24c..da4f623510 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -136,6 +136,11 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg; */ static struct GNUNET_CORE_Handle *handle; +/** + * Handle to the PEERINFO service. + */ +static struct GNUNET_PEERINFO_Handle *pi; + /** * Handle to the ATS service. */ @@ -998,16 +1003,6 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg) } -/** - * Hello offer complete. Clean up. - */ -static void -done_offer_hello (void *cls) -{ - oh = NULL; -} - - /** * This function is called whenever an encrypted HELLO message is * received. @@ -1076,12 +1071,10 @@ handle_hello (void *cls, (friend_count < minimum_friend_count)) return; } - if (NULL != oh) - GNUNET_TRANSPORT_offer_hello_cancel (oh); - oh = GNUNET_TRANSPORT_offer_hello (cfg, - &message->header, - &done_offer_hello, - NULL); + (void) GNUNET_PEERINFO_add_peer (pi, + message, + NULL, + NULL); } @@ -1125,6 +1118,11 @@ cleaning_task (void *cls) GNUNET_ATS_connectivity_done (ats); ats = NULL; } + if (NULL != pi) + { + GNUNET_PEERINFO_disconnect (pi); + pi = NULL; + } if (NULL != stats) { GNUNET_STATISTICS_destroy (stats, GNUNET_NO); @@ -1189,6 +1187,7 @@ run (void *cls, &blacklist_check, NULL); ats = GNUNET_ATS_connectivity_init (cfg); + pi = GNUNET_PEERINFO_connect (cfg); handle = GNUNET_CORE_connect (cfg, NULL, &core_init, -- cgit v1.2.3-18-g5258 From 1ac69f278b6cc4ca79f81f0b4dfc2f8771c88698 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 28 May 2018 16:56:32 +0200 Subject: adding xu transport --- src/include/gnunet_protocols.h | 6 + src/transport/Makefile.am | 14 + src/transport/plugin_transport_xu.c | 2492 +++++++++++++++++++++++++++++++++++ src/transport/transport.conf.in | 5 + 4 files changed, 2517 insertions(+) create mode 100644 src/transport/plugin_transport_xu.c diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index c5e45d5c1e..7040f2cbf5 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -252,6 +252,12 @@ extern "C" #define GNUNET_MESSAGE_TYPE_DV_BOX 53 +/** + * Experimental message type. + */ +#define GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE 55 + + /******************************************************************************* * Transport-UDP message types ******************************************************************************/ diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 2b3f81567d..b04b54e7f3 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -282,6 +282,7 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ libgnunet_plugin_transport_xt.la \ libgnunet_plugin_transport_udp.la \ + libgnunet_plugin_transport_xu.la \ $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ $(HTTPS_CLIENT_PLUGIN_LA) \ @@ -367,6 +368,19 @@ libgnunet_plugin_transport_udp_la_LIBADD = \ libgnunet_plugin_transport_udp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) +libgnunet_plugin_transport_xu_la_SOURCES = \ + plugin_transport_xu.c plugin_transport_xu.h +libgnunet_plugin_transport_udp_la_LIBADD = \ + $(top_builddir)/src/hello/libgnunethello.la \ + $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ + $(top_builddir)/src/nat/libgnunetnatnew.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunet_plugin_transport_udp_la_LDFLAGS = \ + $(GN_PLUGIN_LDFLAGS) + libgnunet_plugin_transport_unix_la_SOURCES = \ plugin_transport_unix.c libgnunet_plugin_transport_unix_la_LIBADD = \ diff --git a/src/transport/plugin_transport_xu.c b/src/transport/plugin_transport_xu.c new file mode 100644 index 0000000000..ea0d3f065d --- /dev/null +++ b/src/transport/plugin_transport_xu.c @@ -0,0 +1,2492 @@ +/* + This file is part of GNUnet + Copyright (C) 2010-2017 GNUnet e.V. + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + */ + +/** + * @file transport/plugin_transport_xu.c + * @brief Implementation of the XU transport protocol + * @author Christian Grothoff + * @author Nathan Evans + * @author Matthias Wachs + */ +#include "platform.h" +#include "plugin_transport_xu.h" +#include "gnunet_hello_lib.h" +#include "gnunet_util_lib.h" +#include "gnunet_fragmentation_lib.h" +#include "gnunet_nat_service.h" +#include "gnunet_protocols.h" +#include "gnunet_resolver_service.h" +#include "gnunet_signatures.h" +#include "gnunet_constants.h" +#include "gnunet_statistics_service.h" +#include "gnunet_transport_service.h" +#include "gnunet_transport_plugin.h" +#include "transport.h" + +#define LOG(kind,...) GNUNET_log_from (kind, "transport-xu", __VA_ARGS__) + +/** + * After how much inactivity should a XU session time out? + */ +#define XU_SESSION_TIME_OUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) + + +/** + * XU Message-Packet header (after defragmentation). + */ +struct XUMessage +{ + /** + * Message header. + */ + struct GNUNET_MessageHeader header; + + /** + * Always zero for now. + */ + uint32_t reserved; + + /** + * What is the identity of the sender + */ + struct GNUNET_PeerIdentity sender; + +}; + + +/** + * Closure for #append_port(). + */ +struct PrettyPrinterContext +{ + /** + * DLL + */ + struct PrettyPrinterContext *next; + + /** + * DLL + */ + struct PrettyPrinterContext *prev; + + /** + * Our plugin. + */ + struct Plugin *plugin; + + /** + * Resolver handle + */ + struct GNUNET_RESOLVER_RequestHandle *resolver_handle; + + /** + * Function to call with the result. + */ + GNUNET_TRANSPORT_AddressStringCallback asc; + + /** + * Clsoure for @e asc. + */ + void *asc_cls; + + /** + * Timeout task + */ + struct GNUNET_SCHEDULER_Task *timeout_task; + + /** + * Is this an IPv6 address? + */ + int ipv6; + + /** + * Options + */ + uint32_t options; + + /** + * Port to add after the IP address. + */ + uint16_t port; + +}; + + +/** + * Session with another peer. + */ +struct GNUNET_ATS_Session +{ + /** + * Which peer is this session for? + */ + struct GNUNET_PeerIdentity target; + + /** + * Tokenizer for inbound messages. + */ + struct GNUNET_MessageStreamTokenizer *mst; + + /** + * Plugin this session belongs to. + */ + struct Plugin *plugin; + + /** + * Session timeout task + */ + struct GNUNET_SCHEDULER_Task *timeout_task; + + /** + * When does this session time out? + */ + struct GNUNET_TIME_Absolute timeout; + + /** + * What time did we last transmit? + */ + struct GNUNET_TIME_Absolute last_transmit_time; + + /** + * expected delay for ACKs + */ + struct GNUNET_TIME_Relative last_expected_ack_delay; + + /** + * desired delay between XU messages + */ + struct GNUNET_TIME_Relative last_expected_msg_delay; + + /** + */ + struct GNUNET_TIME_Relative flow_delay_for_other_peer; + struct GNUNET_TIME_Relative flow_delay_from_other_peer; + + /** + * Our own address. + */ + struct GNUNET_HELLO_Address *address; + + /** + * Number of bytes waiting for transmission to this peer. + */ + unsigned long long bytes_in_queue; + + /** + * Number of messages waiting for transmission to this peer. + */ + unsigned int msgs_in_queue; + + /** + * Reference counter to indicate that this session is + * currently being used and must not be destroyed; + * setting @e in_destroy will destroy it as soon as + * possible. + */ + unsigned int rc; + + /** + * Network type of the address. + */ + enum GNUNET_ATS_Network_Type scope; + + /** + * Is this session about to be destroyed (sometimes we cannot + * destroy a session immediately as below us on the stack + * there might be code that still uses it; in this case, + * @e rc is non-zero). + */ + int in_destroy; +}; + + + +/** + * If a session monitor is attached, notify it about the new + * session state. + * + * @param plugin our plugin + * @param session session that changed state + * @param state new state of the session + */ +static void +notify_session_monitor (struct Plugin *plugin, + struct GNUNET_ATS_Session *session, + enum GNUNET_TRANSPORT_SessionState state) +{ + struct GNUNET_TRANSPORT_SessionInfo info; + + if (NULL == plugin->sic) + return; + if (GNUNET_YES == session->in_destroy) + return; /* already destroyed, just RC>0 left-over actions */ + memset (&info, + 0, + sizeof (info)); + info.state = state; + info.is_inbound = GNUNET_SYSERR; /* hard to say */ + info.num_msg_pending = session->msgs_in_queue; + info.num_bytes_pending = session->bytes_in_queue; + /* info.receive_delay remains zero as this is not supported by XU + (cannot selectively not receive from 'some' peer while continuing + to receive from others) */ + info.session_timeout = session->timeout; + info.address = session->address; + plugin->sic (plugin->sic_cls, + session, + &info); +} + + +/** + * Return information about the given session to the monitor callback. + * + * @param cls the `struct Plugin` with the monitor callback (`sic`) + * @param peer peer we send information about + * @param value our `struct GNUNET_ATS_Session` to send information about + * @return #GNUNET_OK (continue to iterate) + */ +static int +send_session_info_iter (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *value) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = value; + + (void) peer; + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_INIT); + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_UP); + return GNUNET_OK; +} + + +/** + * Begin monitoring sessions of a plugin. There can only + * be one active monitor per plugin (i.e. if there are + * multiple monitors, the transport service needs to + * multiplex the generated events over all of them). + * + * @param cls closure of the plugin + * @param sic callback to invoke, NULL to disable monitor; + * plugin will being by iterating over all active + * sessions immediately and then enter monitor mode + * @param sic_cls closure for @a sic + */ +static void +xu_plugin_setup_monitor (void *cls, + GNUNET_TRANSPORT_SessionInfoCallback sic, + void *sic_cls) +{ + struct Plugin *plugin = cls; + + plugin->sic = sic; + plugin->sic_cls = sic_cls; + if (NULL != sic) + { + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, + &send_session_info_iter, + plugin); + /* signal end of first iteration */ + sic (sic_cls, + NULL, + NULL); + } +} + + +/* ****************** Little Helpers ****************** */ + + +/** + * Function to free last resources associated with a session. + * + * @param s session to free + */ +static void +free_session (struct GNUNET_ATS_Session *s) +{ + if (NULL != s->address) + { + GNUNET_HELLO_address_free (s->address); + s->address = NULL; + } + if (NULL != s->mst) + { + GNUNET_MST_destroy (s->mst); + s->mst = NULL; + } + GNUNET_free (s); +} + + +/** + * Function that is called to get the keepalive factor. + * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to + * calculate the interval between keepalive packets. + * + * @param cls closure with the `struct Plugin` + * @return keepalive factor + */ +static unsigned int +xu_query_keepalive_factor (void *cls) +{ + (void) cls; + return 15; +} + + +/** + * Function obtain the network type for a session + * + * @param cls closure (`struct Plugin *`) + * @param session the session + * @return the network type + */ +static enum GNUNET_ATS_Network_Type +xu_plugin_get_network (void *cls, + struct GNUNET_ATS_Session *session) +{ + (void) cls; + return session->scope; +} + + +/** + * Function obtain the network type for an address. + * + * @param cls closure (`struct Plugin *`) + * @param address the address + * @return the network type + */ +static enum GNUNET_ATS_Network_Type +xu_plugin_get_network_for_address (void *cls, + const struct GNUNET_HELLO_Address *address) +{ + struct Plugin *plugin = cls; + size_t addrlen; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4XuAddress *u4; + const struct IPv6XuAddress *u6; + const void *sb; + size_t sbs; + + addrlen = address->address_length; + if (addrlen == sizeof(struct IPv6XuAddress)) + { + GNUNET_assert (NULL != address->address); /* make static analysis happy */ + u6 = address->address; + memset (&a6, 0, sizeof(a6)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_family = AF_INET6; + a6.sin6_port = u6->u6_port; + GNUNET_memcpy (&a6.sin6_addr, &u6->ipv6_addr, sizeof(struct in6_addr)); + sb = &a6; + sbs = sizeof(a6); + } + else if (addrlen == sizeof(struct IPv4XuAddress)) + { + GNUNET_assert (NULL != address->address); /* make static analysis happy */ + u4 = address->address; + memset (&a4, 0, sizeof(a4)); +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_family = AF_INET; + a4.sin_port = u4->u4_port; + a4.sin_addr.s_addr = u4->ipv4_addr; + sb = &a4; + sbs = sizeof(a4); + } + else + { + GNUNET_break (0); + return GNUNET_ATS_NET_UNSPECIFIED; + } + return plugin->env->get_address_type (plugin->env->cls, + sb, + sbs); +} + + +/* ******************* Event loop ******************** */ + +/** + * We have been notified that our readset has something to read. We don't + * know which socket needs to be read, so we have to check each one + * Then reschedule this function to be called again once more is available. + * + * @param cls the plugin handle + */ +static void +xu_plugin_select_v4 (void *cls); + + +/** + * We have been notified that our readset has something to read. We don't + * know which socket needs to be read, so we have to check each one + * Then reschedule this function to be called again once more is available. + * + * @param cls the plugin handle + */ +static void +xu_plugin_select_v6 (void *cls); + + +/** + * (re)schedule IPv4-select tasks for this plugin. + * + * @param plugin plugin to reschedule + */ +static void +schedule_select_v4 (struct Plugin *plugin) +{ + if ( (GNUNET_YES != plugin->enable_ipv4) || + (NULL == plugin->sockv4) ) + return; + if (NULL != plugin->select_task_v4) + GNUNET_SCHEDULER_cancel (plugin->select_task_v4); + plugin->select_task_v4 + = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, + plugin->sockv4, + &xu_plugin_select_v4, + plugin); +} + + +/** + * (re)schedule IPv6-select tasks for this plugin. + * + * @param plugin plugin to reschedule + */ +static void +schedule_select_v6 (struct Plugin *plugin) +{ + if ( (GNUNET_YES != plugin->enable_ipv6) || + (NULL == plugin->sockv6) ) + return; + if (NULL != plugin->select_task_v6) + GNUNET_SCHEDULER_cancel (plugin->select_task_v6); + plugin->select_task_v6 + = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, + plugin->sockv6, + &xu_plugin_select_v6, + plugin); +} + + +/* ******************* Address to string and back ***************** */ + + +/** + * Function called for a quick conversion of the binary address to + * a numeric address. Note that the caller must not free the + * address and that the next call to this function is allowed + * to override the address again. + * + * @param cls closure + * @param addr binary address (a `union XuAddress`) + * @param addrlen length of the @a addr + * @return string representing the same address + */ +const char * +xu_address_to_string (void *cls, + const void *addr, + size_t addrlen) +{ + static char rbuf[INET6_ADDRSTRLEN + 10]; + char buf[INET6_ADDRSTRLEN]; + const void *sb; + struct in_addr a4; + struct in6_addr a6; + const struct IPv4XuAddress *t4; + const struct IPv6XuAddress *t6; + int af; + uint16_t port; + uint32_t options; + + (void) cls; + if (NULL == addr) + { + GNUNET_break_op (0); + return NULL; + } + + if (addrlen == sizeof(struct IPv6XuAddress)) + { + t6 = addr; + af = AF_INET6; + options = ntohl (t6->options); + port = ntohs (t6->u6_port); + a6 = t6->ipv6_addr; + sb = &a6; + } + else if (addrlen == sizeof(struct IPv4XuAddress)) + { + t4 = addr; + af = AF_INET; + options = ntohl (t4->options); + port = ntohs (t4->u4_port); + a4.s_addr = t4->ipv4_addr; + sb = &a4; + } + else + { + GNUNET_break_op (0); + return NULL; + } + inet_ntop (af, + sb, + buf, + INET6_ADDRSTRLEN); + GNUNET_snprintf (rbuf, + sizeof(rbuf), + (af == AF_INET6) + ? "%s.%u.[%s]:%u" + : "%s.%u.%s:%u", + PLUGIN_NAME, + options, + buf, + port); + return rbuf; +} + + +/** + * Function called to convert a string address to a binary address. + * + * @param cls closure (`struct Plugin *`) + * @param addr string address + * @param addrlen length of the address + * @param buf location to store the buffer + * @param added location to store the number of bytes in the buffer. + * If the function returns #GNUNET_SYSERR, its contents are undefined. + * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure + */ +static int +xu_string_to_address (void *cls, + const char *addr, + uint16_t addrlen, + void **buf, + size_t *added) +{ + struct sockaddr_storage socket_address; + char *address; + char *plugin; + char *optionstr; + uint32_t options; + + (void) cls; + /* Format tcp.options.address:port */ + address = NULL; + plugin = NULL; + optionstr = NULL; + + if ((NULL == addr) || (0 == addrlen)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + if ('\0' != addr[addrlen - 1]) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + if (strlen (addr) + 1 != (size_t) addrlen) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + plugin = GNUNET_strdup (addr); + optionstr = strchr (plugin, '.'); + if (NULL == optionstr) + { + GNUNET_break (0); + GNUNET_free (plugin); + return GNUNET_SYSERR; + } + optionstr[0] = '\0'; + optionstr++; + options = atol (optionstr); + address = strchr (optionstr, '.'); + if (NULL == address) + { + GNUNET_break (0); + GNUNET_free (plugin); + return GNUNET_SYSERR; + } + address[0] = '\0'; + address++; + + if (GNUNET_OK != + GNUNET_STRINGS_to_address_ip (address, + strlen (address), + &socket_address)) + { + GNUNET_break (0); + GNUNET_free (plugin); + return GNUNET_SYSERR; + } + GNUNET_free(plugin); + + switch (socket_address.ss_family) + { + case AF_INET: + { + struct IPv4XuAddress *u4; + const struct sockaddr_in *in4 = (const struct sockaddr_in *) &socket_address; + + u4 = GNUNET_new (struct IPv4XuAddress); + u4->options = htonl (options); + u4->ipv4_addr = in4->sin_addr.s_addr; + u4->u4_port = in4->sin_port; + *buf = u4; + *added = sizeof (struct IPv4XuAddress); + return GNUNET_OK; + } + case AF_INET6: + { + struct IPv6XuAddress *u6; + const struct sockaddr_in6 *in6 = (const struct sockaddr_in6 *) &socket_address; + + u6 = GNUNET_new (struct IPv6XuAddress); + u6->options = htonl (options); + u6->ipv6_addr = in6->sin6_addr; + u6->u6_port = in6->sin6_port; + *buf = u6; + *added = sizeof (struct IPv6XuAddress); + return GNUNET_OK; + } + default: + GNUNET_break (0); + return GNUNET_SYSERR; + } +} + + +/** + * Append our port and forward the result. + * + * @param cls a `struct PrettyPrinterContext *` + * @param hostname result from DNS resolver + */ +static void +append_port (void *cls, + const char *hostname) +{ + struct PrettyPrinterContext *ppc = cls; + struct Plugin *plugin = ppc->plugin; + char *ret; + + if (NULL == hostname) + { + /* Final call, done */ + GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + ppc); + ppc->resolver_handle = NULL; + ppc->asc (ppc->asc_cls, + NULL, + GNUNET_OK); + GNUNET_free (ppc); + return; + } + if (GNUNET_YES == ppc->ipv6) + GNUNET_asprintf (&ret, + "%s.%u.[%s]:%d", + PLUGIN_NAME, + ppc->options, + hostname, + ppc->port); + else + GNUNET_asprintf (&ret, + "%s.%u.%s:%d", + PLUGIN_NAME, + ppc->options, + hostname, + ppc->port); + ppc->asc (ppc->asc_cls, + ret, + GNUNET_OK); + GNUNET_free (ret); +} + + +/** + * Convert the transports address to a nice, human-readable format. + * + * @param cls closure with the `struct Plugin *` + * @param type name of the transport that generated the address + * @param addr one of the addresses of the host, NULL for the last address + * the specific address format depends on the transport; + * a `union XuAddress` + * @param addrlen length of the address + * @param numeric should (IP) addresses be displayed in numeric form? + * @param timeout after how long should we give up? + * @param asc function to call on each string + * @param asc_cls closure for @a asc + */ +static void +xu_plugin_address_pretty_printer (void *cls, + const char *type, + const void *addr, + size_t addrlen, + int numeric, + struct GNUNET_TIME_Relative timeout, + GNUNET_TRANSPORT_AddressStringCallback asc, + void *asc_cls) +{ + struct Plugin *plugin = cls; + struct PrettyPrinterContext *ppc; + const struct sockaddr *sb; + size_t sbs; + struct sockaddr_in a4; + struct sockaddr_in6 a6; + const struct IPv4XuAddress *u4; + const struct IPv6XuAddress *u6; + uint16_t port; + uint32_t options; + + (void) type; + if (addrlen == sizeof(struct IPv6XuAddress)) + { + u6 = addr; + memset (&a6, + 0, + sizeof (a6)); + a6.sin6_family = AF_INET6; +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_port = u6->u6_port; + a6.sin6_addr = u6->ipv6_addr; + port = ntohs (u6->u6_port); + options = ntohl (u6->options); + sb = (const struct sockaddr *) &a6; + sbs = sizeof (a6); + } + else if (addrlen == sizeof (struct IPv4XuAddress)) + { + u4 = addr; + memset (&a4, + 0, + sizeof(a4)); + a4.sin_family = AF_INET; +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_port = u4->u4_port; + a4.sin_addr.s_addr = u4->ipv4_addr; + port = ntohs (u4->u4_port); + options = ntohl (u4->options); + sb = (const struct sockaddr *) &a4; + sbs = sizeof(a4); + } + else + { + /* invalid address */ + GNUNET_break_op (0); + asc (asc_cls, + NULL, + GNUNET_SYSERR); + asc (asc_cls, + NULL, + GNUNET_OK); + return; + } + ppc = GNUNET_new (struct PrettyPrinterContext); + ppc->plugin = plugin; + ppc->asc = asc; + ppc->asc_cls = asc_cls; + ppc->port = port; + ppc->options = options; + if (addrlen == sizeof (struct IPv6XuAddress)) + ppc->ipv6 = GNUNET_YES; + else + ppc->ipv6 = GNUNET_NO; + GNUNET_CONTAINER_DLL_insert (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + ppc); + ppc->resolver_handle + = GNUNET_RESOLVER_hostname_get (sb, + sbs, + ! numeric, + timeout, + &append_port, + ppc); +} + + +/** + * Check if the given port is plausible (must be either our listen + * port or our advertised port). If it is neither, we return + * #GNUNET_SYSERR. + * + * @param plugin global variables + * @param in_port port number to check + * @return #GNUNET_OK if port is either our open or advertised port + */ +static int +check_port (const struct Plugin *plugin, + uint16_t in_port) +{ + if ( (plugin->port == in_port) || + (plugin->aport == in_port) ) + return GNUNET_OK; + return GNUNET_SYSERR; +} + + +/** + * Function that will be called to check if a binary address for this + * plugin is well-formed and corresponds to an address for THIS peer + * (as per our configuration). Naturally, if absolutely necessary, + * plugins can be a bit conservative in their answer, but in general + * plugins should make sure that the address does not redirect + * traffic to a 3rd party that might try to man-in-the-middle our + * traffic. + * + * @param cls closure, should be our handle to the Plugin + * @param addr pointer to a `union XuAddress` + * @param addrlen length of @a addr + * @return #GNUNET_OK if this is a plausible address for this peer + * and transport, #GNUNET_SYSERR if not + */ +static int +xu_plugin_check_address (void *cls, + const void *addr, + size_t addrlen) +{ + struct Plugin *plugin = cls; + const struct IPv4XuAddress *v4; + const struct IPv6XuAddress *v6; + + if (sizeof(struct IPv4XuAddress) == addrlen) + { + struct sockaddr_in s4; + + v4 = (const struct IPv4XuAddress *) addr; + if (GNUNET_OK != check_port (plugin, + ntohs (v4->u4_port))) + return GNUNET_SYSERR; + memset (&s4, 0, sizeof (s4)); + s4.sin_family = AF_INET; +#if HAVE_SOCKADDR_IN_SIN_LEN + s4.sin_len = sizeof (s4); +#endif + s4.sin_port = v4->u4_port; + s4.sin_addr.s_addr = v4->ipv4_addr; + + if (GNUNET_OK != + GNUNET_NAT_test_address (plugin->nat, + &s4, + sizeof (struct sockaddr_in))) + return GNUNET_SYSERR; + } + else if (sizeof(struct IPv6XuAddress) == addrlen) + { + struct sockaddr_in6 s6; + + v6 = (const struct IPv6XuAddress *) addr; + if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr)) + return GNUNET_OK; /* plausible, if unlikely... */ + memset (&s6, 0, sizeof (s6)); + s6.sin6_family = AF_INET6; +#if HAVE_SOCKADDR_IN_SIN_LEN + s6.sin6_len = sizeof (s6); +#endif + s6.sin6_port = v6->u6_port; + s6.sin6_addr = v6->ipv6_addr; + + if (GNUNET_OK != + GNUNET_NAT_test_address (plugin->nat, + &s6, + sizeof(struct sockaddr_in6))) + return GNUNET_SYSERR; + } + else + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } + return GNUNET_OK; +} + + +/** + * Our external IP address/port mapping has changed. + * + * @param cls closure, the `struct Plugin` + * @param add_remove #GNUNET_YES to mean the new public IP address, + * #GNUNET_NO to mean the previous (now invalid) one + * @param ac address class the address belongs to + * @param addr either the previous or the new public IP address + * @param addrlen actual length of the @a addr + */ +static void +xu_nat_port_map_callback (void *cls, + int add_remove, + enum GNUNET_NAT_AddressClass ac, + const struct sockaddr *addr, + socklen_t addrlen) +{ + struct Plugin *plugin = cls; + struct GNUNET_HELLO_Address *address; + struct IPv4XuAddress u4; + struct IPv6XuAddress u6; + void *arg; + size_t args; + + if (GNUNET_NAT_AC_LOOPBACK == ac) + return; + if (GNUNET_NAT_AC_LAN == ac) + return; + if (GNUNET_NAT_AC_LAN_PRIVATE == ac) + return; + LOG (GNUNET_ERROR_TYPE_DEBUG, + (GNUNET_YES == add_remove) + ? "NAT notification to add address `%s'\n" + : "NAT notification to remove address `%s'\n", + GNUNET_a2s (addr, + addrlen)); + /* convert 'address' to our internal format */ + switch (addr->sa_family) + { + case AF_INET: + { + const struct sockaddr_in *i4; + + GNUNET_assert (sizeof(struct sockaddr_in) == addrlen); + i4 = (const struct sockaddr_in *) addr; + if (0 == ntohs (i4->sin_port)) + return; /* Port = 0 means unmapped, ignore these for XU. */ + memset (&u4, + 0, + sizeof(u4)); + u4.options = htonl (plugin->myoptions); + u4.ipv4_addr = i4->sin_addr.s_addr; + u4.u4_port = i4->sin_port; + arg = &u4; + args = sizeof (struct IPv4XuAddress); + break; + } + case AF_INET6: + { + const struct sockaddr_in6 *i6; + + GNUNET_assert (sizeof(struct sockaddr_in6) == addrlen); + i6 = (const struct sockaddr_in6 *) addr; + if (0 == ntohs (i6->sin6_port)) + return; /* Port = 0 means unmapped, ignore these for XU. */ + memset (&u6, + 0, + sizeof(u6)); + u6.options = htonl (plugin->myoptions); + u6.ipv6_addr = i6->sin6_addr; + u6.u6_port = i6->sin6_port; + arg = &u6; + args = sizeof (struct IPv6XuAddress); + break; + } + default: + GNUNET_break (0); + return; + } + /* modify our published address list */ + /* TODO: use 'ac' here in the future... */ + address = GNUNET_HELLO_address_allocate (plugin->env->my_identity, + PLUGIN_NAME, + arg, + args, + GNUNET_HELLO_ADDRESS_INFO_NONE); + plugin->env->notify_address (plugin->env->cls, + add_remove, + address); + GNUNET_HELLO_address_free (address); +} + + +/* ********************* Finding sessions ******************* */ + + +/** + * Closure for #session_cmp_it(). + */ +struct GNUNET_ATS_SessionCompareContext +{ + /** + * Set to session matching the address. + */ + struct GNUNET_ATS_Session *res; + + /** + * Address we are looking for. + */ + const struct GNUNET_HELLO_Address *address; +}; + + +/** + * Find a session with a matching address. + * + * @param cls the `struct GNUNET_ATS_SessionCompareContext *` + * @param key peer identity (unused) + * @param value the `struct GNUNET_ATS_Session *` + * @return #GNUNET_NO if we found the session, #GNUNET_OK if not + */ +static int +session_cmp_it (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct GNUNET_ATS_SessionCompareContext *cctx = cls; + struct GNUNET_ATS_Session *s = value; + + (void) key; + if (0 == GNUNET_HELLO_address_cmp (s->address, + cctx->address)) + { + GNUNET_assert (GNUNET_NO == s->in_destroy); + cctx->res = s; + return GNUNET_NO; + } + return GNUNET_OK; +} + + +/** + * Locate an existing session the transport service is using to + * send data to another peer. Performs some basic sanity checks + * on the address and then tries to locate a matching session. + * + * @param cls the plugin + * @param address the address we should locate the session by + * @return the session if it exists, or NULL if it is not found + */ +static struct GNUNET_ATS_Session * +xu_plugin_lookup_session (void *cls, + const struct GNUNET_HELLO_Address *address) +{ + struct Plugin *plugin = cls; + const struct IPv6XuAddress *xu_a6; + const struct IPv4XuAddress *xu_a4; + struct GNUNET_ATS_SessionCompareContext cctx; + + if (NULL == address->address) + { + GNUNET_break (0); + return NULL; + } + if (sizeof(struct IPv4XuAddress) == address->address_length) + { + if (NULL == plugin->sockv4) + return NULL; + xu_a4 = (const struct IPv4XuAddress *) address->address; + if (0 == xu_a4->u4_port) + { + GNUNET_break (0); + return NULL; + } + } + else if (sizeof(struct IPv6XuAddress) == address->address_length) + { + if (NULL == plugin->sockv6) + return NULL; + xu_a6 = (const struct IPv6XuAddress *) address->address; + if (0 == xu_a6->u6_port) + { + GNUNET_break (0); + return NULL; + } + } + else + { + GNUNET_break (0); + return NULL; + } + + /* check if session already exists */ + cctx.address = address; + cctx.res = NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Looking for existing session for peer `%s' with address `%s'\n", + GNUNET_i2s (&address->peer), + xu_address_to_string (plugin, + address->address, + address->address_length)); + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, + &address->peer, + &session_cmp_it, + &cctx); + if (NULL == cctx.res) + return NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found existing session %p\n", + cctx.res); + return cctx.res; +} + + +/* ********************** Timeout ****************** */ + + +/** + * Increment session timeout due to activity. + * + * @param s session to reschedule timeout activity for + */ +static void +reschedule_session_timeout (struct GNUNET_ATS_Session *s) +{ + if (GNUNET_YES == s->in_destroy) + return; + GNUNET_assert (NULL != s->timeout_task); + s->timeout = GNUNET_TIME_relative_to_absolute (XU_SESSION_TIME_OUT); +} + + + +/** + * Function that will be called whenever the transport service wants to + * notify the plugin that a session is still active and in use and + * therefore the session timeout for this session has to be updated + * + * @param cls closure with the `struct Plugin` + * @param peer which peer was the session for + * @param session which session is being updated + */ +static void +xu_plugin_update_session_timeout (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_ATS_Session *session) +{ + struct Plugin *plugin = cls; + + if (GNUNET_YES != + GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions, + peer, + session)) + { + GNUNET_break (0); + return; + } + /* Reschedule session timeout */ + reschedule_session_timeout (session); +} + + +/* ************************* Sending ************************ */ + + +/** + * We failed to transmit a message via XU. Generate + * a descriptive error message. + * + * @param plugin our plugin + * @param sa target address we were trying to reach + * @param slen number of bytes in @a sa + * @param error the errno value returned from the sendto() call + */ +static void +analyze_send_error (struct Plugin *plugin, + const struct sockaddr *sa, + socklen_t slen, + int error) +{ + enum GNUNET_ATS_Network_Type type; + + type = plugin->env->get_address_type (plugin->env->cls, + sa, + slen); + if ( ( (GNUNET_ATS_NET_LAN == type) || + (GNUNET_ATS_NET_WAN == type) ) && + ( (ENETUNREACH == errno) || + (ENETDOWN == errno) ) ) + { + if (slen == sizeof (struct sockaddr_in)) + { + /* IPv4: "Network unreachable" or "Network down" + * + * This indicates we do not have connectivity + */ + LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, + _("XU could not transmit message to `%s': " + "Network seems down, please check your network configuration\n"), + GNUNET_a2s (sa, + slen)); + } + if (slen == sizeof (struct sockaddr_in6)) + { + /* IPv6: "Network unreachable" or "Network down" + * + * This indicates that this system is IPv6 enabled, but does not + * have a valid global IPv6 address assigned or we do not have + * connectivity + */ + LOG (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, + _("XU could not transmit IPv6 message! " + "Please check your network configuration and disable IPv6 if your " + "connection does not have a global IPv6 address\n")); + } + } + else + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "XU could not transmit message to `%s': `%s'\n", + GNUNET_a2s (sa, + slen), + STRERROR (error)); + } +} + + + + +/** + * Function that can be used by the transport service to transmit a + * message using the plugin. Note that in the case of a peer + * disconnecting, the continuation MUST be called prior to the + * disconnect notification itself. This function will be called with + * this peer's HELLO message to initiate a fresh connection to another + * peer. + * + * @param cls closure + * @param s which session must be used + * @param msgbuf the message to transmit + * @param msgbuf_size number of bytes in @a msgbuf + * @param priority how important is the message (most plugins will + * ignore message priority and just FIFO) + * @param to how long to wait at most for the transmission (does not + * require plugins to discard the message after the timeout, + * just advisory for the desired delay; most plugins will ignore + * this as well) + * @param cont continuation to call once the message has + * been transmitted (or if the transport is ready + * for the next transmission call; or if the + * peer disconnected...); can be NULL + * @param cont_cls closure for @a cont + * @return number of bytes used (on the physical network, with overheads); + * -1 on hard errors (i.e. address invalid); 0 is a legal value + * and does NOT mean that the message was not transmitted (DV) + */ +static ssize_t +xu_plugin_send (void *cls, + struct GNUNET_ATS_Session *s, + const char *msgbuf, + size_t msgbuf_size, + unsigned int priority, + struct GNUNET_TIME_Relative to, + GNUNET_TRANSPORT_TransmitContinuation cont, + void *cont_cls) +{ + struct Plugin *plugin = cls; + size_t xumlen = msgbuf_size + sizeof(struct XUMessage); + struct XUMessage *xu; + char mbuf[xumlen] GNUNET_ALIGN; + ssize_t sent; + socklen_t slen; + const struct sockaddr *a; + const struct IPv4XuAddress *u4; + struct sockaddr_in a4; + const struct IPv6XuAddress *u6; + struct sockaddr_in6 a6; + struct GNUNET_NETWORK_Handle *sock; + + (void) priority; + (void) to; + if ( (sizeof(struct IPv6XuAddress) == s->address->address_length) && + (NULL == plugin->sockv6) ) + return GNUNET_SYSERR; + if ( (sizeof(struct IPv4XuAddress) == s->address->address_length) && + (NULL == plugin->sockv4) ) + return GNUNET_SYSERR; + if (xumlen >= GNUNET_MAX_MESSAGE_SIZE) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + if (GNUNET_YES != + GNUNET_CONTAINER_multipeermap_contains_value (plugin->sessions, + &s->target, + s)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "XU transmits %u-byte message to `%s' using address `%s'\n", + xumlen, + GNUNET_i2s (&s->target), + xu_address_to_string (plugin, + s->address->address, + s->address->address_length)); + xu = (struct XUMessage *) mbuf; + xu->header.size = htons (xumlen); + xu->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE); + xu->reserved = htonl (0); + xu->sender = *plugin->env->my_identity; + GNUNET_memcpy (&xu[1], + msgbuf, + msgbuf_size); + + if (sizeof (struct IPv4XuAddress) == s->address->address_length) + { + u4 = s->address->address; + memset (&a4, + 0, + sizeof(a4)); + a4.sin_family = AF_INET; +#if HAVE_SOCKADDR_IN_SIN_LEN + a4.sin_len = sizeof (a4); +#endif + a4.sin_port = u4->u4_port; + a4.sin_addr.s_addr = u4->ipv4_addr; + a = (const struct sockaddr *) &a4; + slen = sizeof (a4); + sock = plugin->sockv4; + } + else if (sizeof (struct IPv6XuAddress) == s->address->address_length) + { + u6 = s->address->address; + memset (&a6, + 0, + sizeof(a6)); + a6.sin6_family = AF_INET6; +#if HAVE_SOCKADDR_IN_SIN_LEN + a6.sin6_len = sizeof (a6); +#endif + a6.sin6_port = u6->u6_port; + a6.sin6_addr = u6->ipv6_addr; + a = (const struct sockaddr *) &a6; + slen = sizeof (a6); + sock = plugin->sockv6; + } + else + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + + sent = GNUNET_NETWORK_socket_sendto (sock, + mbuf, + xumlen, + a, + slen); + s->last_transmit_time + = GNUNET_TIME_absolute_max (GNUNET_TIME_absolute_get (), + s->last_transmit_time); + + if (GNUNET_SYSERR == sent) + { + /* Failure */ + analyze_send_error (plugin, + a, + slen, + errno); + GNUNET_STATISTICS_update (plugin->env->stats, + "# XU, total, bytes, sent, failure", + sent, + GNUNET_NO); + GNUNET_STATISTICS_update (plugin->env->stats, + "# XU, total, messages, sent, failure", + 1, + GNUNET_NO); + return GNUNET_SYSERR; + } + /* Success */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "XU transmitted %u-byte message to `%s' `%s' (%d: %s)\n", + (unsigned int) (msgbuf_size), + GNUNET_i2s (&s->target), + GNUNET_a2s (a, + slen), + (int ) sent, + (sent < 0) ? STRERROR (errno) : "ok"); + GNUNET_STATISTICS_update (plugin->env->stats, + "# XU, total, bytes, sent, success", + sent, + GNUNET_NO); + GNUNET_STATISTICS_update (plugin->env->stats, + "# XU, total, messages, sent, success", + 1, + GNUNET_NO); + cont (cont_cls, + &s->target, + GNUNET_OK, + msgbuf_size, + xumlen); + notify_session_monitor (s->plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + return xumlen; +} + + +/* ********************** Receiving ********************** */ + + +/** + * Functions with this signature are called whenever we need to close + * a session due to a disconnect or failure to establish a connection. + * + * @param cls closure with the `struct Plugin` + * @param s session to close down + * @return #GNUNET_OK on success + */ +static int +xu_disconnect_session (void *cls, + struct GNUNET_ATS_Session *s) +{ + struct Plugin *plugin = cls; + + GNUNET_assert (GNUNET_YES != s->in_destroy); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p to peer `%s' at address %s ended\n", + s, + GNUNET_i2s (&s->target), + xu_address_to_string (plugin, + s->address->address, + s->address->address_length)); + if (NULL != s->timeout_task) + { + GNUNET_SCHEDULER_cancel (s->timeout_task); + s->timeout_task = NULL; + } + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (plugin->sessions, + &s->target, + s)); + s->in_destroy = GNUNET_YES; + notify_session_monitor (s->plugin, + s, + GNUNET_TRANSPORT_SS_DONE); + plugin->env->session_end (plugin->env->cls, + s->address, + s); + GNUNET_STATISTICS_set (plugin->env->stats, + "# XU sessions active", + GNUNET_CONTAINER_multipeermap_size (plugin->sessions), + GNUNET_NO); + if (0 == s->rc) + free_session (s); + return GNUNET_OK; +} + + +/** + * Message tokenizer has broken up an incomming message. Pass it on + * to the service. + * + * @param cls the `struct GNUNET_ATS_Session *` + * @param hdr the actual message + * @return #GNUNET_OK (always) + */ +static int +process_inbound_tokenized_messages (void *cls, + const struct GNUNET_MessageHeader *hdr) +{ + struct GNUNET_ATS_Session *session = cls; + struct Plugin *plugin = session->plugin; + + if (GNUNET_YES == session->in_destroy) + return GNUNET_OK; + reschedule_session_timeout (session); + session->flow_delay_for_other_peer + = plugin->env->receive (plugin->env->cls, + session->address, + session, + hdr); + return GNUNET_OK; +} + + +/** + * Destroy a session, plugin is being unloaded. + * + * @param cls the `struct Plugin` + * @param key hash of public key of target peer + * @param value a `struct PeerSession *` to clean up + * @return #GNUNET_OK (continue to iterate) + */ +static int +disconnect_and_free_it (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct Plugin *plugin = cls; + + (void) key; + xu_disconnect_session (plugin, + value); + return GNUNET_OK; +} + + +/** + * Disconnect from a remote node. Clean up session if we have one for + * this peer. + * + * @param cls closure for this call (should be handle to Plugin) + * @param target the peeridentity of the peer to disconnect + * @return #GNUNET_OK on success, #GNUNET_SYSERR if the operation failed + */ +static void +xu_disconnect (void *cls, + const struct GNUNET_PeerIdentity *target) +{ + struct Plugin *plugin = cls; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Disconnecting from peer `%s'\n", + GNUNET_i2s (target)); + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, + target, + &disconnect_and_free_it, + plugin); +} + + +/** + * Session was idle, so disconnect it. + * + * @param cls the `struct GNUNET_ATS_Session` to time out + */ +static void +session_timeout (void *cls) +{ + struct GNUNET_ATS_Session *s = cls; + struct Plugin *plugin = s->plugin; + struct GNUNET_TIME_Relative left; + + s->timeout_task = NULL; + left = GNUNET_TIME_absolute_get_remaining (s->timeout); + if (left.rel_value_us > 0) + { + /* not actually our turn yet, but let's at least update + the monitor, it may think we're about to die ... */ + notify_session_monitor (s->plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, + &session_timeout, + s); + return; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p was idle for %s, disconnecting\n", + s, + GNUNET_STRINGS_relative_time_to_string (XU_SESSION_TIME_OUT, + GNUNET_YES)); + /* call session destroy function */ + xu_disconnect_session (plugin, + s); +} + + +/** + * Allocate a new session for the given endpoint address. + * Note that this function does not inform the service + * of the new session, this is the responsibility of the + * caller (if needed). + * + * @param cls the `struct Plugin` + * @param address address of the other peer to use + * @param network_type network type the address belongs to + * @return NULL on error, otherwise session handle + */ +static struct GNUNET_ATS_Session * +xu_plugin_create_session (void *cls, + const struct GNUNET_HELLO_Address *address, + enum GNUNET_ATS_Network_Type network_type) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *s; + + s = GNUNET_new (struct GNUNET_ATS_Session); + s->mst = GNUNET_MST_create (&process_inbound_tokenized_messages, + s); + s->plugin = plugin; + s->address = GNUNET_HELLO_address_copy (address); + s->target = address->peer; + s->last_transmit_time = GNUNET_TIME_absolute_get (); + s->last_expected_ack_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, + 250); + s->last_expected_msg_delay = GNUNET_TIME_UNIT_MILLISECONDS; + s->flow_delay_from_other_peer = GNUNET_TIME_UNIT_ZERO; + s->flow_delay_for_other_peer = GNUNET_TIME_UNIT_ZERO; + s->timeout = GNUNET_TIME_relative_to_absolute (XU_SESSION_TIME_OUT); + s->timeout_task = GNUNET_SCHEDULER_add_delayed (XU_SESSION_TIME_OUT, + &session_timeout, + s); + s->scope = network_type; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Creating new session %p for peer `%s' address `%s'\n", + s, + GNUNET_i2s (&address->peer), + xu_address_to_string (plugin, + address->address, + address->address_length)); + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (plugin->sessions, + &s->target, + s, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); + GNUNET_STATISTICS_set (plugin->env->stats, + "# XU sessions active", + GNUNET_CONTAINER_multipeermap_size (plugin->sessions), + GNUNET_NO); + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_INIT); + return s; +} + + +/** + * Creates a new outbound session the transport service will use to + * send data to the peer. + * + * @param cls the `struct Plugin *` + * @param address the address + * @return the session or NULL of max connections exceeded + */ +static struct GNUNET_ATS_Session * +xu_plugin_get_session (void *cls, + const struct GNUNET_HELLO_Address *address) +{ + struct Plugin *plugin = cls; + struct GNUNET_ATS_Session *s; + enum GNUNET_ATS_Network_Type network_type = GNUNET_ATS_NET_UNSPECIFIED; + const struct IPv4XuAddress *xu_v4; + const struct IPv6XuAddress *xu_v6; + + if (NULL == address) + { + GNUNET_break (0); + return NULL; + } + if ( (address->address_length != sizeof(struct IPv4XuAddress)) && + (address->address_length != sizeof(struct IPv6XuAddress)) ) + { + GNUNET_break_op (0); + return NULL; + } + if (NULL != (s = xu_plugin_lookup_session (cls, + address))) + return s; + + /* need to create new session */ + if (sizeof (struct IPv4XuAddress) == address->address_length) + { + struct sockaddr_in v4; + + xu_v4 = (const struct IPv4XuAddress *) address->address; + memset (&v4, '\0', sizeof (v4)); + v4.sin_family = AF_INET; +#if HAVE_SOCKADDR_IN_SIN_LEN + v4.sin_len = sizeof (struct sockaddr_in); +#endif + v4.sin_port = xu_v4->u4_port; + v4.sin_addr.s_addr = xu_v4->ipv4_addr; + network_type = plugin->env->get_address_type (plugin->env->cls, + (const struct sockaddr *) &v4, + sizeof (v4)); + } + if (sizeof (struct IPv6XuAddress) == address->address_length) + { + struct sockaddr_in6 v6; + + xu_v6 = (const struct IPv6XuAddress *) address->address; + memset (&v6, '\0', sizeof (v6)); + v6.sin6_family = AF_INET6; +#if HAVE_SOCKADDR_IN_SIN_LEN + v6.sin6_len = sizeof (struct sockaddr_in6); +#endif + v6.sin6_port = xu_v6->u6_port; + v6.sin6_addr = xu_v6->ipv6_addr; + network_type = plugin->env->get_address_type (plugin->env->cls, + (const struct sockaddr *) &v6, + sizeof (v6)); + } + GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network_type); + return xu_plugin_create_session (cls, + address, + network_type); +} + + +/** + * We've received a XU Message. Process it (pass contents to main service). + * + * @param plugin plugin context + * @param msg the message + * @param xu_addr sender address + * @param xu_addr_len number of bytes in @a xu_addr + * @param network_type network type the address belongs to + */ +static void +process_xu_message (struct Plugin *plugin, + const struct XUMessage *msg, + const union XuAddress *xu_addr, + size_t xu_addr_len, + enum GNUNET_ATS_Network_Type network_type) +{ + struct GNUNET_ATS_Session *s; + struct GNUNET_HELLO_Address *address; + + GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != network_type); + if (0 != ntohl (msg->reserved)) + { + GNUNET_break_op(0); + return; + } + if (ntohs (msg->header.size) + < sizeof(struct GNUNET_MessageHeader) + sizeof(struct XUMessage)) + { + GNUNET_break_op(0); + return; + } + + address = GNUNET_HELLO_address_allocate (&msg->sender, + PLUGIN_NAME, + xu_addr, + xu_addr_len, + GNUNET_HELLO_ADDRESS_INFO_NONE); + if (NULL == + (s = xu_plugin_lookup_session (plugin, + address))) + { + s = xu_plugin_create_session (plugin, + address, + network_type); + plugin->env->session_start (plugin->env->cls, + address, + s, + s->scope); + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_UP); + } + GNUNET_free (address); + + s->rc++; + GNUNET_MST_from_buffer (s->mst, + (const char *) &msg[1], + ntohs (msg->header.size) - sizeof(struct XUMessage), + GNUNET_YES, + GNUNET_NO); + s->rc--; + if ( (0 == s->rc) && + (GNUNET_YES == s->in_destroy) ) + free_session (s); +} + + +/** + * Read and process a message from the given socket. + * + * @param plugin the overall plugin + * @param rsock socket to read from + */ +static void +xu_select_read (struct Plugin *plugin, + struct GNUNET_NETWORK_Handle *rsock) +{ + socklen_t fromlen; + struct sockaddr_storage addr; + char buf[65536] GNUNET_ALIGN; + ssize_t size; + const struct GNUNET_MessageHeader *msg; + struct IPv4XuAddress v4; + struct IPv6XuAddress v6; + const struct sockaddr *sa; + const struct sockaddr_in *sa4; + const struct sockaddr_in6 *sa6; + const union XuAddress *int_addr; + size_t int_addr_len; + enum GNUNET_ATS_Network_Type network_type; + + fromlen = sizeof (addr); + memset (&addr, + 0, + sizeof(addr)); + size = GNUNET_NETWORK_socket_recvfrom (rsock, + buf, + sizeof (buf), + (struct sockaddr *) &addr, + &fromlen); + sa = (const struct sockaddr *) &addr; +#if MINGW + /* On SOCK_DGRAM XU sockets recvfrom might fail with a + * WSAECONNRESET error to indicate that previous sendto() (yes, sendto!) + * on this socket has failed. + * Quote from MSDN: + * WSAECONNRESET - The virtual circuit was reset by the remote side + * executing a hard or abortive close. The application should close + * the socket; it is no longer usable. On a XU-datagram socket this + * error indicates a previous send operation resulted in an ICMP Port + * Unreachable message. + */ + if ( (-1 == size) && + (ECONNRESET == errno) ) + return; +#endif + if (-1 == size) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "XU failed to receive data: %s\n", + STRERROR (errno)); + /* Connection failure or something. Not a protocol violation. */ + return; + } + + /* Check if this is a STUN packet */ + if (GNUNET_NO != + GNUNET_NAT_stun_handle_packet (plugin->nat, + (const struct sockaddr *) &addr, + fromlen, + buf, + size)) + return; /* was STUN, do not process further */ + + if (((size_t) size) < sizeof(struct GNUNET_MessageHeader)) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "XU got %u bytes from %s, which is not enough for a GNUnet message header\n", + (unsigned int ) size, + GNUNET_a2s (sa, + fromlen)); + /* _MAY_ be a connection failure (got partial message) */ + /* But it _MAY_ also be that the other side uses non-GNUnet protocol. */ + GNUNET_break_op (0); + return; + } + + msg = (const struct GNUNET_MessageHeader *) buf; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "XU received %u-byte message from `%s' type %u\n", + (unsigned int) size, + GNUNET_a2s (sa, + fromlen), + ntohs (msg->type)); + if (size != ntohs (msg->size)) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "XU malformed message (size %u) header from %s\n", + (unsigned int) size, + GNUNET_a2s (sa, + fromlen)); + GNUNET_break_op (0); + return; + } + GNUNET_STATISTICS_update (plugin->env->stats, + "# XU, total bytes received", + size, + GNUNET_NO); + network_type = plugin->env->get_address_type (plugin->env->cls, + sa, + fromlen); + switch (sa->sa_family) + { + case AF_INET: + sa4 = (const struct sockaddr_in *) &addr; + v4.options = 0; + v4.ipv4_addr = sa4->sin_addr.s_addr; + v4.u4_port = sa4->sin_port; + int_addr = (union XuAddress *) &v4; + int_addr_len = sizeof (v4); + break; + case AF_INET6: + sa6 = (const struct sockaddr_in6 *) &addr; + v6.options = 0; + v6.ipv6_addr = sa6->sin6_addr; + v6.u6_port = sa6->sin6_port; + int_addr = (union XuAddress *) &v6; + int_addr_len = sizeof (v6); + break; + default: + GNUNET_break (0); + return; + } + + switch (ntohs (msg->type)) + { + case GNUNET_MESSAGE_TYPE_TRANSPORT_XU_MESSAGE: + if (ntohs (msg->size) < sizeof(struct XUMessage)) + { + GNUNET_break_op(0); + return; + } + process_xu_message (plugin, + (const struct XUMessage *) msg, + int_addr, + int_addr_len, + network_type); + return; + default: + GNUNET_break_op(0); + return; + } +} + + +/* ***************** Event loop (part 2) *************** */ + + +/** + * We have been notified that our readset has something to read. We don't + * know which socket needs to be read, so we have to check each one + * Then reschedule this function to be called again once more is available. + * + * @param cls the plugin handle + */ +static void +xu_plugin_select_v4 (void *cls) +{ + struct Plugin *plugin = cls; + const struct GNUNET_SCHEDULER_TaskContext *tc; + + plugin->select_task_v4 = NULL; + if (NULL == plugin->sockv4) + return; + tc = GNUNET_SCHEDULER_get_task_context (); + if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) && + (GNUNET_NETWORK_fdset_isset (tc->read_ready, + plugin->sockv4)) ) + xu_select_read (plugin, + plugin->sockv4); + schedule_select_v4 (plugin); +} + + +/** + * We have been notified that our readset has something to read. We don't + * know which socket needs to be read, so we have to check each one + * Then reschedule this function to be called again once more is available. + * + * @param cls the plugin handle + */ +static void +xu_plugin_select_v6 (void *cls) +{ + struct Plugin *plugin = cls; + const struct GNUNET_SCHEDULER_TaskContext *tc; + + plugin->select_task_v6 = NULL; + if (NULL == plugin->sockv6) + return; + tc = GNUNET_SCHEDULER_get_task_context (); + if ( (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) && + (GNUNET_NETWORK_fdset_isset (tc->read_ready, + plugin->sockv6)) ) + xu_select_read (plugin, + plugin->sockv6); + schedule_select_v6 (plugin); +} + + +/* ******************* Initialization *************** */ + + +/** + * Setup the XU sockets (for IPv4 and IPv6) for the plugin. + * + * @param plugin the plugin to initialize + * @param bind_v6 IPv6 address to bind to (can be NULL, for 'any') + * @param bind_v4 IPv4 address to bind to (can be NULL, for 'any') + * @return number of sockets that were successfully bound + */ +static unsigned int +setup_sockets (struct Plugin *plugin, + const struct sockaddr_in6 *bind_v6, + const struct sockaddr_in *bind_v4) +{ + int tries; + unsigned int sockets_created = 0; + struct sockaddr_in6 server_addrv6; + struct sockaddr_in server_addrv4; + const struct sockaddr *server_addr; + const struct sockaddr *addrs[2]; + socklen_t addrlens[2]; + socklen_t addrlen; + int eno; + + /* Create IPv6 socket */ + eno = EINVAL; + if (GNUNET_YES == plugin->enable_ipv6) + { + plugin->sockv6 = GNUNET_NETWORK_socket_create (PF_INET6, + SOCK_DGRAM, + 0); + if (NULL == plugin->sockv6) + { + LOG (GNUNET_ERROR_TYPE_INFO, + _("Disabling IPv6 since it is not supported on this system!\n")); + plugin->enable_ipv6 = GNUNET_NO; + } + else + { + memset (&server_addrv6, + 0, + sizeof(struct sockaddr_in6)); +#if HAVE_SOCKADDR_IN_SIN_LEN + server_addrv6.sin6_len = sizeof (struct sockaddr_in6); +#endif + server_addrv6.sin6_family = AF_INET6; + if (NULL != bind_v6) + server_addrv6.sin6_addr = bind_v6->sin6_addr; + else + server_addrv6.sin6_addr = in6addr_any; + + if (0 == plugin->port) /* autodetect */ + server_addrv6.sin6_port + = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, + 33537) + + 32000); + else + server_addrv6.sin6_port = htons (plugin->port); + addrlen = sizeof (struct sockaddr_in6); + server_addr = (const struct sockaddr *) &server_addrv6; + + tries = 0; + while (tries < 10) + { + LOG(GNUNET_ERROR_TYPE_DEBUG, + "Binding to IPv6 `%s'\n", + GNUNET_a2s (server_addr, + addrlen)); + /* binding */ + if (GNUNET_OK == + GNUNET_NETWORK_socket_bind (plugin->sockv6, + server_addr, + addrlen)) + break; + eno = errno; + if (0 != plugin->port) + { + tries = 10; /* fail immediately */ + break; /* bind failed on specific port */ + } + /* autodetect */ + server_addrv6.sin6_port + = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, + 33537) + + 32000); + tries++; + } + if (tries >= 10) + { + GNUNET_NETWORK_socket_close (plugin->sockv6); + plugin->enable_ipv6 = GNUNET_NO; + plugin->sockv6 = NULL; + } + else + { + plugin->port = ntohs (server_addrv6.sin6_port); + } + if (NULL != plugin->sockv6) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "IPv6 XU socket created listinging at %s\n", + GNUNET_a2s (server_addr, + addrlen)); + addrs[sockets_created] = server_addr; + addrlens[sockets_created] = addrlen; + sockets_created++; + } + else + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Failed to bind XU socket to %s: %s\n"), + GNUNET_a2s (server_addr, + addrlen), + STRERROR (eno)); + } + } + } + + /* Create IPv4 socket */ + eno = EINVAL; + plugin->sockv4 = GNUNET_NETWORK_socket_create (PF_INET, + SOCK_DGRAM, + 0); + if (NULL == plugin->sockv4) + { + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "socket"); + LOG (GNUNET_ERROR_TYPE_INFO, + _("Disabling IPv4 since it is not supported on this system!\n")); + plugin->enable_ipv4 = GNUNET_NO; + } + else + { + memset (&server_addrv4, + 0, + sizeof(struct sockaddr_in)); +#if HAVE_SOCKADDR_IN_SIN_LEN + server_addrv4.sin_len = sizeof (struct sockaddr_in); +#endif + server_addrv4.sin_family = AF_INET; + if (NULL != bind_v4) + server_addrv4.sin_addr = bind_v4->sin_addr; + else + server_addrv4.sin_addr.s_addr = INADDR_ANY; + + if (0 == plugin->port) + /* autodetect */ + server_addrv4.sin_port + = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, + 33537) + + 32000); + else + server_addrv4.sin_port = htons (plugin->port); + + addrlen = sizeof (struct sockaddr_in); + server_addr = (const struct sockaddr *) &server_addrv4; + + tries = 0; + while (tries < 10) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Binding to IPv4 `%s'\n", + GNUNET_a2s (server_addr, + addrlen)); + + /* binding */ + if (GNUNET_OK == + GNUNET_NETWORK_socket_bind (plugin->sockv4, + server_addr, + addrlen)) + break; + eno = errno; + if (0 != plugin->port) + { + tries = 10; /* fail */ + break; /* bind failed on specific port */ + } + + /* autodetect */ + server_addrv4.sin_port + = htons (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, + 33537) + + 32000); + tries++; + } + if (tries >= 10) + { + GNUNET_NETWORK_socket_close (plugin->sockv4); + plugin->enable_ipv4 = GNUNET_NO; + plugin->sockv4 = NULL; + } + else + { + plugin->port = ntohs (server_addrv4.sin_port); + } + + if (NULL != plugin->sockv4) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "IPv4 socket created on port %s\n", + GNUNET_a2s (server_addr, + addrlen)); + addrs[sockets_created] = server_addr; + addrlens[sockets_created] = addrlen; + sockets_created++; + } + else + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Failed to bind XU socket to %s: %s\n"), + GNUNET_a2s (server_addr, + addrlen), + STRERROR (eno)); + } + } + + if (0 == sockets_created) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + _("Failed to open XU sockets\n")); + return 0; /* No sockets created, return */ + } + schedule_select_v4 (plugin); + schedule_select_v6 (plugin); + plugin->nat = GNUNET_NAT_register (plugin->env->cfg, + "transport-xu", + IPPROTO_UDP, + sockets_created, + addrs, + addrlens, + &xu_nat_port_map_callback, + NULL, + plugin); + return sockets_created; +} + + +/** + * The exported method. Makes the core api available via a global and + * returns the xu transport API. + * + * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment` + * @return our `struct GNUNET_TRANSPORT_PluginFunctions` + */ +void * +libgnunet_plugin_transport_xu_init (void *cls) +{ + struct GNUNET_TRANSPORT_PluginEnvironment *env = cls; + struct GNUNET_TRANSPORT_PluginFunctions *api; + struct Plugin *p; + unsigned long long port; + unsigned long long aport; + int enable_v6; + char *bind4_address; + char *bind6_address; + struct sockaddr_in server_addrv4; + struct sockaddr_in6 server_addrv6; + unsigned int res; + int have_bind4; + int have_bind6; + + if (NULL == env->receive) + { + /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully + initialze the plugin or the API */ + api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); + api->cls = NULL; + api->address_pretty_printer = &xu_plugin_address_pretty_printer; + api->address_to_string = &xu_address_to_string; + api->string_to_address = &xu_string_to_address; + return api; + } + + /* Get port number: port == 0 : autodetect a port, + * > 0 : use this port, not given : 2086 default */ + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (env->cfg, + "transport-xu", + "PORT", + &port)) + port = 2086; + if (port > 65535) + { + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "transport-xu", + "PORT", + _("must be in [0,65535]")); + return NULL; + } + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (env->cfg, + "transport-xu", + "ADVERTISED_PORT", + &aport)) + aport = port; + if (aport > 65535) + { + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "transport-xu", + "ADVERTISED_PORT", + _("must be in [0,65535]")); + return NULL; + } + + if (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_yesno (env->cfg, + "nat", + "DISABLEV6")) + enable_v6 = GNUNET_NO; + else + enable_v6 = GNUNET_YES; + + have_bind4 = GNUNET_NO; + memset (&server_addrv4, + 0, + sizeof (server_addrv4)); + if (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_string (env->cfg, + "transport-xu", + "BINDTO", + &bind4_address)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Binding XU plugin to specific address: `%s'\n", + bind4_address); + if (1 != inet_pton (AF_INET, + bind4_address, + &server_addrv4.sin_addr)) + { + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "transport-xu", + "BINDTO", + _("must be valid IPv4 address")); + GNUNET_free (bind4_address); + return NULL; + } + have_bind4 = GNUNET_YES; + } + GNUNET_free_non_null (bind4_address); + have_bind6 = GNUNET_NO; + memset (&server_addrv6, + 0, + sizeof (server_addrv6)); + if (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_string (env->cfg, + "transport-xu", + "BINDTO6", + &bind6_address)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Binding xu plugin to specific address: `%s'\n", + bind6_address); + if (1 != inet_pton (AF_INET6, + bind6_address, + &server_addrv6.sin6_addr)) + { + GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, + "transport-xu", + "BINDTO6", + _("must be valid IPv6 address")); + GNUNET_free (bind6_address); + return NULL; + } + have_bind6 = GNUNET_YES; + } + GNUNET_free_non_null (bind6_address); + + p = GNUNET_new (struct Plugin); + p->port = port; + p->aport = aport; + p->enable_ipv6 = enable_v6; + p->enable_ipv4 = GNUNET_YES; /* default */ + p->env = env; + p->sessions = GNUNET_CONTAINER_multipeermap_create (16, + GNUNET_NO); + res = setup_sockets (p, + (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL, + (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL); + if ( (0 == res) || + ( (NULL == p->sockv4) && + (NULL == p->sockv6) ) ) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Failed to create XU network sockets\n")); + GNUNET_CONTAINER_multipeermap_destroy (p->sessions); + if (NULL != p->nat) + GNUNET_NAT_unregister (p->nat); + GNUNET_free (p); + return NULL; + } + + api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); + api->cls = p; + api->disconnect_session = &xu_disconnect_session; + api->query_keepalive_factor = &xu_query_keepalive_factor; + api->disconnect_peer = &xu_disconnect; + api->address_pretty_printer = &xu_plugin_address_pretty_printer; + api->address_to_string = &xu_address_to_string; + api->string_to_address = &xu_string_to_address; + api->check_address = &xu_plugin_check_address; + api->get_session = &xu_plugin_get_session; + api->send = &xu_plugin_send; + api->get_network = &xu_plugin_get_network; + api->get_network_for_address = &xu_plugin_get_network_for_address; + api->update_session_timeout = &xu_plugin_update_session_timeout; + api->setup_monitor = &xu_plugin_setup_monitor; + return api; +} + + +/** + * The exported method. Makes the core api available via a global and + * returns the xu transport API. + * + * @param cls our `struct GNUNET_TRANSPORT_PluginEnvironment` + * @return NULL + */ +void * +libgnunet_plugin_transport_xu_done (void *cls) +{ + struct GNUNET_TRANSPORT_PluginFunctions *api = cls; + struct Plugin *plugin = api->cls; + struct PrettyPrinterContext *cur; + + if (NULL == plugin) + { + GNUNET_free (api); + return NULL; + } + if (NULL != plugin->select_task_v4) + { + GNUNET_SCHEDULER_cancel (plugin->select_task_v4); + plugin->select_task_v4 = NULL; + } + if (NULL != plugin->select_task_v6) + { + GNUNET_SCHEDULER_cancel (plugin->select_task_v6); + plugin->select_task_v6 = NULL; + } + if (NULL != plugin->sockv4) + { + GNUNET_break (GNUNET_OK == + GNUNET_NETWORK_socket_close (plugin->sockv4)); + plugin->sockv4 = NULL; + } + if (NULL != plugin->sockv6) + { + GNUNET_break (GNUNET_OK == + GNUNET_NETWORK_socket_close (plugin->sockv6)); + plugin->sockv6 = NULL; + } + if (NULL != plugin->nat) + { + GNUNET_NAT_unregister (plugin->nat); + plugin->nat = NULL; + } + GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions); + + while (NULL != (cur = plugin->ppc_dll_head)) + { + GNUNET_break (0); + GNUNET_CONTAINER_DLL_remove (plugin->ppc_dll_head, + plugin->ppc_dll_tail, + cur); + GNUNET_RESOLVER_request_cancel (cur->resolver_handle); + if (NULL != cur->timeout_task) + { + GNUNET_SCHEDULER_cancel (cur->timeout_task); + cur->timeout_task = NULL; + } + GNUNET_free (cur); + } + GNUNET_free (plugin); + GNUNET_free (api); + return NULL; +} + +/* end of plugin_transport_xu.c */ diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index a541080ce7..1f56a2fa75 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -122,6 +122,11 @@ TESTING_IGNORE_KEYS = ACCEPT_FROM; # HOLE_EXTERNAL = AUTO:2086 +[transport-xu] +# Use PORT = 0 to autodetect a port available +PORT = 2087 + + [transport-http_client] MAX_CONNECTIONS = 128 TESTING_IGNORE_KEYS = ACCEPT_FROM; -- cgit v1.2.3-18-g5258 From f5a18b7466f342ac9624adcdb65f104aef8ecb5e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 30 May 2018 18:46:55 +0200 Subject: disable xu transport, header missing --- src/transport/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index b04b54e7f3..286f03c4df 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -282,7 +282,6 @@ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ libgnunet_plugin_transport_xt.la \ libgnunet_plugin_transport_udp.la \ - libgnunet_plugin_transport_xu.la \ $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ $(HTTPS_CLIENT_PLUGIN_LA) \ -- cgit v1.2.3-18-g5258 From adef29b3ed00afd42669ae35a73951c59f08a41b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 30 May 2018 18:47:17 +0200 Subject: add proximity considerations to datacache --- src/datacache/datacache.c | 3 + src/datacache/plugin_datacache_heap.c | 117 ++++++++++++++++++++++++++++-- src/datacache/plugin_datacache_postgres.c | 2 + src/datacache/plugin_datacache_sqlite.c | 61 ++++++++++++---- src/datacache/plugin_datacache_template.c | 2 + src/datacache/test_datacache.c | 10 ++- src/datacache/test_datacache_quota.c | 10 ++- src/dht/gnunet-dht-get.c | 22 +++--- src/dht/gnunet-dht-monitor.c | 27 ++++--- src/dht/gnunet-service-dht_datacache.c | 6 +- src/dht/gnunet-service-dht_neighbours.c | 12 +-- src/dht/gnunet-service-dht_neighbours.h | 16 ++++ src/gns/gnunet-gns-benchmark.c | 2 +- src/gns/gnunet-service-gns_resolver.c | 2 +- src/include/gnunet_datacache_lib.h | 2 + src/include/gnunet_datacache_plugin.h | 2 + 16 files changed, 245 insertions(+), 51 deletions(-) diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 0646019bd7..18a2ed228e 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -260,6 +260,7 @@ GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h) * * @param h handle to the datacache * @param key key to store data under + * @param am_closest are we the closest peer? * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -271,6 +272,7 @@ GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h) int GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, const struct GNUNET_HashCode *key, + int am_closest, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, @@ -282,6 +284,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, used = h->api->put (h->api->cls, key, + am_closest, data_size, data, type, diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index 49e60bca1d..c32edf8e2e 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -53,6 +53,11 @@ struct Plugin */ struct GNUNET_CONTAINER_Heap *heap; + /** + * Heap from the plugin for "closest" values. + */ + struct GNUNET_CONTAINER_Heap *cheap; + }; @@ -91,6 +96,11 @@ struct Value */ unsigned int path_info_len; + /** + * Am I the closest peer? Determines which heap we are in! + */ + int am_closest; + /** * Type of the block. */ @@ -117,6 +127,11 @@ struct PutContext */ const char *data; + /** + * Heap from the plugin for "closest" values. + */ + struct GNUNET_CONTAINER_Heap *cheap; + /** * Heap from the plugin. */ @@ -168,7 +183,9 @@ put_cb (void *cls, if ( (val->size == put_ctx->size) && (val->type == put_ctx->type) && - (0 == memcmp (&val[1], put_ctx->data, put_ctx->size)) ) + (0 == memcmp (&val[1], + put_ctx->data, + put_ctx->size)) ) { put_ctx->found = GNUNET_YES; val->discard_time = GNUNET_TIME_absolute_max (val->discard_time, @@ -199,6 +216,7 @@ put_cb (void *cls, * * @param cls closure (our `struct Plugin`) * @param key key to store data under + * @param am_closest are we the closest peer? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -210,6 +228,7 @@ put_cb (void *cls, static ssize_t heap_plugin_put (void *cls, const struct GNUNET_HashCode *key, + int am_closest, size_t size, const char *data, enum GNUNET_BLOCK_Type type, @@ -223,6 +242,7 @@ heap_plugin_put (void *cls, put_ctx.found = GNUNET_NO; put_ctx.heap = plugin->heap; + put_ctx.cheap = plugin->cheap; put_ctx.data = data; put_ctx.size = size; put_ctx.path_info = path_info; @@ -241,17 +261,20 @@ heap_plugin_put (void *cls, val->type = type; val->discard_time = discard_time; val->size = size; + val->am_closest = am_closest; GNUNET_array_grow (val->path_info, val->path_info_len, path_info_len); GNUNET_memcpy (val->path_info, - path_info, - path_info_len * sizeof (struct GNUNET_PeerIdentity)); + path_info, + path_info_len * sizeof (struct GNUNET_PeerIdentity)); (void) GNUNET_CONTAINER_multihashmap_put (plugin->map, &val->key, val, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); - val->hn = GNUNET_CONTAINER_heap_insert (plugin->heap, + val->hn = GNUNET_CONTAINER_heap_insert (am_closest + ? plugin->cheap + : plugin->heap, val, val->discard_time.abs_value_us); return size + OVERHEAD; @@ -370,6 +393,8 @@ heap_plugin_del (void *cls) struct Value *val; val = GNUNET_CONTAINER_heap_remove_root (plugin->heap); + if (NULL == val) + val = GNUNET_CONTAINER_heap_remove_root (plugin->cheap); if (NULL == val) return GNUNET_SYSERR; GNUNET_assert (GNUNET_YES == @@ -412,6 +437,53 @@ heap_plugin_get_random (void *cls, } +/** + * Closure for #find_closest(). + */ +struct GetClosestContext +{ + struct Value **values; + + unsigned int num_results; + + const struct GNUNET_HashCode *key; +}; + + +static int +find_closest (void *cls, + const struct GNUNET_HashCode *key, + void *value) +{ + struct GetClosestContext *gcc = cls; + struct Value *val = value; + unsigned int j; + + if (1 != GNUNET_CRYPTO_hash_cmp (key, + gcc->key)) + return GNUNET_OK; /* useless */ + j = gcc->num_results; + for (unsigned int i=0;inum_results;i++) + { + if (NULL == gcc->values[i]) + { + j = i; + break; + } + if (1 == GNUNET_CRYPTO_hash_cmp (&gcc->values[i]->key, + key)) + { + j = i; + break; + } + } + if (j == gcc->num_results) + return GNUNET_OK; + gcc->values[j] = val; + return GNUNET_OK; +} + + /** * Iterate over the results that are "close" to a particular key in * the datacache. "close" is defined as numerically larger than @a @@ -432,8 +504,30 @@ heap_plugin_get_closest (void *cls, GNUNET_DATACACHE_Iterator iter, void *iter_cls) { - GNUNET_break (0); // not implemented! - return 0; + struct Plugin *plugin = cls; + struct Value *values[num_results]; + struct GetClosestContext gcc = { + .values = values, + .num_results = num_results, + .key = key + }; + GNUNET_CONTAINER_multihashmap_iterate (plugin->map, + &find_closest, + &gcc); + for (unsigned int i=0;ikey, + values[i]->size, + (void *) &values[i][1], + values[i]->type, + values[i]->discard_time, + values[i]->path_info_len, + values[i]->path_info); + } + return num_results; } @@ -454,6 +548,7 @@ libgnunet_plugin_datacache_heap_init (void *cls) plugin->map = GNUNET_CONTAINER_multihashmap_create (1024, /* FIXME: base on quota! */ GNUNET_YES); plugin->heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); + plugin->cheap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); plugin->env = env; api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); api->cls = plugin; @@ -490,7 +585,17 @@ libgnunet_plugin_datacache_heap_done (void *cls) GNUNET_free_non_null (val->path_info); GNUNET_free (val); } + while (NULL != (val = GNUNET_CONTAINER_heap_remove_root (plugin->cheap))) + { + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_remove (plugin->map, + &val->key, + val)); + GNUNET_free_non_null (val->path_info); + GNUNET_free (val); + } GNUNET_CONTAINER_heap_destroy (plugin->heap); + GNUNET_CONTAINER_heap_destroy (plugin->cheap); GNUNET_CONTAINER_multihashmap_destroy (plugin->map); GNUNET_free (plugin); GNUNET_free (api); diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 2c233c4c21..c6ccfb2109 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -141,6 +141,7 @@ init_connection (struct Plugin *plugin) * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under + * @param am_closest are we the closest peer? * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -152,6 +153,7 @@ init_connection (struct Plugin *plugin) static ssize_t postgres_plugin_put (void *cls, const struct GNUNET_HashCode *key, + int am_closest, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 15438b29b8..455dcab0b3 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -38,7 +38,7 @@ * How much overhead do we assume per entry in the * datacache? */ -#define OVERHEAD (sizeof(struct GNUNET_HashCode) + 32) +#define OVERHEAD (sizeof(struct GNUNET_HashCode) + 36) /** * Context for all functions in this plugin. @@ -150,6 +150,7 @@ sq_prepare (sqlite3 *dbh, * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under + * @param am_closest are we the closest peer? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -161,6 +162,7 @@ sq_prepare (sqlite3 *dbh, static ssize_t sqlite_plugin_put (void *cls, const struct GNUNET_HashCode *key, + int am_closest, size_t size, const char *data, enum GNUNET_BLOCK_Type type, @@ -170,10 +172,12 @@ sqlite_plugin_put (void *cls, { struct Plugin *plugin = cls; uint32_t type32 = type; + uint32_t prox = am_closest; struct GNUNET_SQ_QueryParam params[] = { GNUNET_SQ_query_param_uint32 (&type32), GNUNET_SQ_query_param_absolute_time (&discard_time), GNUNET_SQ_query_param_auto_from_type (key), + GNUNET_SQ_query_param_uint32 (&prox), GNUNET_SQ_query_param_fixed_size (data, size), GNUNET_SQ_query_param_fixed_size (path_info, path_info_len * sizeof (struct GNUNET_PeerIdentity)), @@ -386,6 +390,7 @@ sqlite_plugin_del (void *cls) uint64_t rowid; void *data; size_t dsize; + uint32_t prox; struct GNUNET_HashCode hc; struct GNUNET_SQ_ResultSpec rs[] = { GNUNET_SQ_result_spec_uint64 (&rowid), @@ -398,9 +403,26 @@ sqlite_plugin_del (void *cls) GNUNET_SQ_query_param_uint64 (&rowid), GNUNET_SQ_query_param_end }; + struct GNUNET_SQ_QueryParam prox_params[] = { + GNUNET_SQ_query_param_uint32 (&prox), + GNUNET_SQ_query_param_end + }; LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing DEL\n"); + prox = GNUNET_NO; + again: + if (GNUNET_OK != + GNUNET_SQ_bind (plugin->del_select_stmt, + prox_params)) + { + LOG_SQLITE (plugin->dbh, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_bind"); + GNUNET_SQ_reset (plugin->dbh, + plugin->del_stmt); + return GNUNET_SYSERR; + } if (SQLITE_ROW != sqlite3_step (plugin->del_select_stmt)) { @@ -409,15 +431,25 @@ sqlite_plugin_del (void *cls) "sqlite3_step"); GNUNET_SQ_reset (plugin->dbh, plugin->del_select_stmt); + if (GNUNET_NO == prox) + { + prox = GNUNET_YES; + goto again; + } return GNUNET_SYSERR; } if (GNUNET_OK != GNUNET_SQ_extract_result (plugin->del_select_stmt, rs)) { - GNUNET_break (0); GNUNET_SQ_reset (plugin->dbh, plugin->del_select_stmt); + if (GNUNET_NO == prox) + { + prox = GNUNET_YES; + goto again; + } + GNUNET_break (0); return GNUNET_SYSERR; } GNUNET_SQ_cleanup_result (rs); @@ -709,13 +741,14 @@ libgnunet_plugin_datacache_sqlite_init (void *cls) SQLITE3_EXEC (dbh, "PRAGMA sqlite_temp_store=3"); SQLITE3_EXEC (dbh, - "CREATE TABLE ds090 (" " type INTEGER NOT NULL DEFAULT 0," - " expire INTEGER NOT NULL DEFAULT 0," + "CREATE TABLE ds091 (" " type INTEGER NOT NULL DEFAULT 0," + " expire INTEGER NOT NULL," " key BLOB NOT NULL DEFAULT ''," - " value BLOB NOT NULL DEFAULT ''," + " prox INTEGER NOT NULL," + " value BLOB NOT NULL," " path BLOB DEFAULT '')"); SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds090 (key,type,expire)"); - SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (expire)"); + SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (prox,expire)"); plugin = GNUNET_new (struct Plugin); plugin->env = env; plugin->dbh = dbh; @@ -723,35 +756,35 @@ libgnunet_plugin_datacache_sqlite_init (void *cls) if ( (SQLITE_OK != sq_prepare (plugin->dbh, - "INSERT INTO ds090 (type, expire, key, value, path) " - "VALUES (?, ?, ?, ?, ?)", + "INSERT INTO ds091 (type, expire, key, prox, value, path) " + "VALUES (?, ?, ?, ?, ?, ?)", &plugin->insert_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT count(*) FROM ds090 " + "SELECT count(*) FROM ds091 " "WHERE key=? AND type=? AND expire >= ?", &plugin->get_count_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT value,expire,path FROM ds090 " + "SELECT value,expire,path FROM ds091 " "WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET ?", &plugin->get_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT _ROWID_,key,value FROM ds090 ORDER BY expire ASC LIMIT 1", + "SELECT _ROWID_,key,value FROM ds091 WHERE prox=? ORDER BY expire ASC LIMIT 1", &plugin->del_select_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "DELETE FROM ds090 WHERE _ROWID_=?", + "DELETE FROM ds091 WHERE _ROWID_=?", &plugin->del_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT value,expire,path,key,type FROM ds090 " + "SELECT value,expire,path,key,type FROM ds091 " "ORDER BY key LIMIT 1 OFFSET ?", &plugin->get_random_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT value,expire,path,type,key FROM ds090 " + "SELECT value,expire,path,type,key FROM ds091 " "WHERE key>=? AND expire >= ? ORDER BY KEY ASC LIMIT ?", &plugin->get_closest_stmt)) ) diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index b9baa64d34..28bcbcd26a 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -45,6 +45,7 @@ struct Plugin * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under + * @param am_closest are we the closest peer? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -56,6 +57,7 @@ struct Plugin static ssize_t template_plugin_put (void *cls, const struct GNUNET_HashCode *key, + int am_closest, size_t size, const char *data, enum GNUNET_BLOCK_Type type, diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index 79e6b6d749..c4d59c3cc6 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -87,7 +87,10 @@ run (void *cls, char *const *args, const char *cfgfile, { GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); ASSERT (GNUNET_OK == - GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode), + GNUNET_DATACACHE_put (h, + &k, + GNUNET_YES, + sizeof (struct GNUNET_HashCode), (const char *) &n, 1 + i % 16, exp, 0, NULL)); k = n; @@ -103,7 +106,10 @@ run (void *cls, char *const *args, const char *cfgfile, memset (&k, 42, sizeof (struct GNUNET_HashCode)); GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); ASSERT (GNUNET_OK == - GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode), + GNUNET_DATACACHE_put (h, + &k, + GNUNET_YES, + sizeof (struct GNUNET_HashCode), (const char *) &n, 792, GNUNET_TIME_UNIT_FOREVER_ABS, 0, NULL)); diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index 78b56ce425..35357a8d28 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -73,7 +73,15 @@ run (void *cls, char *const *args, const char *cfgfile, { exp.abs_value_us++; buf[j] = i; - ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, &k, j, buf, 1 + i, exp, 0, NULL)); + ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, + &k, + GNUNET_YES, + j, + buf, + 1 + i, + exp, + 0, + NULL)); ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL)); } k = n; diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 842ec6270e..afcd5422cc 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -154,7 +154,9 @@ get_result_iterator (void *cls, struct GNUNET_TIME_Absolute exp, const void *data) { FPRINTF (stdout, - _("Result %d, type %d:\n%.*s\n"), + (GNUNET_BLOCK_TYPE_TEST == type) + ? _("Result %d, type %d:\n%.*s\n") + : _("Result %d, type %d:\n"), result_count, type, (unsigned int) size, @@ -196,8 +198,6 @@ run (void *cls, char *const *args, const char *cfgfile, { struct GNUNET_HashCode key; - - cfg = c; if (NULL == query_key) { @@ -215,17 +215,22 @@ run (void *cls, char *const *args, const char *cfgfile, query_type = GNUNET_BLOCK_TYPE_TEST; GNUNET_CRYPTO_hash (query_key, strlen (query_key), &key); if (verbose) - FPRINTF (stderr, "%s `%s' \n", _("Issueing DHT GET with key"), GNUNET_h2s_full (&key)); + FPRINTF (stderr, "%s `%s' \n", + _("Issueing DHT GET with key"), + GNUNET_h2s_full (&key)); GNUNET_SCHEDULER_add_shutdown (&cleanup_task, NULL); tt = GNUNET_SCHEDULER_add_delayed (timeout_request, - &timeout_task, NULL); + &timeout_task, + NULL); get_handle = GNUNET_DHT_get_start (dht_handle, query_type, &key, replication, (demultixplex_everywhere) ? GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE : GNUNET_DHT_RO_NONE, - NULL, 0, &get_result_iterator, NULL); - + NULL, 0, + &get_result_iterator, + NULL); } + /** * Entry point for gnunet-dht-get * @@ -236,15 +241,12 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *const *argv) { - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_string ('k', "key", "KEY", gettext_noop ("the query key"), &query_key), - GNUNET_GETOPT_option_uint ('r', "replication", "LEVEL", diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index b7360bbabc..a699b3d175 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -141,7 +141,8 @@ get_callback (void *cls, const struct GNUNET_PeerIdentity *path, const struct GNUNET_HashCode * key) { - FPRINTF (stdout, "GET #%u: type %d, key `%s'\n", + FPRINTF (stdout, + "GET #%u: type %d, key `%s'\n", result_count, (int) type, GNUNET_h2s_full(key)); @@ -176,8 +177,11 @@ get_resp_callback (void *cls, size_t size) { FPRINTF (stdout, - "RESPONSE #%u: type %d, key `%s', data `%.*s'\n", + (GNUNET_BLOCK_TYPE_TEST == type) + ? "RESPONSE #%u (%s): type %d, key `%s', data `%.*s'\n" + : "RESPONSE #%u (%s): type %d, key `%s'\n", result_count, + GNUNET_STRINGS_absolute_time_to_string (exp), (int) type, GNUNET_h2s_full (key), (unsigned int) size, @@ -215,8 +219,11 @@ put_callback (void *cls, size_t size) { FPRINTF (stdout, - "PUT %u: type %d, key `%s', data `%.*s'\n", + (GNUNET_BLOCK_TYPE_TEST == type) + ? "PUT %u (%s): type %d, key `%s', data `%.*s'\n" + : "PUT %u (%s): type %d, key `%s'\n", result_count, + GNUNET_STRINGS_absolute_time_to_string (exp), (int) type, GNUNET_h2s_full(key), (unsigned int) size, @@ -234,7 +241,9 @@ put_callback (void *cls, * @param c configuration */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { struct GNUNET_HashCode *key; @@ -291,30 +300,30 @@ int main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { - + GNUNET_GETOPT_option_string ('k', "key", "KEY", gettext_noop ("the query key"), &query_key), - + GNUNET_GETOPT_option_uint ('t', "type", "TYPE", gettext_noop ("the type of data to look for"), &block_type), - + GNUNET_GETOPT_option_relative_time ('T', "timeout", "TIMEOUT", gettext_noop ("how long should the monitor command run"), &timeout_request), - + GNUNET_GETOPT_option_flag ('V', "verbose", gettext_noop ("be verbose (print progress information)"), &verbose), - + GNUNET_GETOPT_OPTION_END }; diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 36047d5619..81b7184edb 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -26,6 +26,7 @@ #include "platform.h" #include "gnunet_datacache_lib.h" #include "gnunet-service-dht_datacache.h" +#include "gnunet-service-dht_neighbours.h" #include "gnunet-service-dht_routing.h" #include "gnunet-service-dht.h" @@ -79,10 +80,13 @@ GDS_DATACACHE_handle_put (struct GNUNET_TIME_Absolute expiration, } /* Put size is actual data size plus struct overhead plus path length (if any) */ GNUNET_STATISTICS_update (GDS_stats, - gettext_noop ("# ITEMS stored in datacache"), 1, + gettext_noop ("# ITEMS stored in datacache"), + 1, GNUNET_NO); r = GNUNET_DATACACHE_put (datacache, key, + GDS_am_closest_peer (key, + NULL), data_size, data, type, diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 0309bea880..b120091af2 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -421,7 +421,7 @@ static struct GNUNET_ATS_ConnectivityHandle *ats_ch; * Find the optimal bucket for this key. * * @param hc the hashcode to compare our identity to - * @return the proper bucket index, or GNUNET_SYSERR + * @return the proper bucket index, or #GNUNET_SYSERR * on error (same hashcode) */ static int @@ -941,9 +941,9 @@ get_distance (const struct GNUNET_HashCode *target, * @return #GNUNET_YES if node location is closest, * #GNUNET_NO otherwise. */ -static int -am_closest_peer (const struct GNUNET_HashCode *key, - const struct GNUNET_CONTAINER_BloomFilter *bloom) +int +GDS_am_closest_peer (const struct GNUNET_HashCode *key, + const struct GNUNET_CONTAINER_BloomFilter *bloom) { int bits; int other_bits; @@ -1803,7 +1803,7 @@ handle_dht_p2p_put (void *cls, payload); /* store locally */ if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) || - (am_closest_peer (&put->key, bf))) + (GDS_am_closest_peer (&put->key, bf))) GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time), &put->key, putlen, @@ -2122,7 +2122,7 @@ handle_dht_p2p_get (void *cls, (unsigned int) ntohl (get->hop_count)); /* local lookup (this may update the reply_bf) */ if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) || - (am_closest_peer (&get->key, + (GDS_am_closest_peer (&get->key, peer_bf))) { if ((0 != (options & GNUNET_DHT_RO_FIND_PEER))) diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index 34b76ee8a2..bb1867fe9f 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h @@ -122,6 +122,22 @@ GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target, size_t data_size); +/** + * Check whether my identity is closer than any known peers. If a + * non-null bloomfilter is given, check if this is the closest peer + * that hasn't already been routed to. + * + * @param key hash code to check closeness to + * @param bloom bloomfilter, exclude these entries from the decision + * @return #GNUNET_YES if node location is closest, + * #GNUNET_NO otherwise. + */ +int +GDS_am_closest_peer (const struct GNUNET_HashCode *key, + const struct GNUNET_CONTAINER_BloomFilter *bloom); + + + /** * Initialize neighbours subsystem. * diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c index 0ab6cefd53..414c844952 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/gns/gnunet-gns-benchmark.c @@ -294,7 +294,7 @@ process_queue (void *cls) active_cnt); req->lr = GNUNET_GNS_lookup_with_tld (gns, req->hostname, - GNUNET_GNSRECORD_TYPE_ANY, + GNUNET_GNSRECORD_TYPE_GNS2DNS, GNUNET_GNS_LO_DEFAULT, &process_result, req); diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 8b20f2ae36..0d04fc6b9c 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -60,7 +60,7 @@ /** * DHT replication level */ -#define DHT_GNS_REPLICATION_LEVEL 5 +#define DHT_GNS_REPLICATION_LEVEL 10 /** * How deep do we allow recursions to go before we abort? diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 39a312b17a..066b02ca91 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h @@ -105,6 +105,7 @@ typedef int * * @param h handle to the datacache * @param key key to store data under + * @param am_closest am I the closest peer? * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -116,6 +117,7 @@ typedef int int GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, const struct GNUNET_HashCode *key, + int am_closest, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index 166c7bc3b6..9746b6493e 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h @@ -109,6 +109,7 @@ struct GNUNET_DATACACHE_PluginFunctions * * @param cls closure (internal context for the plugin) * @param key key to store the value under + * @param am_closest are we the closest peer? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -119,6 +120,7 @@ struct GNUNET_DATACACHE_PluginFunctions */ ssize_t (*put) (void *cls, const struct GNUNET_HashCode *key, + int am_closest, size_t size, const char *data, enum GNUNET_BLOCK_Type type, -- cgit v1.2.3-18-g5258 From bc64df2cff173cb1656be4874fe1d9f225c70709 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 31 May 2018 12:43:11 +0200 Subject: add more logging for core KX to improve diagnostics --- src/core/gnunet-service-core_kx.c | 53 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 944d1e6923..69001a50f6 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -1454,10 +1454,18 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, &ph->sequence_number, &em->sequence_number, used - ENCRYPTED_HEADER_SIZE)); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encrypted %u bytes for %s\n", - (unsigned int) (used - ENCRYPTED_HEADER_SIZE), - GNUNET_i2s (kx->peer)); + { + struct GNUNET_HashCode hc; + + GNUNET_CRYPTO_hash (&ph->sequence_number, + used - ENCRYPTED_HEADER_SIZE, + &hc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Encrypted payload `%s' of %u bytes for %s\n", + GNUNET_h2s (&hc), + (unsigned int) (used - ENCRYPTED_HEADER_SIZE), + GNUNET_i2s (kx->peer)); + } derive_auth_key (&auth_key, &kx->encrypt_key, ph->iv_seed); @@ -1465,6 +1473,18 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, &em->sequence_number, used - ENCRYPTED_HEADER_SIZE, &em->hmac); + { + struct GNUNET_HashCode hc; + + GNUNET_CRYPTO_hash (&auth_key, + sizeof (auth_key), + &hc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "For peer %s, used AC %s to create hmac %s\n", + GNUNET_i2s (kx->peer), + GNUNET_h2s (&hc), + GNUNET_h2s2 (&em->hmac)); + } kx->has_excess_bandwidth = GNUNET_NO; GNUNET_MQ_send (kx->mq, env); @@ -1544,6 +1564,19 @@ handle_encrypted (void *cls, } /* validate hash */ + { + struct GNUNET_HashCode hc; + + GNUNET_CRYPTO_hash (&m->sequence_number, + size - ENCRYPTED_HEADER_SIZE, + &hc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received encrypted payload `%s' of %u bytes from %s\n", + GNUNET_h2s (&hc), + (unsigned int) (size - ENCRYPTED_HEADER_SIZE), + GNUNET_i2s (kx->peer)); + } + derive_auth_key (&auth_key, &kx->decrypt_key, m->iv_seed); @@ -1551,6 +1584,18 @@ handle_encrypted (void *cls, &m->sequence_number, size - ENCRYPTED_HEADER_SIZE, &ph); + { + struct GNUNET_HashCode hc; + + GNUNET_CRYPTO_hash (&auth_key, + sizeof (auth_key), + &hc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "For peer %s, used AC %s to verify hmac %s\n", + GNUNET_i2s (kx->peer), + GNUNET_h2s (&hc), + GNUNET_h2s2 (&m->hmac)); + } if (0 != memcmp (&ph, &m->hmac, sizeof (struct GNUNET_HashCode))) -- cgit v1.2.3-18-g5258 From 2e619a454b7c78aa5f592debd6c8a31e7d7c1143 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 14:38:40 +0200 Subject: more logging --- src/core/gnunet-service-core_kx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 69001a50f6..0d01977bd3 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -1130,8 +1130,9 @@ handle_ping (void *cls, { if (GNUNET_CORE_KX_STATE_REKEY_SENT != kx->status) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Decryption of PING from peer `%s' failed\n", - GNUNET_i2s (kx->peer)); + "Decryption of PING from peer `%s' failed, PING for `%s'?\n", + GNUNET_i2s (kx->peer), + GNUNET_i2s2 (&t.target)); else GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Decryption of PING from peer `%s' failed after rekey (harmless)\n", -- cgit v1.2.3-18-g5258 From 18a1d4ec5085690d16345a52f3e75d059c834195 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 15:07:09 +0200 Subject: proper datacache expiration by proximity first --- src/datacache/datacache.c | 6 +-- src/datacache/plugin_datacache_heap.c | 90 +++++++++++++------------------ src/datacache/plugin_datacache_sqlite.c | 84 ++++++++++++++++++----------- src/datacache/plugin_datacache_template.c | 4 +- src/dht/gnunet-service-dht_datacache.c | 4 +- src/dht/gnunet-service-dht_neighbours.c | 2 +- src/dht/gnunet-service-dht_neighbours.h | 6 +++ src/include/gnunet_datacache_lib.h | 4 +- src/include/gnunet_datacache_plugin.h | 4 +- 9 files changed, 106 insertions(+), 98 deletions(-) diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 18a2ed228e..7c0a975da4 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -260,7 +260,7 @@ GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h) * * @param h handle to the datacache * @param key key to store data under - * @param am_closest are we the closest peer? + * @param xor_distance distance of @a key to our PID * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -272,7 +272,7 @@ GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h) int GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, @@ -284,7 +284,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, used = h->api->put (h->api->cls, key, - am_closest, + xor_distance, data_size, data, type, diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index c32edf8e2e..ad5e7834d5 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -31,7 +31,7 @@ #define LOG_STRERROR_FILE(kind,op,fn) GNUNET_log_from_strerror_file (kind, "datacache-heap", op, fn) - +#define NUM_HEAPS 24 /** * Context for all functions in this plugin. @@ -49,14 +49,9 @@ struct Plugin struct GNUNET_CONTAINER_MultiHashMap *map; /** - * Heap for expirations. + * Heaps sorted by distance. */ - struct GNUNET_CONTAINER_Heap *heap; - - /** - * Heap from the plugin for "closest" values. - */ - struct GNUNET_CONTAINER_Heap *cheap; + struct GNUNET_CONTAINER_Heap *heaps[NUM_HEAPS]; }; @@ -97,9 +92,9 @@ struct Value unsigned int path_info_len; /** - * Am I the closest peer? Determines which heap we are in! + * How close is the hash to us? Determines which heap we are in! */ - int am_closest; + uint32_t distance; /** * Type of the block. @@ -127,16 +122,6 @@ struct PutContext */ const char *data; - /** - * Heap from the plugin for "closest" values. - */ - struct GNUNET_CONTAINER_Heap *cheap; - - /** - * Heap from the plugin. - */ - struct GNUNET_CONTAINER_Heap *heap; - /** * Path information. */ @@ -195,8 +180,8 @@ put_cb (void *cls, val->path_info_len, put_ctx->path_info_len); GNUNET_memcpy (val->path_info, - put_ctx->path_info, - put_ctx->path_info_len * sizeof (struct GNUNET_PeerIdentity)); + put_ctx->path_info, + put_ctx->path_info_len * sizeof (struct GNUNET_PeerIdentity)); GNUNET_CONTAINER_heap_update_cost (val->hn, val->discard_time.abs_value_us); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -216,7 +201,7 @@ put_cb (void *cls, * * @param cls closure (our `struct Plugin`) * @param key key to store data under - * @param am_closest are we the closest peer? + * @param xor_distance how close is @a key to our PID? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -228,7 +213,7 @@ put_cb (void *cls, static ssize_t heap_plugin_put (void *cls, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t size, const char *data, enum GNUNET_BLOCK_Type type, @@ -241,8 +226,6 @@ heap_plugin_put (void *cls, struct PutContext put_ctx; put_ctx.found = GNUNET_NO; - put_ctx.heap = plugin->heap; - put_ctx.cheap = plugin->cheap; put_ctx.data = data; put_ctx.size = size; put_ctx.path_info = path_info; @@ -256,12 +239,17 @@ heap_plugin_put (void *cls, if (GNUNET_YES == put_ctx.found) return 0; val = GNUNET_malloc (sizeof (struct Value) + size); - GNUNET_memcpy (&val[1], data, size); + GNUNET_memcpy (&val[1], + data, + size); val->key = *key; val->type = type; val->discard_time = discard_time; val->size = size; - val->am_closest = am_closest; + if (xor_distance >= NUM_HEAPS) + val->distance = NUM_HEAPS - 1; + else + val->distance = xor_distance; GNUNET_array_grow (val->path_info, val->path_info_len, path_info_len); @@ -272,9 +260,7 @@ heap_plugin_put (void *cls, &val->key, val, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); - val->hn = GNUNET_CONTAINER_heap_insert (am_closest - ? plugin->cheap - : plugin->heap, + val->hn = GNUNET_CONTAINER_heap_insert (plugin->heaps[val->distance], val, val->discard_time.abs_value_us); return size + OVERHEAD; @@ -392,9 +378,12 @@ heap_plugin_del (void *cls) struct Plugin *plugin = cls; struct Value *val; - val = GNUNET_CONTAINER_heap_remove_root (plugin->heap); - if (NULL == val) - val = GNUNET_CONTAINER_heap_remove_root (plugin->cheap); + for (unsigned int i=0;iheaps[i]); + if (NULL != val) + break; + } if (NULL == val) return GNUNET_SYSERR; GNUNET_assert (GNUNET_YES == @@ -547,8 +536,8 @@ libgnunet_plugin_datacache_heap_init (void *cls) plugin = GNUNET_new (struct Plugin); plugin->map = GNUNET_CONTAINER_multihashmap_create (1024, /* FIXME: base on quota! */ GNUNET_YES); - plugin->heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); - plugin->cheap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); + for (unsigned int i=0;iheaps[i] = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); plugin->env = env; api = GNUNET_new (struct GNUNET_DATACACHE_PluginFunctions); api->cls = plugin; @@ -576,26 +565,19 @@ libgnunet_plugin_datacache_heap_done (void *cls) struct Plugin *plugin = api->cls; struct Value *val; - while (NULL != (val = GNUNET_CONTAINER_heap_remove_root (plugin->heap))) + for (unsigned int i=0;imap, - &val->key, - val)); - GNUNET_free_non_null (val->path_info); - GNUNET_free (val); - } - while (NULL != (val = GNUNET_CONTAINER_heap_remove_root (plugin->cheap))) - { - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_remove (plugin->map, - &val->key, - val)); - GNUNET_free_non_null (val->path_info); - GNUNET_free (val); + while (NULL != (val = GNUNET_CONTAINER_heap_remove_root (plugin->heaps[i]))) + { + GNUNET_assert (GNUNET_YES == + GNUNET_CONTAINER_multihashmap_remove (plugin->map, + &val->key, + val)); + GNUNET_free_non_null (val->path_info); + GNUNET_free (val); + } + GNUNET_CONTAINER_heap_destroy (plugin->heaps[i]); } - GNUNET_CONTAINER_heap_destroy (plugin->heap); - GNUNET_CONTAINER_heap_destroy (plugin->cheap); GNUNET_CONTAINER_multihashmap_destroy (plugin->map); GNUNET_free (plugin); GNUNET_free (api); diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 455dcab0b3..c4adb34fdb 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -80,6 +80,11 @@ struct Plugin */ sqlite3_stmt *del_select_stmt; + /** + * Prepared statement for #sqlite_plugin_del. + */ + sqlite3_stmt *del_expired_stmt; + /** * Prepared statement for #sqlite_plugin_del. */ @@ -150,7 +155,7 @@ sq_prepare (sqlite3 *dbh, * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under - * @param am_closest are we the closest peer? + * @param xor_distance how close is @a key to our PID? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -162,7 +167,7 @@ sq_prepare (sqlite3 *dbh, static ssize_t sqlite_plugin_put (void *cls, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t size, const char *data, enum GNUNET_BLOCK_Type type, @@ -172,12 +177,11 @@ sqlite_plugin_put (void *cls, { struct Plugin *plugin = cls; uint32_t type32 = type; - uint32_t prox = am_closest; struct GNUNET_SQ_QueryParam params[] = { GNUNET_SQ_query_param_uint32 (&type32), GNUNET_SQ_query_param_absolute_time (&discard_time), GNUNET_SQ_query_param_auto_from_type (key), - GNUNET_SQ_query_param_uint32 (&prox), + GNUNET_SQ_query_param_uint32 (&xor_distance), GNUNET_SQ_query_param_fixed_size (data, size), GNUNET_SQ_query_param_fixed_size (path_info, path_info_len * sizeof (struct GNUNET_PeerIdentity)), @@ -390,8 +394,8 @@ sqlite_plugin_del (void *cls) uint64_t rowid; void *data; size_t dsize; - uint32_t prox; struct GNUNET_HashCode hc; + struct GNUNET_TIME_Absolute now; struct GNUNET_SQ_ResultSpec rs[] = { GNUNET_SQ_result_spec_uint64 (&rowid), GNUNET_SQ_result_spec_auto_from_type (&hc), @@ -403,54 +407,61 @@ sqlite_plugin_del (void *cls) GNUNET_SQ_query_param_uint64 (&rowid), GNUNET_SQ_query_param_end }; - struct GNUNET_SQ_QueryParam prox_params[] = { - GNUNET_SQ_query_param_uint32 (&prox), + struct GNUNET_SQ_QueryParam time_params[] = { + GNUNET_SQ_query_param_absolute_time (&now), GNUNET_SQ_query_param_end }; LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing DEL\n"); - prox = GNUNET_NO; - again: + now = GNUNET_TIME_absolute_get (); if (GNUNET_OK != - GNUNET_SQ_bind (plugin->del_select_stmt, - prox_params)) + GNUNET_SQ_bind (plugin->del_expired_stmt, + time_params)) { LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind"); GNUNET_SQ_reset (plugin->dbh, - plugin->del_stmt); + plugin->del_expired_stmt); return GNUNET_SYSERR; } if (SQLITE_ROW != - sqlite3_step (plugin->del_select_stmt)) + sqlite3_step (plugin->del_expired_stmt)) { LOG_SQLITE (plugin->dbh, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step"); GNUNET_SQ_reset (plugin->dbh, - plugin->del_select_stmt); - if (GNUNET_NO == prox) - { - prox = GNUNET_YES; - goto again; - } + plugin->del_expired_stmt); return GNUNET_SYSERR; } if (GNUNET_OK != - GNUNET_SQ_extract_result (plugin->del_select_stmt, + GNUNET_SQ_extract_result (plugin->del_expired_stmt, rs)) { GNUNET_SQ_reset (plugin->dbh, - plugin->del_select_stmt); - if (GNUNET_NO == prox) + plugin->del_expired_stmt); + + if (SQLITE_ROW != + sqlite3_step (plugin->del_select_stmt)) { - prox = GNUNET_YES; - goto again; + LOG_SQLITE (plugin->dbh, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + "sqlite3_step"); + GNUNET_SQ_reset (plugin->dbh, + plugin->del_select_stmt); + return GNUNET_SYSERR; + } + if (GNUNET_OK != + GNUNET_SQ_extract_result (plugin->del_select_stmt, + rs)) + { + GNUNET_SQ_reset (plugin->dbh, + plugin->del_select_stmt); + GNUNET_break (0); + return GNUNET_SYSERR; } - GNUNET_break (0); - return GNUNET_SYSERR; } GNUNET_SQ_cleanup_result (rs); GNUNET_SQ_reset (plugin->dbh, @@ -741,14 +752,15 @@ libgnunet_plugin_datacache_sqlite_init (void *cls) SQLITE3_EXEC (dbh, "PRAGMA sqlite_temp_store=3"); SQLITE3_EXEC (dbh, - "CREATE TABLE ds091 (" " type INTEGER NOT NULL DEFAULT 0," + "CREATE TABLE ds091 (" + " type INTEGER NOT NULL DEFAULT 0," " expire INTEGER NOT NULL," " key BLOB NOT NULL DEFAULT ''," " prox INTEGER NOT NULL," " value BLOB NOT NULL," " path BLOB DEFAULT '')"); - SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds090 (key,type,expire)"); - SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds090 (prox,expire)"); + SQLITE3_EXEC (dbh, "CREATE INDEX idx_hashidx ON ds091 (key,type,expire)"); + SQLITE3_EXEC (dbh, "CREATE INDEX idx_expire ON ds091 (prox,expire)"); plugin = GNUNET_new (struct Plugin); plugin->env = env; plugin->dbh = dbh; @@ -766,12 +778,19 @@ libgnunet_plugin_datacache_sqlite_init (void *cls) &plugin->get_count_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT value,expire,path FROM ds091 " - "WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET ?", + "SELECT value,expire,path FROM ds091" + " WHERE key=? AND type=? AND expire >= ? LIMIT 1 OFFSET ?", &plugin->get_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, - "SELECT _ROWID_,key,value FROM ds091 WHERE prox=? ORDER BY expire ASC LIMIT 1", + "SELECT _ROWID_,key,value FROM ds091" + " WHERE expire < ?" + " ORDER BY expire ASC LIMIT 1", + &plugin->del_expired_stmt)) || + (SQLITE_OK != + sq_prepare (plugin->dbh, + "SELECT _ROWID_,key,value FROM ds091" + " ORDER BY prox ASC, expire ASC LIMIT 1", &plugin->del_select_stmt)) || (SQLITE_OK != sq_prepare (plugin->dbh, @@ -840,6 +859,7 @@ libgnunet_plugin_datacache_sqlite_done (void *cls) sqlite3_finalize (plugin->get_count_stmt); sqlite3_finalize (plugin->get_stmt); sqlite3_finalize (plugin->del_select_stmt); + sqlite3_finalize (plugin->del_expired_stmt); sqlite3_finalize (plugin->del_stmt); sqlite3_finalize (plugin->get_random_stmt); sqlite3_finalize (plugin->get_closest_stmt); diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index 28bcbcd26a..1064d31254 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -45,7 +45,7 @@ struct Plugin * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under - * @param am_closest are we the closest peer? + * @param xor_distance distance of @a key to our PID * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -57,7 +57,7 @@ struct Plugin static ssize_t template_plugin_put (void *cls, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t size, const char *data, enum GNUNET_BLOCK_Type type, diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 81b7184edb..07a666db61 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -85,8 +85,8 @@ GDS_DATACACHE_handle_put (struct GNUNET_TIME_Absolute expiration, GNUNET_NO); r = GNUNET_DATACACHE_put (datacache, key, - GDS_am_closest_peer (key, - NULL), + GNUNET_CRYPTO_hash_matching_bits (key, + &my_identity_hash), data_size, data, type, diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index b120091af2..94844374de 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -404,7 +404,7 @@ static struct GNUNET_PeerIdentity my_identity; /** * Hash of the identity of this peer. */ -static struct GNUNET_HashCode my_identity_hash; +struct GNUNET_HashCode my_identity_hash; /** * Handle to CORE. diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index bb1867fe9f..bf3ed80a23 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h @@ -31,6 +31,12 @@ #include "gnunet_block_lib.h" #include "gnunet_dht_service.h" +/** + * Hash of the identity of this peer. + */ +extern struct GNUNET_HashCode my_identity_hash; + + /** * Perform a PUT operation. Forwards the given request to other * peers. Does not store the data locally. Does not give the diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 066b02ca91..05ac779d6f 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h @@ -105,7 +105,7 @@ typedef int * * @param h handle to the datacache * @param key key to store data under - * @param am_closest am I the closest peer? + * @param how close is @a key to our pid? * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -117,7 +117,7 @@ typedef int int GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index 9746b6493e..726108c648 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h @@ -109,7 +109,7 @@ struct GNUNET_DATACACHE_PluginFunctions * * @param cls closure (internal context for the plugin) * @param key key to store the value under - * @param am_closest are we the closest peer? + * @param xor_distance how close is @a key to our PID? * @param size number of bytes in @a data * @param data data to store * @param type type of the value @@ -120,7 +120,7 @@ struct GNUNET_DATACACHE_PluginFunctions */ ssize_t (*put) (void *cls, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t xor_distance, size_t size, const char *data, enum GNUNET_BLOCK_Type type, -- cgit v1.2.3-18-g5258 From 54031a5360d3ea2d7bb99304bfc5abc36807d33a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 16:30:40 +0200 Subject: fix logic --- src/datacache/plugin_datacache_sqlite.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index c4adb34fdb..ef24199caa 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -426,23 +426,14 @@ sqlite_plugin_del (void *cls) plugin->del_expired_stmt); return GNUNET_SYSERR; } - if (SQLITE_ROW != - sqlite3_step (plugin->del_expired_stmt)) - { - LOG_SQLITE (plugin->dbh, - GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, - "sqlite3_step"); - GNUNET_SQ_reset (plugin->dbh, - plugin->del_expired_stmt); - return GNUNET_SYSERR; - } - if (GNUNET_OK != - GNUNET_SQ_extract_result (plugin->del_expired_stmt, - rs)) + if ( (SQLITE_ROW != + sqlite3_step (plugin->del_expired_stmt)) || + (GNUNET_OK != + GNUNET_SQ_extract_result (plugin->del_expired_stmt, + rs)) ) { GNUNET_SQ_reset (plugin->dbh, plugin->del_expired_stmt); - if (SQLITE_ROW != sqlite3_step (plugin->del_select_stmt)) { -- cgit v1.2.3-18-g5258 From 9b9c6dc3c055b2cda01496b22c8c41116b7ffc04 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 16:44:07 +0200 Subject: more core KX logging --- src/core/gnunet-service-core_kx.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 0d01977bd3..cf2207e8bc 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -448,7 +448,14 @@ derive_auth_key (struct GNUNET_CRYPTO_AuthKey *akey, { static const char ctx[] = "authentication key"; - GNUNET_CRYPTO_hmac_derive_key (akey, skey, + struct GNUNET_HashCode sh; + GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deriving Auth key from SKEY %s and seed %u\n", + GNUNET_h2s (&sh), + (unsigned int) seed); + GNUNET_CRYPTO_hmac_derive_key (akey, + skey, &seed, sizeof (seed), skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), ctx, sizeof (ctx), @@ -472,7 +479,15 @@ derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, { static const char ctx[] = "initialization vector"; - GNUNET_CRYPTO_symmetric_derive_iv (iv, skey, + struct GNUNET_HashCode sh; + GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deriving IV from SKEY %s and seed %u for peer %s\n", + GNUNET_h2s (&sh), + (unsigned int) seed, + GNUNET_i2s (identity)); + GNUNET_CRYPTO_symmetric_derive_iv (iv, + skey, &seed, sizeof (seed), identity, sizeof (struct GNUNET_PeerIdentity), ctx, @@ -498,7 +513,16 @@ derive_pong_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, { static const char ctx[] = "pong initialization vector"; - GNUNET_CRYPTO_symmetric_derive_iv (iv, skey, + struct GNUNET_HashCode sh; + GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deriving PONG IV from SKEY %s and seed %u/%u for %s\n", + GNUNET_h2s (&sh), + (unsigned int) seed, + (unsigned int) challenge, + GNUNET_i2s (identity)); + GNUNET_CRYPTO_symmetric_derive_iv (iv, + skey, &seed, sizeof (seed), identity, sizeof (struct GNUNET_PeerIdentity), @@ -524,6 +548,13 @@ derive_aes_key (const struct GNUNET_PeerIdentity *sender, { static const char ctx[] = "aes key generation vector"; + struct GNUNET_HashCode sh; + GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deriving AES Keys for %s to %s from %s\n", + GNUNET_i2s (sender), + GNUNET_i2s2 (receiver), + GNUNET_h2s (key_material)); GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), ctx, sizeof (ctx), key_material, sizeof (struct GNUNET_HashCode), -- cgit v1.2.3-18-g5258 From 2a789993747f7c74b331e38e4562772270bde3c0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 17:06:49 +0200 Subject: more crypto KX logging --- src/core/gnunet-service-core_kx.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index cf2207e8bc..2250f59e6e 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -991,9 +991,18 @@ handle_ephemeral_key (void *cls, GNUNET_break_op (0); return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core service receives EPHEMERAL_KEY request from `%s'.\n", - GNUNET_i2s (kx->peer)); + { + struct GNUNET_HashCode eh; + + GNUNET_CRYPTO_hash (¤t_ekm.ephemeral_key, + sizeof (current_ekm.ephemeral_key), + &eh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Core service receives EPHEMERAL_KEY `%s' from `%s'.\n", + GNUNET_h2s (&eh), + GNUNET_i2s (kx->peer)); + } + if ((ntohl (m->purpose.size) != sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + sizeof (struct GNUNET_TIME_AbsoluteNBO) + @@ -1819,11 +1828,19 @@ do_rekey (void *cls) NULL); if (NULL != my_ephemeral_key) GNUNET_free (my_ephemeral_key); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Rekeying\n"); my_ephemeral_key = GNUNET_CRYPTO_ecdhe_key_create (); GNUNET_assert (NULL != my_ephemeral_key); sign_ephemeral_key (); + { + struct GNUNET_HashCode eh; + + GNUNET_CRYPTO_hash (¤t_ekm.ephemeral_key, + sizeof (current_ekm.ephemeral_key), + &eh); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Rekeying to %s\n", + GNUNET_h2s (&eh)); + } for (pos = kx_head; NULL != pos; pos = pos->next) { if (GNUNET_CORE_KX_STATE_UP == pos->status) @@ -1884,6 +1901,17 @@ GSC_KX_init (struct GNUNET_CRYPTO_EddsaPrivateKey *pk) return GNUNET_SYSERR; } sign_ephemeral_key (); + { + struct GNUNET_HashCode eh; + + GNUNET_CRYPTO_hash (¤t_ekm.ephemeral_key, + sizeof (current_ekm.ephemeral_key), + &eh); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Starting with ephemeral key %s\n", + GNUNET_h2s (&eh)); + } + nc = GNUNET_notification_context_create (1); rekey_task = GNUNET_SCHEDULER_add_delayed (REKEY_FREQUENCY, &do_rekey, -- cgit v1.2.3-18-g5258 From fdf5283f5d5d603217748232941bafb60728aeb2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jun 2018 20:21:08 +0200 Subject: more logging --- src/core/gnunet-service-core_kx.c | 88 ++++++++++++++++++++++++++------------- src/include/gnunet_core_service.h | 2 +- 2 files changed, 61 insertions(+), 29 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 2250f59e6e..c29e469971 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -970,15 +970,26 @@ handle_ephemeral_key (void *cls, { GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# old ephemeral keys ignored"), - 1, GNUNET_NO); + 1, + GNUNET_NO); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Received expired EPHEMERAL_KEY from %s\n", + GNUNET_i2s (&m->origin_identity)); + return; + } + if (0 == memcmp (&m->ephemeral_key, + &kx->other_ephemeral_key, + sizeof (m->ephemeral_key))) + { + GNUNET_STATISTICS_update (GSC_stats, + gettext_noop ("# duplicate ephemeral keys ignored"), + 1, + GNUNET_NO); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Ignoring duplicate EPHEMERAL_KEY from %s\n", + GNUNET_i2s (&m->origin_identity)); return; } - start_t = GNUNET_TIME_absolute_ntoh (m->creation_time); - - GNUNET_STATISTICS_update (GSC_stats, - gettext_noop ("# ephemeral keys received"), - 1, GNUNET_NO); - if (0 != memcmp (&m->origin_identity, kx->peer, @@ -991,18 +1002,6 @@ handle_ephemeral_key (void *cls, GNUNET_break_op (0); return; } - { - struct GNUNET_HashCode eh; - - GNUNET_CRYPTO_hash (¤t_ekm.ephemeral_key, - sizeof (current_ekm.ephemeral_key), - &eh); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core service receives EPHEMERAL_KEY `%s' from `%s'.\n", - GNUNET_h2s (&eh), - GNUNET_i2s (kx->peer)); - } - if ((ntohl (m->purpose.size) != sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + sizeof (struct GNUNET_TIME_AbsoluteNBO) + @@ -1017,26 +1016,51 @@ handle_ephemeral_key (void *cls, { /* invalid signature */ GNUNET_break_op (0); + GNUNET_STATISTICS_update (GSC_stats, + gettext_noop ("# EPHEMERAL_KEYs rejected (bad signature)"), + 1, + GNUNET_NO); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Received EPHEMERAL_KEY from %s with bad signature\n", + GNUNET_i2s (&m->origin_identity)); return; } now = GNUNET_TIME_absolute_get (); + start_t = GNUNET_TIME_absolute_ntoh (m->creation_time); if ( (end_t.abs_value_us < GNUNET_TIME_absolute_subtract (now, REKEY_TOLERANCE).abs_value_us) || (start_t.abs_value_us > GNUNET_TIME_absolute_add (now, REKEY_TOLERANCE).abs_value_us) ) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Ephemeral key message from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), + _("EPHERMAL_KEY from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), GNUNET_i2s (kx->peer), (unsigned long long) now.abs_value_us, (unsigned long long) start_t.abs_value_us, (unsigned long long) end_t.abs_value_us); + GNUNET_STATISTICS_update (GSC_stats, + gettext_noop ("# EPHEMERAL_KEY messages rejected due to time"), + 1, + GNUNET_NO); return; } + { + struct GNUNET_HashCode eh; + + GNUNET_CRYPTO_hash (&m->ephemeral_key, + sizeof (m->ephemeral_key), + &eh); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received valid EPHEMERAL_KEY `%s' from `%s' in state %d.\n", + GNUNET_h2s (&eh), + GNUNET_i2s (kx->peer), + kx->status); + } + GNUNET_STATISTICS_update (GSC_stats, + gettext_noop ("# valid ephemeral keys received"), + 1, + GNUNET_NO); kx->other_ephemeral_key = m->ephemeral_key; kx->foreign_key_expires = end_t; derive_session_keys (kx); - GNUNET_STATISTICS_update (GSC_stats, - gettext_noop ("# EPHEMERAL_KEY messages received"), 1, - GNUNET_NO); /* check if we still need to send the sender our key */ sender_status = (enum GNUNET_CORE_KxState) ntohl (m->sender_status); @@ -1369,7 +1393,7 @@ handle_pong (void *cls, return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received PONG from `%s'\n", + "Received valid PONG from `%s'\n", GNUNET_i2s (kx->peer)); /* no need to resend key any longer */ if (NULL != kx->retry_set_key_task) @@ -1436,10 +1460,18 @@ send_key (struct GSC_KeyExchangeInfo *kx) kx->retry_set_key_task = NULL; } /* always update sender status in SET KEY message */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending key to `%s' (my status: %d)\n", - GNUNET_i2s (kx->peer), - kx->status); + { + struct GNUNET_HashCode hc; + + GNUNET_CRYPTO_hash (¤t_ekm.ephemeral_key, + sizeof (current_ekm.ephemeral_key), + &hc); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Sending EPHERMERAL_KEY %s to `%s' (my status: %d)\n", + GNUNET_h2s (&hc), + GNUNET_i2s (kx->peer), + kx->status); + } current_ekm.sender_status = htonl ((int32_t) (kx->status)); env = GNUNET_MQ_msg_copy (¤t_ekm.header); GNUNET_MQ_send (kx->mq, diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index ace223c112..77af465ce3 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h @@ -220,7 +220,7 @@ enum GNUNET_CORE_KxState /** * No handshake yet. */ - GNUNET_CORE_KX_STATE_DOWN, + GNUNET_CORE_KX_STATE_DOWN = 0, /** * We've sent our session key. -- cgit v1.2.3-18-g5258 From 41cbe10b783a0741c75566232886f262cd779fbb Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 19:00:10 +0200 Subject: add function for getopt uint16_t arguments --- src/gns/gnunet-bcd.c | 22 +-- src/gns/gnunet-gns-proxy.c | 16 +-- src/include/gnunet_getopt_lib.h | 17 +++ src/transport/Makefile.am | 7 +- src/transport/plugin_transport_xu.h | 273 ++++++++++++++++++++++++++++++++++++ src/util/getopt_helpers.c | 76 ++++++++++ 6 files changed, 391 insertions(+), 20 deletions(-) create mode 100644 src/transport/plugin_transport_xu.h diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index 0746d5c579..d7fd1a8120 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c @@ -76,7 +76,7 @@ static char *resfile; /** * Port number. */ -static unsigned int port = 8888; +static uint16_t port = 8888; struct Entry @@ -351,7 +351,7 @@ prepare_daemon (struct MHD_Daemon *daemon_handle) static int server_start () { - if ((0 == port) || (port > UINT16_MAX)) + if (0 == port) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid port number %u. Exiting.\n"), @@ -362,7 +362,7 @@ server_start () _("Businesscard HTTP server starts on %u\n"), port); daemon_handle = MHD_start_daemon (MHD_USE_DUAL_STACK | MHD_USE_DEBUG, - (uint16_t) port, + port, NULL /* accept_policy_callback */, NULL, &access_handler_callback, NULL, MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 512, @@ -374,7 +374,7 @@ server_start () { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not start businesscard HTTP server on port %u\n"), - (unsigned short) port); + (unsigned int) port); return GNUNET_SYSERR; } http_task = prepare_daemon (daemon_handle); @@ -516,17 +516,17 @@ main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_uint ('p', - "port", - "PORT", - gettext_noop ("Run HTTP serve on port PORT (default is 8888)"), - &port), - + GNUNET_GETOPT_option_uint16 ('p', + "port", + "PORT", + gettext_noop ("Run HTTP serve on port PORT (default is 8888)"), + &port), GNUNET_GETOPT_OPTION_END }; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + if (GNUNET_OK != + GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; GNUNET_log_setup ("gnunet-bcd", "WARNING", NULL); ret = diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 02ebcf0f19..0d7d83b4b5 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -636,7 +636,7 @@ struct Socks5Request /** * The port the proxy is running on (default 7777) */ -static unsigned long long port = GNUNET_GNS_PROXY_PORT; +static uint16_t port = GNUNET_GNS_PROXY_PORT; /** * The CA file (pem) to use for the proxy CA @@ -3399,8 +3399,8 @@ run (void *cls, return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Proxy listens on port %llu\n", - port); + "Proxy listens on port %u\n", + (unsigned int) port); /* start MHD daemon for HTTP */ hd = GNUNET_new (struct MhdHttpList); @@ -3437,11 +3437,11 @@ int main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_ulong ('p', - "port", - NULL, - gettext_noop ("listen on specified port (default: 7777)"), - &port), + GNUNET_GETOPT_option_uint16 ('p', + "port", + NULL, + gettext_noop ("listen on specified port (default: 7777)"), + &port), GNUNET_GETOPT_option_string ('a', "authority", NULL, diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h index e38925f147..88c7825d07 100644 --- a/src/include/gnunet_getopt_lib.h +++ b/src/include/gnunet_getopt_lib.h @@ -286,6 +286,23 @@ GNUNET_GETOPT_option_uint (char shortName, unsigned int *val); +/** + * Allow user to specify an uint16_t. + * + * @param shortName short name of the option + * @param name long name of the option + * @param argumentHelp help text for the option argument + * @param description long help text for the option + * @param[out] val set to the value specified at the command line + */ +struct GNUNET_GETOPT_CommandLineOption +GNUNET_GETOPT_option_uint16 (char shortName, + const char *name, + const char *argumentHelp, + const char *description, + uint16_t *val); + + /** * Allow user to specify an `unsigned long long`. * diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 286f03c4df..8697d0941c 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -280,7 +280,6 @@ gnunet_service_transport_CFLAGS = \ plugin_LTLIBRARIES = \ libgnunet_plugin_transport_tcp.la \ - libgnunet_plugin_transport_xt.la \ libgnunet_plugin_transport_udp.la \ $(UNIX_PLUGIN_LA) \ $(HTTP_CLIENT_PLUGIN_LA) \ @@ -290,6 +289,12 @@ plugin_LTLIBRARIES = \ $(WLAN_PLUGIN_LA) \ $(BT_PLUGIN_LA) +if HAVE_EXPERIMENTAL +plugin_LTLIBRARIES += \ + libgnunet_plugin_transport_xt.la \ + libgnunet_plugin_transport_xu.la +endif + # Note: real plugins of course need to be added # to the plugin_LTLIBRARIES above noinst_LTLIBRARIES = \ diff --git a/src/transport/plugin_transport_xu.h b/src/transport/plugin_transport_xu.h new file mode 100644 index 0000000000..1884f92e8e --- /dev/null +++ b/src/transport/plugin_transport_xu.h @@ -0,0 +1,273 @@ +/* + This file is part of GNUnet + Copyright (C) 2010-2014 GNUnet e.V. + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +/** + * @file transport/plugin_transport_xu.h + * @brief Implementation of the XU transport protocol + * @author Christian Grothoff + * @author Nathan Evans + * @author Matthias Wachs + */ +#ifndef PLUGIN_TRANSPORT_XU_H +#define PLUGIN_TRANSPORT_XU_H + +#include "platform.h" +#include "gnunet_hello_lib.h" +#include "gnunet_util_lib.h" +#include "gnunet_fragmentation_lib.h" +#include "gnunet_protocols.h" +#include "gnunet_resolver_service.h" +#include "gnunet_signatures.h" +#include "gnunet_constants.h" +#include "gnunet_statistics_service.h" +#include "gnunet_transport_service.h" +#include "gnunet_transport_plugin.h" +#include "transport.h" + +#define LOG(kind,...) GNUNET_log_from (kind, "transport-xu", __VA_ARGS__) + +#define PLUGIN_NAME "xu" + +#define DEBUG_XU GNUNET_NO + +#define DEBUG_XU_BROADCASTING GNUNET_NO + +/** + * MTU for fragmentation subsystem. Should be conservative since + * all communicating peers MUST work with this MTU. + */ +#define XU_MTU 1400 + + +GNUNET_NETWORK_STRUCT_BEGIN +/** + * Network format for IPv4 addresses. + */ +struct IPv4XuAddress +{ + /** + * Optional options and flags for this address + */ + uint32_t options GNUNET_PACKED; + + /** + * IPv4 address, in network byte order. + */ + uint32_t ipv4_addr GNUNET_PACKED; + + /** + * Port number, in network byte order. + */ + uint16_t u4_port GNUNET_PACKED; +}; + + +/** + * Network format for IPv6 addresses. + */ +struct IPv6XuAddress +{ + /** + * Optional options and flags for this address + */ + uint32_t options GNUNET_PACKED; + + /** + * IPv6 address. + */ + struct in6_addr ipv6_addr GNUNET_PACKED; + + /** + * Port number, in network byte order. + */ + uint16_t u6_port GNUNET_PACKED; +}; +GNUNET_NETWORK_STRUCT_END + +/** + * Either an IPv4 or IPv6 XU address. Note that without a "length", + * one cannot tell which one of the two types this address represents. + */ +union XuAddress +{ + /** + * IPv4 case. + */ + struct IPv4XuAddress v4; + + /** + * IPv6 case. + */ + struct IPv6XuAddress v6; +}; + + +/** + * Information we track for each message in the queue. + */ +struct XU_MessageWrapper; + + +/** + * Closure for #append_port(). + */ +struct PrettyPrinterContext; + + +/** + * Encapsulation of all of the state of the plugin. + */ +struct Plugin +{ + + /** + * Our environment. + */ + struct GNUNET_TRANSPORT_PluginEnvironment *env; + + /** + * Session of peers with whom we are currently connected, + * map of peer identity to `struct GNUNET_ATS_Session *`. + */ + struct GNUNET_CONTAINER_MultiPeerMap *sessions; + + /** + * ID of select task for IPv4 + */ + struct GNUNET_SCHEDULER_Task *select_task_v4; + + /** + * ID of select task for IPv6 + */ + struct GNUNET_SCHEDULER_Task *select_task_v6; + + /** + * Address we were told to bind to exclusively (IPv4). + */ + char *bind4_address; + + /** + * Address we were told to bind to exclusively (IPv6). + */ + char *bind6_address; + + /** + * Handle to NAT traversal support. + */ + struct GNUNET_NAT_Handle *nat; + + /** + * Handle to NAT traversal support. + */ + struct GNUNET_NAT_STUN_Handle *stun; + + /** + * The read socket for IPv4 + */ + struct GNUNET_NETWORK_Handle *sockv4; + + /** + * The read socket for IPv6 + */ + struct GNUNET_NETWORK_Handle *sockv6; + + /** + * Running pretty printers: head + */ + struct PrettyPrinterContext *ppc_dll_head; + + /** + * Running pretty printers: tail + */ + struct PrettyPrinterContext *ppc_dll_tail; + + /** + * Function to call about session status changes. + */ + GNUNET_TRANSPORT_SessionInfoCallback sic; + + /** + * Closure for @e sic. + */ + void *sic_cls; + + /** + * IPv6 multicast address + */ + struct sockaddr_in6 ipv6_multicast_address; + + /** + * Broadcast interval + */ + struct GNUNET_TIME_Relative broadcast_interval; + + /** + * Bytes currently in buffer + */ + int64_t bytes_in_buffer; + + /** + * Address options + */ + uint32_t myoptions; + + /** + * Is IPv6 enabled: #GNUNET_YES or #GNUNET_NO + */ + int enable_ipv6; + + /** + * Is IPv4 enabled: #GNUNET_YES or #GNUNET_NO + */ + int enable_ipv4; + + /** + * Port we listen on. + */ + uint16_t port; + + /** + * Port we advertise on. + */ + uint16_t aport; + +}; + + +/** + * Function called for a quick conversion of the binary address to + * a numeric address. Note that the caller must not free the + * address and that the next call to this function is allowed + * to override the address again. + * + * @param cls closure + * @param addr binary address (a `union XuAddress`) + * @param addrlen length of the @a addr + * @return string representing the same address + */ +const char * +xu_address_to_string (void *cls, + const void *addr, + size_t addrlen); + + +/*#ifndef PLUGIN_TRANSPORT_XU_H*/ +#endif +/* end of plugin_transport_xu.h */ diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index c836c90550..f9341f528c 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -793,6 +793,82 @@ GNUNET_GETOPT_option_uint (char shortName, } + +/** + * Set an option of type 'uint16_t' from the command line. + * A pointer to this function should be passed as part of the + * 'struct GNUNET_GETOPT_CommandLineOption' array to initialize options + * of this type. It should be followed by a pointer to a value of + * type 'uint16_t'. + * + * @param ctx command line processing context + * @param scls additional closure (will point to the 'unsigned int') + * @param option name of the option + * @param value actual value of the option as a string. + * @return #GNUNET_OK if parsing the value worked + */ +static int +set_uint16 (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, + void *scls, + const char *option, + const char *value) +{ + uint16_t *val = scls; + unsigned int v; + + (void) ctx; + if (1 != SSCANF (value, + "%u", + v)) + { + FPRINTF (stderr, + _("You must pass a number to the `%s' option.\n"), + option); + return GNUNET_SYSERR; + } + if (v > UINT16_MAX) + { + FPRINTF (stderr, + _("You must pass a number below %u to the `%s' option.\n"), + (unsigned int) UINT16_MAX, + option); + return GNUNET_SYSERR; + } + *val = (uint16_t) v; + return GNUNET_OK; +} + + +/** + * Allow user to specify an uint16_t. + * + * @param shortName short name of the option + * @param name long name of the option + * @param argumentHelp help text for the option argument + * @param description long help text for the option + * @param[out] val set to the value specified at the command line + */ +struct GNUNET_GETOPT_CommandLineOption +GNUNET_GETOPT_option_uint16 (char shortName, + const char *name, + const char *argumentHelp, + const char *description, + uint16_t *val) +{ + struct GNUNET_GETOPT_CommandLineOption clo = { + .shortName = shortName, + .name = name, + .argumentHelp = argumentHelp, + .description = description, + .require_argument = 1, + .processor = &set_uint16, + .scls = (void *) val + }; + + return clo; +} + + /** * Closure for #set_base32(). */ -- cgit v1.2.3-18-g5258 From d7aa2a805cea33cb1b37c2bb65be1fd4cf367d21 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 19:24:00 +0200 Subject: use DEBUG_KX for new core log messages --- src/core/gnunet-service-core_kx.c | 53 +++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index c29e469971..21f1308f78 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -34,6 +34,10 @@ #include "gnunet_protocols.h" #include "core.h" +/** + * Enable expensive (and possibly problematic for privacy!) logging of KX. + */ +#define DEBUG_KX 0 /** * How long do we wait for SET_KEY confirmation initially? @@ -447,13 +451,17 @@ derive_auth_key (struct GNUNET_CRYPTO_AuthKey *akey, uint32_t seed) { static const char ctx[] = "authentication key"; - +#if DEBUG_KX struct GNUNET_HashCode sh; - GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + + GNUNET_CRYPTO_hash (skey, + sizeof (*skey), + &sh); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deriving Auth key from SKEY %s and seed %u\n", GNUNET_h2s (&sh), (unsigned int) seed); +#endif GNUNET_CRYPTO_hmac_derive_key (akey, skey, &seed, sizeof (seed), @@ -478,14 +486,18 @@ derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, const struct GNUNET_PeerIdentity *identity) { static const char ctx[] = "initialization vector"; - +#if DEBUG_KX struct GNUNET_HashCode sh; - GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + + GNUNET_CRYPTO_hash (skey, + sizeof (*skey), + &sh); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deriving IV from SKEY %s and seed %u for peer %s\n", GNUNET_h2s (&sh), (unsigned int) seed, GNUNET_i2s (identity)); +#endif GNUNET_CRYPTO_symmetric_derive_iv (iv, skey, &seed, sizeof (seed), @@ -512,15 +524,19 @@ derive_pong_iv (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, const struct GNUNET_PeerIdentity *identity) { static const char ctx[] = "pong initialization vector"; - +#if DEBUG_KX struct GNUNET_HashCode sh; - GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + + GNUNET_CRYPTO_hash (skey, + sizeof (*skey), + &sh); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deriving PONG IV from SKEY %s and seed %u/%u for %s\n", GNUNET_h2s (&sh), (unsigned int) seed, (unsigned int) challenge, GNUNET_i2s (identity)); +#endif GNUNET_CRYPTO_symmetric_derive_iv (iv, skey, &seed, sizeof (seed), @@ -547,14 +563,18 @@ derive_aes_key (const struct GNUNET_PeerIdentity *sender, struct GNUNET_CRYPTO_SymmetricSessionKey *skey) { static const char ctx[] = "aes key generation vector"; - +#if DEBUG_KX struct GNUNET_HashCode sh; - GNUNET_CRYPTO_hash (skey, sizeof (*skey), &sh); + + GNUNET_CRYPTO_hash (skey, + sizeof (*skey), + &sh); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deriving AES Keys for %s to %s from %s\n", GNUNET_i2s (sender), GNUNET_i2s2 (receiver), GNUNET_h2s (key_material)); +#endif GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), ctx, sizeof (ctx), key_material, sizeof (struct GNUNET_HashCode), @@ -599,7 +619,7 @@ do_encrypt (struct GSC_KeyExchangeInfo *kx, GNUNET_NO); /* the following is too sensitive to write to log files by accident, so we require manual intervention to get this one... */ -#if 0 +#if DEBUG_KX GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted %u bytes for `%s' using key %u, IV %u\n", (unsigned int) size, @@ -659,7 +679,7 @@ do_decrypt (struct GSC_KeyExchangeInfo *kx, GNUNET_NO); /* the following is too sensitive to write to log files by accident, so we require manual intervention to get this one... */ -#if 0 +#if DEBUG_KX GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Decrypted %u bytes from `%s' using key %u, IV %u\n", (unsigned int) size, @@ -1042,6 +1062,7 @@ handle_ephemeral_key (void *cls, GNUNET_NO); return; } +#if DEBUG_KX { struct GNUNET_HashCode eh; @@ -1054,6 +1075,7 @@ handle_ephemeral_key (void *cls, GNUNET_i2s (kx->peer), kx->status); } +#endif GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# valid ephemeral keys received"), 1, @@ -1460,6 +1482,7 @@ send_key (struct GSC_KeyExchangeInfo *kx) kx->retry_set_key_task = NULL; } /* always update sender status in SET KEY message */ +#if DEBUG_KX { struct GNUNET_HashCode hc; @@ -1472,6 +1495,7 @@ send_key (struct GSC_KeyExchangeInfo *kx) GNUNET_i2s (kx->peer), kx->status); } +#endif current_ekm.sender_status = htonl ((int32_t) (kx->status)); env = GNUNET_MQ_msg_copy (¤t_ekm.header); GNUNET_MQ_send (kx->mq, @@ -1527,6 +1551,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, &ph->sequence_number, &em->sequence_number, used - ENCRYPTED_HEADER_SIZE)); +#if DEBUG_KX { struct GNUNET_HashCode hc; @@ -1539,6 +1564,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, (unsigned int) (used - ENCRYPTED_HEADER_SIZE), GNUNET_i2s (kx->peer)); } +#endif derive_auth_key (&auth_key, &kx->encrypt_key, ph->iv_seed); @@ -1546,6 +1572,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, &em->sequence_number, used - ENCRYPTED_HEADER_SIZE, &em->hmac); +#if DEBUG_KX { struct GNUNET_HashCode hc; @@ -1558,6 +1585,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, GNUNET_h2s (&hc), GNUNET_h2s2 (&em->hmac)); } +#endif kx->has_excess_bandwidth = GNUNET_NO; GNUNET_MQ_send (kx->mq, env); @@ -1637,6 +1665,7 @@ handle_encrypted (void *cls, } /* validate hash */ +#if DEBUG_KX { struct GNUNET_HashCode hc; @@ -1649,7 +1678,7 @@ handle_encrypted (void *cls, (unsigned int) (size - ENCRYPTED_HEADER_SIZE), GNUNET_i2s (kx->peer)); } - +#endif derive_auth_key (&auth_key, &kx->decrypt_key, m->iv_seed); @@ -1657,6 +1686,7 @@ handle_encrypted (void *cls, &m->sequence_number, size - ENCRYPTED_HEADER_SIZE, &ph); +#if DEBUG_KX { struct GNUNET_HashCode hc; @@ -1669,6 +1699,7 @@ handle_encrypted (void *cls, GNUNET_h2s (&hc), GNUNET_h2s2 (&m->hmac)); } +#endif if (0 != memcmp (&ph, &m->hmac, sizeof (struct GNUNET_HashCode))) -- cgit v1.2.3-18-g5258 From 9b6534a8e8281ad4113df174f260c44a1af79267 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 23:27:52 +0200 Subject: fix typo in Makefile.am --- po/de.po | 2720 +++++++++++++++++++++++-------------------- po/es.po | 2789 +++++++++++++++++++++++--------------------- po/fr.po | 2649 ++++++++++++++++++++++-------------------- po/sv.po | 2821 +++++++++++++++++++++++--------------------- po/vi.po | 2839 ++++++++++++++++++++++++--------------------- po/zh_CN.po | 2655 ++++++++++++++++++++++-------------------- src/transport/Makefile.am | 10 +- 7 files changed, 8712 insertions(+), 7771 deletions(-) diff --git a/po/de.po b/po/de.po index 83c07c935b..05e56b0d4a 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2015-03-08 16:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -235,7 +235,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -244,14 +244,14 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format msgid "Using `%s' instead\n" @@ -353,131 +353,14 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -msgid "print logging" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Konfiguration konnte nicht aus %s geladen werden\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "Protokollierung stoppen\n" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats-tests/ats-testing-log.c:892 #, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr " gconfig\tGTK Konfiguration\n" +msgid "Start logging `%s'\n" +msgstr "Collection `%s' begonnen.\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -489,15 +372,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "Protokollierung stoppen\n" - -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Collection `%s' begonnen.\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -505,6 +379,15 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +msgid "solver to use" +msgstr "" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -622,6 +505,123 @@ msgstr "" msgid "Print information about ATS state" msgstr "Informationen über andere GNUnet Knoten ausgeben." +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +msgid "print logging" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Konfiguration konnte nicht aus %s geladen werden\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr " gconfig\tGTK Konfiguration\n" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -762,292 +762,292 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, fuzzy, c-format msgid "Call from `%s' terminated\n" msgstr "Aufruf von `%s' gibt %d zurück.\n" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 msgid "Failed to setup phone (internal error)\n" msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, c-format msgid "Failed to resolve `%s'\n" msgstr "»%s« konnte nicht aufgelöst werden\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, fuzzy, c-format msgid "Call to `%s' terminated\n" msgstr "Aufruf von `%s' gibt %d zurück.\n" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, c-format msgid "Unknown command `%s'\n" msgstr "Unbekannter Befehl »%s«\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, fuzzy, c-format msgid "Ego `%s' not available\n" msgstr "`%s' ist nicht verfügbar." -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "Anzurufender Teilnehmer fehlt.\n" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "Es gibt keinen eingehenden Anruf, der angenommen werden könnte!\n" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" "Es gibt keinen eingehenden Anruf »%s«, der jetzt angenommen werden könnte!\n" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "Derzeit keine Adresse vorhanden.\n" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "Anruf wartet:\n" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, c-format msgid "#%u: `%s'\n" msgstr "#%u: »%s«\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, c-format msgid "Name of our ego changed to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Pseudonym `%s' wurde gelöscht.\n" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" -msgstr "" - -#: src/conversation/gnunet-conversation.c:1279 -msgid "sets the LINE to use for the phone" -msgstr "" - -#: src/conversation/gnunet-conversation.c:1306 -msgid "Enables having a conversation with other GNUnet users." +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" - -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." + +#: src/conversation/gnunet-conversation.c:1300 +msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." +#: src/conversation/gnunet-conversation.c:1329 +msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "Fehler beim Lesen aus STDIN: %d %s\n" @@ -1288,143 +1288,153 @@ msgstr "" msgid "Core service of `%s' ready.\n" msgstr "Dienst »%s« wird neu gestartet.\n" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "# Bytes verschlüsselt" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "# Bytes entschlüsselt" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 #, fuzzy msgid "# PING messages transmitted" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 +#: src/core/gnunet-service-core_kx.c:1005 +#, fuzzy +msgid "# duplicate ephemeral keys ignored" +msgstr "# verschlüsselter PONG Nachrichten empfangen" + +#: src/core/gnunet-service-core_kx.c:1040 #, fuzzy -msgid "# ephemeral keys received" +msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 +#: src/core/gnunet-service-core_kx.c:1060 +#, fuzzy +msgid "# EPHEMERAL_KEY messages rejected due to time" +msgstr "# verschlüsselter PONG Nachrichten empfangen" + +#: src/core/gnunet-service-core_kx.c:1080 #, fuzzy -msgid "# EPHEMERAL_KEY messages received" +msgid "# valid ephemeral keys received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 #, fuzzy msgid "# PING messages received" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 #, fuzzy msgid "# PONG messages created" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 #, fuzzy msgid "# keepalive messages sent" msgstr "# Klartext PING Nachrichten gesendet" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 #, fuzzy msgid "# PONG messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 #, fuzzy msgid "# PONG messages decrypted" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# Knotenankündigungen empfangen" -#: src/core/gnunet-service-core_kx.c:1360 +#: src/core/gnunet-service-core_kx.c:1447 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# Bytes empfangen über TCP" -#: src/core/gnunet-service-core_kx.c:1367 +#: src/core/gnunet-service-core_kx.c:1454 #, fuzzy msgid "# rekey operations confirmed via PONG" msgstr "# Knotenankündigungen empfangen" -#: src/core/gnunet-service-core_kx.c:1521 +#: src/core/gnunet-service-core_kx.c:1642 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1529 +#: src/core/gnunet-service-core_kx.c:1650 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 +#: src/core/gnunet-service-core_kx.c:1653 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 #, fuzzy msgid "# bytes dropped (duplicates)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1606 +#: src/core/gnunet-service-core_kx.c:1755 #, fuzzy msgid "# bytes dropped (out of sequence)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1648 +#: src/core/gnunet-service-core_kx.c:1797 #, fuzzy msgid "# bytes dropped (ancient message)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1656 +#: src/core/gnunet-service-core_kx.c:1805 #, fuzzy msgid "# bytes of payload decrypted" msgstr "# Bytes entschlüsselt" @@ -1433,11 +1443,11 @@ msgstr "# Bytes entschlüsselt" #: src/core/gnunet-service-core_sessions.c:350 #: src/dht/gnunet-service-dht_neighbours.c:733 #: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 msgid "# peers connected" msgstr "# verbundener Knoten" @@ -1466,54 +1476,185 @@ msgstr "# Bytes empfangen über TCP" msgid "# updates to my type map" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/credential/credential_misc.c:88 +#, fuzzy, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, fuzzy, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "`%s': unbekannter Dienst: %s\n" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, fuzzy, c-format +msgid "Issuer public key not well-formed\n" +msgstr "Ungültiger Parameter: `%s'\n" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, fuzzy, c-format +msgid "ego required\n" +msgstr "Gültiger Typ ist erforderlich\n" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, fuzzy, c-format +msgid "Issuer ego required\n" +msgstr "Gültiger Typ ist erforderlich\n" + +#: src/credential/gnunet-credential.c:516 +#, c-format +msgid "Please specify name to lookup, subject key and issuer key!\n" +msgstr "" + +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" + +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" + +#: src/credential/gnunet-credential.c:545 +#, fuzzy +msgid "The public key of the subject to lookup the credential for" +msgstr "Die Priorität des Inhalts angeben" + +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" +msgstr "" + +#: src/credential/gnunet-credential.c:555 +msgid "The public key of the authority to verify the credential against" +msgstr "" + +#: src/credential/gnunet-credential.c:560 +msgid "The ego to use" +msgstr "" + +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" +msgstr "" + +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" + +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" + +#: src/credential/gnunet-credential.c:588 +#, fuzzy +msgid "GNUnet credential resolver tool" +msgstr "GNUnet Netzwerk Topologie tracen." + +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, fuzzy, c-format +msgid "Failed to connect to GNS\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, fuzzy, c-format +msgid "Failed to connect to namestore\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" + +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#, fuzzy +msgid "GNS REST API initialized\n" +msgstr " Verbindung fehlgeschlagen\n" + +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 msgid "# bytes stored" msgstr "# gespeicherte Bytes" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 msgid "# items stored" msgstr "# gespeicherte Objekte" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 msgid "# requests received" msgstr "# Anfragen empfangen" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 #, fuzzy msgid "# requests for random value received" msgstr "# Anfragen empfangen" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 #, fuzzy msgid "# proximity search requests received" msgstr "# Klartext PONG Nachrichten empfangen" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1522,16 +1663,17 @@ msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" @@ -1831,7 +1973,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 #, fuzzy msgid "Data too large" msgstr "Anzahl der Werte" @@ -1870,32 +2012,34 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 msgid "Sqlite database running\n" msgstr "Sqlite-Datenbank läuft\n" @@ -1903,155 +2047,103 @@ msgstr "Sqlite-Datenbank läuft\n" msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" +#: src/dht/gnunet-dht-get.c:159 +#, c-format +msgid "Result %d, type %d:\n" +msgstr "" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 msgid "Failed to connect to DHT service!\n" msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1188 -#, fuzzy -msgid "number of peers to start" -msgstr "Anzahl an Durchläufen" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -msgid "Measure quality and performance of the DHT service." -msgstr "" - -#: src/dht/gnunet-dht-put.c:120 -msgid "PUT request sent with key" -msgstr "" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:126 -msgid "PUT request not confirmed!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:163 -#, c-format -msgid "Could not connect to %s service!\n" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" @@ -2060,77 +2152,77 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 #, fuzzy msgid "# PUT requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 #, fuzzy msgid "# GET requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 msgid "# GET requests given to datacache" msgstr "" @@ -2271,16 +2363,63 @@ msgstr "" msgid "# DHT requests combined" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "Anzahl an Durchläufen" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +msgid "Measure quality and performance of the DHT service." +msgstr "" + +#: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Kein Transport des Typs %d bekannt.\n" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "" @@ -2290,34 +2429,29 @@ msgstr "" msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 -#, fuzzy, c-format -msgid "Failed to send DNS request to %s\n" -msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n" - -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:364 #, c-format -msgid "Sent DNS request to %s\n" +msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "" +#: src/dns/dnsstub.c:511 +#, fuzzy, c-format +msgid "Failed to send DNS request to %s: %s\n" +msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n" -#: src/dns/dnsstub.c:437 +#: src/dns/dnsstub.c:517 #, c-format -msgid "Received DNS response that is too small (%u bytes)" +msgid "Sent DNS request to %s\n" msgstr "" #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 @@ -2344,48 +2478,48 @@ msgstr "" msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 msgid "need a valid IPv4 or IPv6 address\n" msgstr "" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" @@ -2395,214 +2529,214 @@ msgstr "" msgid "Print information about DV state" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 #, fuzzy msgid "# Bytes received from CADET" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# PING Nachrichten erstellt" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# Bytes des Typs %d übertragen" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 #, fuzzy msgid "# Packets received from TUN" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 #, fuzzy msgid "# Bytes received from TUN" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "Muss eine Zahl sein" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" @@ -2736,64 +2870,64 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 #, fuzzy msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 msgid "internal error decoding tree" msgstr "" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 #, fuzzy msgid "Invalid URI" msgstr "Ungültiger Parameter: `%s'\n" @@ -2917,12 +3051,12 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" msgid "Internal error." msgstr "Unbekannter Fehler.\n" -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -2976,96 +3110,96 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." msgid "Failed to compute hash of file." msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 #, fuzzy msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "Ungültiges Argument »%s«\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "Keine Schlüsselwörter angegeben!\n" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "" @@ -3105,19 +3239,19 @@ msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n" msgid "set the desired LEVEL of sender-anonymity" msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "Die Priorität des Inhalts angeben" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "" @@ -3164,106 +3298,97 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" msgid "Display contents of a GNUnet directory" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Collection `%s' begonnen.\n" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 #, fuzzy msgid "" msgstr "Unbekannter Fehler" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Fehler beim Download: %s\n" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Dateien aus dem GNUnet herunterladen." -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Datei `%s' hat URI: %s\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 msgid "set the desired LEVEL of receiver-anonymity" msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "Die Datei in DATEINAME schreiben" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:339 +#: src/fs/gnunet-download.c:368 msgid "download a GNUnet directory recursively" msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen" -#: src/fs/gnunet-download.c:356 +#: src/fs/gnunet-download.c:386 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Alle Optionen anzeigen" - #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3280,6 +3405,15 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Alle Optionen anzeigen" + #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3416,7 +3550,7 @@ msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3424,7 +3558,7 @@ msgstr "" "Liste der extrahierten Schlüsselworte, die verwendet werden würden, " "ausgeben, aber keinen Upload durchführen" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3432,13 +3566,13 @@ msgstr "" "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der " "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE " "setzen" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3446,7 +3580,7 @@ msgstr "" "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in " "verschlüsselter Form in der GNUnet-Datenbank)" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3454,32 +3588,32 @@ msgstr "" "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht " "werden soll. (nur für das Einfügen in Namensräume)" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in " "einem Namensraum)" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in " "Namensräume)" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "" @@ -3555,7 +3689,7 @@ msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "GNUnet Konfiguration" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" @@ -3605,7 +3739,7 @@ msgstr "# verschlüsselter PING Nachrichten empfangen" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "" @@ -3656,21 +3790,21 @@ msgstr "" msgid "# requests dropped due to missing reverse route" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 #, fuzzy msgid "# migration stop messages sent" msgstr "# verschlüsselter PING Nachrichten empfangen" @@ -3894,6 +4028,10 @@ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -3919,133 +4057,67 @@ msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" #: src/gns/gnunet-bcd.c:535 -msgid "GNUnet HTTP server to create business cards" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:238 -msgid "Failed to pack DNS response into UDP packet!\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:408 -#, c-format -msgid "Cannot parse DNS request from %s\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:424 -#, fuzzy, c-format -msgid "Received malformed DNS request from %s\n" -msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n" - -#: src/gns/gnunet-dns2gns.c:432 -#, fuzzy, c-format -msgid "Received unsupported DNS request from %s\n" -msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n" - -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 -#, fuzzy -msgid "No DNS server specified!\n" -msgstr "Keine Schlüsselwörter angegeben!\n" - -#: src/gns/gnunet-dns2gns.c:760 -#, fuzzy -msgid "No valid GNS zone specified!\n" -msgstr "Keine Schlüsselwörter angegeben!\n" - -#: src/gns/gnunet-dns2gns.c:784 -msgid "IP of recursive DNS resolver to use (required)" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:802 -msgid "UDP port to listen on for inbound DNS requests; default: 2853" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:826 -msgid "GNUnet DNS-to-GNS proxy (a DNS server)" -msgstr "" - -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-dns2gns.c:203 +msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" -#: src/gns/gnunet-gns.c:276 +#: src/gns/gnunet-dns2gns.c:404 #, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format -msgid "" -"Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" -"gns-import.sh?\n" -msgstr "" +#: src/gns/gnunet-dns2gns.c:420 +#, fuzzy, c-format +msgid "Received malformed DNS request from %s\n" +msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/gns/gnunet-dns2gns.c:428 #, fuzzy, c-format -msgid "Failed to connect to GNS\n" -msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" +msgid "Received unsupported DNS request from %s\n" +msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n" -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" +#: src/gns/gnunet-dns2gns.c:587 +#, fuzzy +msgid "No DNS server specified!\n" +msgstr "Keine Schlüsselwörter angegeben!\n" -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" +#: src/gns/gnunet-dns2gns.c:687 +msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-gns.c:434 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "Die Priorität des Inhalts angeben" - -#: src/gns/gnunet-gns.c:440 -msgid "Specify timeout for the lookup" +#: src/gns/gnunet-dns2gns.c:692 +msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" +#: src/gns/gnunet-dns2gns.c:709 +msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns.c:451 -msgid "Specify the public key of the zone to lookup the record in" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:457 -msgid "Specify the name of the ego of the zone to lookup the record in" +#: src/gns/gnunet-gns-benchmark.c:587 +msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns.c:476 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "GNUnet Netzwerk Topologie tracen." +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" +msgstr "" #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +msgid "" +"Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" +"gns-import.sh?\n" +msgstr "" + #: src/gns/gnunet-gns-helper-service-w32.c:739 #, fuzzy, c-format msgid "Failed to connect to identity service\n" @@ -4056,230 +4128,239 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n" -#: src/gns/gnunet-gns-proxy.c:887 -#, c-format -msgid "Unsupported CURL SSL backend %d\n" -msgstr "" - #: src/gns/gnunet-gns-proxy.c:910 #, fuzzy, c-format +msgid "Unsupported CURL TLS backend %d\n" +msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" + +#: src/gns/gnunet-gns-proxy.c:933 +#, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, fuzzy, c-format msgid "Unable to import certificate %s\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, c-format -msgid "No ego configured for `%s`\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, fuzzy, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "Die Priorität des Inhalts angeben" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "GNUnet Netzwerk Topologie tracen." + +#: src/gns/gnunet-service-gns.c:513 +#, fuzzy +msgid "Properly base32-encoded public key required" +msgstr "# Bytes empfangen über TCP" + +#: src/gns/gnunet-service-gns.c:549 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "Fehler beim Konvertieren von Parametern in URI!\n" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, fuzzy, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -#, fuzzy -msgid "GNS REST API initialized\n" -msgstr " Verbindung fehlgeschlagen\n" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4447,155 +4528,155 @@ msgstr "" msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 #, fuzzy msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# Hellos per HTTP heruntergeladen" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 #, fuzzy msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# Hellos per HTTP heruntergeladen" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 #, fuzzy msgid "# active connections" msgstr "GNUnet Konfiguration" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4614,7 +4695,7 @@ msgstr "" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Informationen über andere GNUnet Knoten ausgeben." @@ -4711,6 +4792,71 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n" msgid "Could not start hostlist HTTP server on port %u\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr " Verbindung fehlgeschlagen\n" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -4798,33 +4944,10 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" msgid "Failed to create directory `%s' for storing egos\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-identity-token.c:66 -#, fuzzy -msgid "Option `-t' is required\n" -msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, fuzzy, c-format -msgid "Token `%s' is malformed\n" -msgstr "Schlüssel »%s« ist gültig\n" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -#, fuzzy -msgid "Identity Token REST API initialized\n" -msgstr " Verbindung fehlgeschlagen\n" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4854,7 +4977,7 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n" msgid "No records found for `%s'" msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" @@ -4874,7 +4997,7 @@ msgstr "Ungültiger Parameter: `%s'\n" msgid "You must specify a name\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "" @@ -4883,7 +5006,7 @@ msgstr "" msgid "spezifies the public key of the zone to look in" msgstr "Die Priorität des Inhalts angeben" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet Konfiguration" @@ -4897,285 +5020,291 @@ msgstr "" msgid "Error communicating with namecache service" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 #, fuzzy msgid "flat plugin running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/namestore/gnunet-namestore.c:301 +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + +#: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 +#, c-format +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" +msgstr "" + +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:851 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 -#, fuzzy, c-format -msgid "Ego `%s' not known to identity service\n" -msgstr "`%s': unbekannter Dienst: %s\n" - -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -#, fuzzy -msgid "Failed to connect to namestore\n" -msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Unbekannte Operation `%s'\n" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, fuzzy, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "%s: Symbolwert `%s' ist ungültig für %s\n" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 msgid "set the desired nick name for the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 msgid "monitor changes in the namestore" msgstr "" -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 msgid "determine our name for the given PKEY" msgstr "" -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1201 +#: src/namestore/gnunet-namestore.c:1315 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1206 +#: src/namestore/gnunet-namestore.c:1319 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1212 +#: src/namestore/gnunet-namestore.c:1324 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 +#: src/namestore/gnunet-service-namestore.c:750 #, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:734 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" +msgid "Failed to replicate block in namecache: %s\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -msgid "GNU Name System First Come First Serve name registration service" +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-service-namestore.c:615 -#, c-format -msgid "Failed to replicate block in namecache: %s\n" +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:379 +#: src/namestore/namestore_api.c:391 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 #, fuzzy msgid "flat file database running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/namestore/plugin_rest_namestore.c:1206 #, fuzzy msgid "Namestore REST API initialized\n" msgstr " Verbindung fehlgeschlagen\n" @@ -5205,11 +5334,11 @@ msgstr "# Freunde in Konfiguration" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5388,58 +5517,58 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 #, fuzzy msgid "Connection reversal request failed\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5463,98 +5592,41 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n" #: src/nat/gnunet-service-nat_mini.c:656 #, fuzzy msgid "`upnpc' command not found\n" -msgstr "Kommando `%s' wurde nicht gefunden!\n" - -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." -msgstr "" +msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nse/gnunet-nse-profiler.c:842 +#: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:847 +#: src/nse/gnunet-nse-profiler.c:854 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:859 +#: src/nse/gnunet-nse-profiler.c:866 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:873 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:877 +#: src/nse/gnunet-nse-profiler.c:884 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:886 +#: src/nse/gnunet-nse-profiler.c:893 msgid "Measure quality and performance of the NSE service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Verfügbare(r) Transport(e): %s\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Datei wurde als `%s' gespeichert.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Datei wurde als `%s' gespeichert.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. " -"Die Datei wurde entfernt.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "==> Verzeichnis `%s':\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, fuzzy, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "==> Verzeichnis `%s':\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 -#, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" - #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format msgid "%sPeer `%s'\n" @@ -5645,6 +5717,63 @@ msgstr "Teste Transport(e) %s\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Verfügbare(r) Transport(e): %s\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Datei wurde als `%s' gespeichert.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Datei wurde als `%s' gespeichert.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. " +"Die Datei wurde entfernt.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "==> Verzeichnis `%s':\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, fuzzy, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "==> Verzeichnis `%s':\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:220 +#, fuzzy +msgid "Failed to receive response from `PEERINFO' service." +msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -5951,11 +6080,11 @@ msgstr "" msgid "Search string `%s' is too long!\n" msgstr "Dienst »%s« läuft nicht\n" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 #, fuzzy msgid "GNUnet REST server" msgstr "GNUnet Netzwerk Topologie tracen." @@ -6086,19 +6215,22 @@ msgid "# revocation set unions completed" msgstr "# Klartext PONG Nachrichten empfangen" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 #, fuzzy msgid "Could not open revocation database file!" msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n" -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 #, fuzzy msgid "You must specify at least one message ID to check!\n" @@ -6154,10 +6286,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Verbindung fehlgeschlagen\n" @@ -6534,14 +6666,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" @@ -6611,6 +6743,17 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" +#: src/testbed/gnunet-testbed-profiler.c:289 +msgid "tolerate COUNT number of continious timeout failures" +msgstr "" + +#: src/testbed/gnunet-testbed-profiler.c:294 +msgid "" +"run profiler in non-interactive mode where upon testbed setup the profiler " +"does not wait for a keystroke but continues to run until a termination " +"signal is received" +msgstr "" + #: src/testbed/gnunet_testbed_mpi_spawn.c:118 #, fuzzy msgid "Waiting for child to exit.\n" @@ -6623,17 +6766,6 @@ msgstr "" msgid "Spawning process `%s'\n" msgstr "Ungültige Antwort auf `%s'.\n" -#: src/testbed/gnunet-testbed-profiler.c:289 -msgid "tolerate COUNT number of continious timeout failures" -msgstr "" - -#: src/testbed/gnunet-testbed-profiler.c:294 -msgid "" -"run profiler in non-interactive mode where upon testbed setup the profiler " -"does not wait for a keystroke but continues to run until a termination " -"signal is received" -msgstr "" - #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -6855,81 +6987,77 @@ msgstr "»%s« konnte nicht gestartet werden: %s\n" msgid "Failed to load configuration from %s\n" msgstr "Konfiguration konnte nicht aus %s geladen werden\n" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# geschlossener Verbindungen (HANGUP gesendet)" -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 #, fuzzy msgid "# HELLO messages gossipped" msgstr "# ausgehender Nachrichten verworfen" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 msgid "# friends connected" msgstr "# verbundener Freunde" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr " gconfig\tGTK Konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 msgid "# friends in configuration" msgstr "# Freunde in Konfiguration" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 msgid "# HELLO messages received" msgstr "# HELLO-Meldungen empfangen" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -6974,211 +7102,215 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 #, fuzzy msgid "# session creation failed" msgstr " Verbindung fehlgeschlagen\n" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 msgid "# DISCONNECT messages sent" msgstr "# DISCONNECT-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 #, fuzzy msgid "# bytes in message queue for other peers" msgstr "# Bytes ausgehender Nachrichten verworfen" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# Bytes des Typs %d übertragen" -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 #, fuzzy msgid "# bandwidth quota violations by other peers" msgstr "Verfolgt die Bandbreitennutzung von gnunetd" -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 #, fuzzy msgid "# SYN messages sent" msgstr "# DISCONNECT-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, fuzzy msgid "# SYN messages received" msgstr "# PING Nachrichten erstellt" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# SESSION_ACK-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 #, fuzzy msgid "# ACK messages received" msgstr "# CONNECT_ACK-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 #, fuzzy msgid "# unexpected ACK messages" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 #, fuzzy msgid "# QUOTA messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 msgid "# disconnected from peer upon explicit request" msgstr "" @@ -7295,6 +7427,47 @@ msgstr "" msgid "# validations succeeded" msgstr "" +#: src/transport/gnunet-service-transport_validation.c:1627 +msgid "# HELLOs given to peerinfo" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# Bytes des Typs %d empfangen" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "Anzahl an Durchläufen" + +#: src/transport/gnunet-transport-profiler.c:636 +msgid "message size to use" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +msgid "Direct access to transport service." +msgstr "Direkter Zugriff auf den Transportdienst" + #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7427,11 +7600,6 @@ msgstr "" msgid "do not resolve hostnames" msgstr "Keine Rechnernamen auflösen" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "" - #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7440,43 +7608,11 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -msgid "Direct access to transport service." -msgstr "Direkter Zugriff auf den Transportdienst" - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# Bytes des Typs %d empfangen" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "Anzahl an Durchläufen" - -#: src/transport/gnunet-transport-profiler.c:636 -msgid "message size to use" -msgstr "" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7545,7 +7681,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7657,7 +7793,7 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 msgid "# TCP sessions active" msgstr "# aktive TCP-Sitzungen" @@ -7695,117 +7831,117 @@ msgstr "" msgid "# TCP WELCOME messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "# Bytes empfangen über TCP" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr " Verbindung fehlgeschlagen\n" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 #, fuzzy msgid "# TCP server connect events" msgstr "# verbundener Knoten" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 msgid "Failed to start service.\n" msgstr "Fehler beim Starten des Dienstes.\n" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "TCP-Transportdienst wartet auf Port %llu\n" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# Bytes empfangen über TCP" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, fuzzy, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 msgid "Failed to open UDP sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# Bytes empfangen über TCP" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, fuzzy, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" + #: src/transport/plugin_transport_unix.c:1403 #, c-format msgid "Cannot create path to `%s'\n" @@ -7919,7 +8055,7 @@ msgid "" "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, c-format msgid "Unknown address family %d\n" msgstr "" @@ -7976,7 +8112,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, fuzzy, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -7995,19 +8131,19 @@ msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n" msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "GNUnet Konfiguration" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" @@ -8018,61 +8154,61 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n" msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Fehler beim Anlegen des Benutzers" -#: src/util/bio.c:187 +#: src/util/bio.c:191 msgid "End of file" msgstr "Dateiende" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "DEBUG" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "WARNUNG" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "FEHLER" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "" @@ -8081,26 +8217,26 @@ msgstr "" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "Unbekannte Adresse" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "Ungültige Adresse" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis " "angeben, in dem FS Daten gespeichert werden.\n" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8113,88 +8249,88 @@ msgstr "" msgid "Syntax error while deserializing in line %u\n" msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" @@ -8205,12 +8341,12 @@ msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "" "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" @@ -8285,11 +8421,11 @@ msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Unbekannte Operation `%s'\n" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8297,94 +8433,100 @@ msgstr "" "Argumente, die für lange Optionen zwingend sind, sind auch für kurze " "Optionen zwingend.\n" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "" "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, fuzzy, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Konfiguration konnte nicht aus %s geladen werden\n" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 #, fuzzy msgid "print available configuration sections" msgstr "GNUnet Konfiguration" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 msgid "Manipulate GNUnet configuration files" msgstr "GNUnet-Konfigurationsdateien bearbeiten" @@ -8428,62 +8570,62 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 msgid "Manipulate GNUnet private ECC key files" msgstr "" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "" @@ -8562,40 +8704,40 @@ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" msgid "Error writing to `%s': %s\n" msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8627,7 +8769,7 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -8636,23 +8778,23 @@ msgstr "" "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine " "positive Zahl angeben.\n" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 #, fuzzy msgid "Resolver not configured correctly.\n" msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" @@ -8662,7 +8804,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8737,63 +8879,63 @@ msgstr "Tage" msgid "end of time" msgstr "" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "IPv6-Adresse beginnt nicht mit »[«\n" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Ungültige Antwort auf `%s' von `%s'\n" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "Port außerhalb des Bereichs\n" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, c-format msgid "Malformed port policy `%s'\n" msgstr "" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Ungültiges Format für IP: »%s«\n" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)." -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Ungültiges Format für IP: `%s'\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Falsches Format `%s' für Netzmaske: %s\n" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Falsches Format `%s' für Netzwerk: %s\n" @@ -8972,27 +9114,39 @@ msgstr "Dienst wird über UDP angeboten" msgid "Setup tunnels via VPN." msgstr "Tunnel über VPN einrichten." -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, fuzzy, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, fuzzy, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" +#~ msgid "Could not connect to %s service!\n" +#~ msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n" + +#, fuzzy +#~ msgid "No valid GNS zone specified!\n" +#~ msgstr "Keine Schlüsselwörter angegeben!\n" + +#, fuzzy +#~ msgid "Token `%s' is malformed\n" +#~ msgstr "Schlüssel »%s« ist gültig\n" + #, fuzzy #~ msgid "Failed to create indices\n" #~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" @@ -9032,10 +9186,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" #~ msgid "verbose output" #~ msgstr "Ausführliche Ausgabe" -#, fuzzy -#~ msgid "Specify the public key of the zone to reverse lookup a name for" -#~ msgstr "Die Priorität des Inhalts angeben" - #, fuzzy #~ msgid "# UPDATE requests executed" #~ msgstr "# dht Anfragen weitergeleitet" @@ -9404,10 +9554,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" #~ msgid "Unknown operator: %c\n" #~ msgstr "Unbekannte Operation `%s'\n" -#, fuzzy -#~ msgid "valid public key required" -#~ msgstr "# Bytes empfangen über TCP" - #~ msgid "Failed to create or access directory for log file `%s'\n" #~ msgstr "" #~ "Anlegen des Verzeichnisses oder Zugriff darauf für Protokolldatei »%s« " diff --git a/po/es.po b/po/es.po index 3cb43da26f..b6fee17131 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.9.5a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2013-02-23 17:50+0100\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" @@ -244,7 +244,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -255,7 +255,7 @@ msgstr "" "configuración!\n" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" @@ -263,7 +263,7 @@ msgstr "" "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format msgid "Using `%s' instead\n" @@ -376,150 +376,14 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms msgid "Initiating shutdown as requested by client.\n" msgstr "Iniciando apagado bajo petición del cliente.\n" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -#, fuzzy -msgid "solver to use" -msgstr "valor a establecer" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "Iniciando descarga «%s».\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, fuzzy, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -# Miguel: "Inbound" lo he traducido como entrada en todo el texto. -#: src/ats/gnunet-service-ats_plugins.c:314 -#, fuzzy, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "La cuota de entrada configurada para la red «%s» es %llu\n" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, fuzzy, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "¡No se puede inicializar el resolvedor!\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Se produjo un fallo al cargar la configuración de %s\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, fuzzy, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/plugin_ats_mlp.c:2679 -#, fuzzy, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" msgstr "" -"No hay configuración de cuota de entrada para la red '%s', asignando el " -"ancho de banda predeterminado (%llu)\n" - -# Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2689 -#, fuzzy, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "La cuota de salida configurada para la red «%s» es %llu\n" - -# Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2698 -#, fuzzy, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "La cuota de salida configurada para la red «%s» es %llu\n" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats-tests/ats-testing-log.c:892 #, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Se produjo un fallo al cargar la configuración de %s\n" +msgid "Start logging `%s'\n" +msgstr "Iniciando descarga «%s».\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -531,15 +395,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Fallo al conectar a gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "" - -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Iniciando descarga «%s».\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -547,6 +402,16 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +#, fuzzy +msgid "solver to use" +msgstr "valor a establecer" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + # Miguel: ¿Como podría traducir "resolutions" y "resolve"? # Son difíciles de no calcar, puesto que no conozco como expresar # el concepto de obtener una dirección a partir de un nombre @@ -681,6 +546,141 @@ msgstr "salida prolija (incluye las propiedades de direcciones del ATS)" msgid "Print information about ATS state" msgstr "Imprime información acerca del estado del ATS" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" +msgstr "Iniciando descarga «%s».\n" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, fuzzy, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +# Miguel: "Inbound" lo he traducido como entrada en todo el texto. +#: src/ats/gnunet-service-ats_plugins.c:314 +#, fuzzy, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "La cuota de entrada configurada para la red «%s» es %llu\n" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, fuzzy, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "¡No se puede inicializar el resolvedor!\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Se produjo un fallo al cargar la configuración de %s\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, fuzzy, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/plugin_ats_mlp.c:2679 +#, fuzzy, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" +"No hay configuración de cuota de entrada para la red '%s', asignando el " +"ancho de banda predeterminado (%llu)\n" + +# Miguel: "Outbound" lo he traducido como salida en todo el texto. +#: src/ats/plugin_ats_mlp.c:2689 +#, fuzzy, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "La cuota de salida configurada para la red «%s» es %llu\n" + +# Miguel: "Outbound" lo he traducido como salida en todo el texto. +#: src/ats/plugin_ats_mlp.c:2698 +#, fuzzy, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "La cuota de salida configurada para la red «%s» es %llu\n" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Se produjo un fallo al cargar la configuración de %s\n" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -825,295 +825,295 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 #, fuzzy msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" "El cliente se desconectó del servicio principal, tratando de reconectar.\n" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "'%s' falló en %s: %d con error: '%s'.\n" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Se produjo un fallo al resolver «%s»: %s\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, c-format msgid "Unknown command `%s'\n" msgstr "Comando desconocido «%s»\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "Detectada dirección de la red interna «%s».\n" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Par «%s»\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 #, fuzzy msgid "Use `/status' to print status information" msgstr "ser prolijo (imprime información de progreso)" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Use «/quit» para finalizar «gnunet-chat»" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "Use «/help comando» para obtener ayuda sobre un comando específico" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "El pseudónimo '%s' fue borrado.\n" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Debes especificar un fichero a inspeccionar.\n" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1279 +#: src/conversation/gnunet-conversation.c:1300 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1306 +#: src/conversation/gnunet-conversation.c:1329 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1368,137 +1368,147 @@ msgstr "" msgid "Core service of `%s' ready.\n" msgstr "El servicio principal de «%4s» está listo.\n" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "# bytes cifrados" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "# bytes descifrados" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "# intercambio de claves iniciados" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "# intercambio de claves parados" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 #, fuzzy msgid "# PING messages transmitted" msgstr "# mensajes PONG creados" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 +#: src/core/gnunet-service-core_kx.c:1005 #, fuzzy -msgid "# ephemeral keys received" +msgid "# duplicate ephemeral keys ignored" msgstr "# mapas de tipos recibidos" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1040 +#, fuzzy +msgid "# EPHEMERAL_KEYs rejected (bad signature)" +msgstr "# mensajes «SET_KEY» descifrados" + +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 +#: src/core/gnunet-service-core_kx.c:1060 +#, fuzzy +msgid "# EPHEMERAL_KEY messages rejected due to time" +msgstr "# mensajes «SET_KEY» descifrados" + +#: src/core/gnunet-service-core_kx.c:1080 #, fuzzy -msgid "# EPHEMERAL_KEY messages received" -msgstr "# mensajes «SET_KEY» descifrados" +msgid "# valid ephemeral keys received" +msgstr "# mapas de tipos recibidos" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 msgid "# PING messages received" msgstr "# mensajes PING recibidos" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 msgid "# PONG messages created" msgstr "# mensajes PONG creados" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 msgid "# sessions terminated by timeout" msgstr "# sesiones terminadas por plazo de expiración" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 msgid "# keepalive messages sent" msgstr "# mensajes «keepalive» enviados" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 msgid "# PONG messages received" msgstr "# mensajes PONG recibidos" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# mensajes PONG recibidos" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 msgid "# PONG messages decrypted" msgstr "# mensajes PONG descifrados" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 msgid "# session keys confirmed via PONG" msgstr "# claves de sesión confirmadas vía PONG" -#: src/core/gnunet-service-core_kx.c:1360 +#: src/core/gnunet-service-core_kx.c:1447 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# bytes recibidos vía TCP" -#: src/core/gnunet-service-core_kx.c:1367 +#: src/core/gnunet-service-core_kx.c:1454 msgid "# rekey operations confirmed via PONG" msgstr "# operaciones de cambio de clave confirmadas vía PONG" -#: src/core/gnunet-service-core_kx.c:1521 +#: src/core/gnunet-service-core_kx.c:1642 #, fuzzy msgid "# DATA message dropped (out of order)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:1529 +#: src/core/gnunet-service-core_kx.c:1650 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 +#: src/core/gnunet-service-core_kx.c:1653 #, fuzzy msgid "# sessions terminated by key expiration" msgstr "# sesiones terminadas por plazo de expiración" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 msgid "# bytes dropped (duplicates)" msgstr "# bytes omitidos (duplicados)" -#: src/core/gnunet-service-core_kx.c:1606 +#: src/core/gnunet-service-core_kx.c:1755 msgid "# bytes dropped (out of sequence)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:1648 +#: src/core/gnunet-service-core_kx.c:1797 msgid "# bytes dropped (ancient message)" msgstr "# bytes omitidos (mensaje antiguo)" -#: src/core/gnunet-service-core_kx.c:1656 +#: src/core/gnunet-service-core_kx.c:1805 msgid "# bytes of payload decrypted" msgstr "# bytes de «payload» descifrados" @@ -1506,11 +1516,11 @@ msgstr "# bytes de «payload» descifrados" #: src/core/gnunet-service-core_sessions.c:350 #: src/dht/gnunet-service-dht_neighbours.c:733 #: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 msgid "# peers connected" msgstr "# pares conectados" @@ -1537,55 +1547,188 @@ msgstr "# mapas de tipos recibidos" msgid "# updates to my type map" msgstr "# actualizaciones de mi mapa de tipos" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/credential/credential_misc.c:88 +#, fuzzy, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, fuzzy, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "'%s': servicio desconocido: %s\n" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, fuzzy, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "El bloque del tipo %u está mal formado\n" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, fuzzy, c-format +msgid "Issuer public key not well-formed\n" +msgstr "El bloque del tipo %u está mal formado\n" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "Se produjo un fallo al conectar con GNS\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, fuzzy, c-format +msgid "ego required\n" +msgstr "Tipo requerido\n" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, fuzzy, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "El bloque del tipo %u está mal formado\n" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, fuzzy, c-format +msgid "Issuer ego required\n" +msgstr "Tipo requerido\n" + +#: src/credential/gnunet-credential.c:516 +#, c-format +msgid "Please specify name to lookup, subject key and issuer key!\n" +msgstr "" + +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" + +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" + +#: src/credential/gnunet-credential.c:545 +#, fuzzy +msgid "The public key of the subject to lookup the credential for" +msgstr "Especificar el tipo del registro a buscar" + +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" +msgstr "" + +#: src/credential/gnunet-credential.c:555 +#, fuzzy +msgid "The public key of the authority to verify the credential against" +msgstr "Especificar el tipo del registro a buscar" + +#: src/credential/gnunet-credential.c:560 +#, fuzzy +msgid "The ego to use" +msgstr "tamaño del mensaje" + +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" +msgstr "" + +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" + +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" + +#: src/credential/gnunet-credential.c:588 +#, fuzzy +msgid "GNUnet credential resolver tool" +msgstr "Herramienta de acceso GNUnet GNS" + +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, c-format +msgid "Failed to connect to GNS\n" +msgstr "Se produjo un fallo al conectar con GNS\n" + +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, c-format +msgid "Failed to connect to namestore\n" +msgstr "Se produjo un fallo al conectar con el almacén de nombres\n" + +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n" + +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#, fuzzy +msgid "GNS REST API initialized\n" +msgstr "Conexión fallida\n" + +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 msgid "# bytes stored" msgstr "# bytes almacenados" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 msgid "# items stored" msgstr "# elementos almacenados" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "Cargando el módulo de la cache de datos «%s»\n" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" "Se produjo un fallo al cargar el módulo de la cache de datos para «%s»\n" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 msgid "# requests received" msgstr "# peticiones recibidas" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "# peticiones filtradas por el «bloomfilter»" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 #, fuzzy msgid "# requests for random value received" msgstr "# peticiones recibidas" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 #, fuzzy msgid "# proximity search requests received" msgstr "# búsquedas de clientes recibidas" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 msgid "Heap datacache running\n" msgstr "Caché de datos de montículo (heap) ejecutándose\n" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1594,16 +1737,17 @@ msgstr "Caché de datos de montículo (heap) ejecutándose\n" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "«%s» falló en %s: %d con el error: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n" @@ -1911,7 +2055,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 #, fuzzy msgid "Data too large" msgstr "número de valores" @@ -1949,26 +2093,27 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "«%s» falló en %s:%u con el error: %s" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Imposible inicializar SQLite: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" # to should be too, i think -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" "la versión de sqlite es muy antigua para determinar el tamaño, se asume " "cero\n" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " @@ -1977,9 +2122,10 @@ msgstr "" "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu " "páginas de %llu bytes de tamaño)\n" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 msgid "Sqlite database running\n" msgstr "Base de datos sqlite ejecutándose\n" @@ -1987,7 +2133,7 @@ msgstr "Base de datos sqlite ejecutándose\n" msgid "Template database running\n" msgstr "Base de datos de plantilla ejecutándose\n" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" @@ -1996,152 +2142,100 @@ msgstr "" "Resultado %d, tipo %d:\n" "%.*s\n" +#: src/dht/gnunet-dht-get.c:159 +#, fuzzy, c-format +msgid "Result %d, type %d:\n" +msgstr "" +"Resultado %d, tipo %d:\n" +"%.*s\n" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "¡Se debe proveer una clave para el «GET» DHT!\n" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 msgid "Failed to connect to DHT service!\n" msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "Enviando un «GET» DHT con clave" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "la clave de búsqueda" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "cuantas peticiones paralelas (réplicas) crear" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "el tipo de datos a buscar" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "opción para usar el demultiplexado de la DHT siempre" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados." -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "cuanto tiempo debe ejecutarse el comando de monitorización" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "ser prolijo (imprime información de progreso)" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "Imprime todos los paquetes que pasan por la DHT." -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "El número máximo de conexiones es %u\n" - -#: src/dht/gnunet_dht_profiler.c:1188 -msgid "number of peers to start" -msgstr "número de pares para empezar" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" -"nombre del fichero con la información de acceso usada para la batería de " -"pruebas" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Medir la calidad y rendimiento del servicio NSE." - -#: src/dht/gnunet-dht-put.c:120 -msgid "PUT request sent with key" -msgstr "Petición «PUT» enviada con clave" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "¡Expiró el plazo enviando una petición «PUT»!\n" - -#: src/dht/gnunet-dht-put.c:126 -msgid "PUT request not confirmed!\n" -msgstr "¡Petición «PUT» no confirmada!\n" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n" -#: src/dht/gnunet-dht-put.c:163 -#, c-format -msgid "Could not connect to %s service!\n" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" msgstr "¡No se pudo conectar al servicio %s!\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "los datos a insertar bajo la clave" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "cuantas réplicas crear" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 #, fuzzy msgid "use DHT's record route option" msgstr "opción para usar el demultiplexado de la DHT siempre" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "el tipo de datos a insertar" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo " @@ -2151,78 +2245,78 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "# peticiones «GET» inyectadas de clientes" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 msgid "# PUT requests received from clients" msgstr "# peticiones «PUT» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 msgid "# GET requests received from clients" msgstr "# peticiones «GET» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 msgid "# GET STOP requests received from clients" msgstr "# peticiones «GET STOP» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del " "cliente (CLIENT)" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 msgid "# RESULTS queued for clients" msgstr "# Resultados (RESULTS) encolados para clientes" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "# Elementos (ITEMS) almacenados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 msgid "# GET requests given to datacache" msgstr "# Peticiones «GET» realizadas a la caché de datos" @@ -2360,16 +2454,65 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento" msgid "# DHT requests combined" msgstr "# Peticiones a la DHT combinadas" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "El número máximo de conexiones es %u\n" + +#: src/dht/gnunet_dht_profiler.c:949 +msgid "number of peers to start" +msgstr "número de pares para empezar" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" +"nombre del fichero con la información de acceso usada para la batería de " +"pruebas" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Medir la calidad y rendimiento del servicio NSE." + +#: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" msgstr "El bloque no es del tipo %u\n" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "Discrepancias de tamaños para el bloque\n" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "El bloque del tipo %u está mal formado\n" @@ -2381,38 +2524,33 @@ msgstr "" "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: " "%s\n" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS " "IDNA: %s\n" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, c-format msgid "Could not bind to any port: %s\n" msgstr "No se pudo asociar con ningún puerto: %s\n" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 +#: src/dns/dnsstub.c:364 #, c-format -msgid "Failed to send DNS request to %s\n" +msgid "Received DNS response that is too small (%u bytes)" +msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)" + +#: src/dns/dnsstub.c:511 +#, fuzzy, c-format +msgid "Failed to send DNS request to %s: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:517 #, c-format msgid "Sent DNS request to %s\n" msgstr "Petición DNS enviada a %s\n" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n" - -#: src/dns/dnsstub.c:437 -#, c-format -msgid "Received DNS response that is too small (%u bytes)" -msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)" - #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 msgid "only monitor DNS queries" msgstr "sólo monitorizar consultas DNS" @@ -2437,48 +2575,48 @@ msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado." msgid "# DNS requests answered via TUN interface" msgstr "# Peticiones DNS contestadas vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 msgid "# DNS requests received via TUN interface" msgstr "# Peticiones DNS recibidas vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 msgid "need a valid IPv4 or IPv6 address\n" msgstr "se necesita una dirección IPv4 o IPv6 válida\n" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, fuzzy, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n" @@ -2488,177 +2626,177 @@ msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n" msgid "Print information about DV state" msgstr "Imprime información acerca del estado del ATS" -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 msgid "# TCP packets sent via TUN" msgstr "# Paquetes TCP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 msgid "# ICMP packets sent via TUN" msgstr "# Paquetes ICMP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 msgid "# UDP packets sent via TUN" msgstr "# Paquetes UDP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 #, fuzzy msgid "# Bytes received from CADET" msgstr "# Bytes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# Peticiones de salida IP por UDP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# Peticiones de servicio UDP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 msgid "# TCP DATA requests dropped (no session)" msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# Peticiones de datos TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# Peticiones de servicio ICMP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# Túneles interiores MESH creados" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "Hay registros de servicios duplicados para «%s:%u»\n" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# Bytes transmitidos vía túneles MESH" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "# Paquetes ICMP omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 msgid "# Packets received from TUN" msgstr "# Paquetes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 msgid "# Bytes received from TUN" msgstr "# Bytes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "Opciones de paquete IPv4 recibidas. Ignoradas.\n" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" "Recibido paquete IPv4 con cabecera «next» no soportada %u. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" "Recibido paquete IPv6 con cabecera «next» no soportada %d. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "Recibido paquete de protocolo desconocido %u. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Las opción «%s» o «%s» es necesaria.\n" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio " "«%s»!\n" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" "¡No se encontraron direcciones IP para el nombre de máquina «%s» del " "servicio «%s»!\n" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" @@ -2666,7 +2804,7 @@ msgstr "" "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque " "estén habilitadas en la configuración\n" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" @@ -2674,7 +2812,7 @@ msgstr "" "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque " "estén habilitadas en la configuración\n" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" @@ -2682,7 +2820,7 @@ msgstr "" "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz " "TUN, se usará ENABLE_IPv4=YES\n" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" @@ -2690,20 +2828,20 @@ msgstr "" "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz " "TUN, se usará ENABLE_IPv6=YES\n" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, fuzzy, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "Ningún servicio útil habilitado. Saliendo.\n" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN" @@ -2839,7 +2977,7 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "No hay coincidencia con «MAGIC». Esto no es un directorio GNUnet.\n" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" @@ -2847,12 +2985,12 @@ msgstr "" "Las descargas recursivas de directorios mayores de 4GB no están soportadas " "en sistemas de 32 bits\n" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" "Directorio demasiado grande para el espacio de direccionamiento del sistema\n" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" @@ -2860,19 +2998,19 @@ msgstr "" "Se produjo un fallo al crear el directorio para la descarga recursiva de " "«%s»\n" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, c-format msgid "Failed to open file `%s' for writing" msgstr "Se produjo un fallo al abrir «%s» para escritura" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" "Se produjo un fallo al crear el directorio para la descarga recursiva de " "«%s»\n" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " @@ -2881,33 +3019,33 @@ msgstr "" "Error interno o URI de descarga defectuosa (se esperaban %u bytes a " "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "error interno descifrando el contenido" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "" "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento " "%llu del fichero «%s»: %s" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 msgid "internal error decoding tree" msgstr "error interno decodificando árbol" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 msgid "Invalid URI" msgstr "URI no válida" @@ -3029,12 +3167,12 @@ msgstr "No se pudo conectar con el almacén de datos." msgid "Internal error." msgstr "Error interno." -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Se produjo un fallo al procesar la URI: %s\n" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -3088,108 +3226,108 @@ msgid "Failed to compute hash of file." msgstr "Se produjo un fallo al calcular el hash del fichero." # Cadena erronea, corregida en SVN. -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "'%' debe ser seguido por un número hexadecimal" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 #, fuzzy msgid "Malformed SKS URI (wrong syntax)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 #, fuzzy msgid "Malformed CHK URI (wrong syntax)" msgstr "URI CHK mal formada" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 #, fuzzy msgid "LOC URI malformed (wrong syntax)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 #, fuzzy msgid "LOC URI malformed (no CHK)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 #, fuzzy msgid "LOC URI malformed (missing LOC)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 #, fuzzy msgid "LOC URI malformed (wrong syntax for public key)" msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 #, fuzzy msgid "LOC URI malformed (could not decode public key)" msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 #, fuzzy msgid "LOC URI malformed (could not find signature)" msgstr "URI SKS mal formada (no se pudo encontrar la firma)" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 #, fuzzy msgid "LOC URI malformed (wrong syntax for signature)" msgstr "URI SKS mal formada (no se pudo encontrar la firma)" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 #, fuzzy msgid "LOC URI malformed (could not decode signature)" msgstr "URI SKS mal formada (no se pudo decodificar la firma)" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 #, fuzzy msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 #, fuzzy msgid "LOC URI malformed (could not parse expiration time)" msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 #, fuzzy msgid "LOC URI malformed (signature failed validation)" msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "Parámetro no válido «%s»\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "Tipo de URI no reconocido" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "¡Ninguna palabra clave especificada!\n" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "¡Número de comillas dobles no balanceado!\n" @@ -3231,20 +3369,20 @@ msgstr "" msgid "set the desired LEVEL of sender-anonymity" msgstr "establece el nivel LEVEL deseado de anonimato del emisor" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" "deshabilitar añadir tiempo de creación a los metadatos del fichero subido" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "no usar libextractor para añadir palabras clave o metadatos" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "especificar la prioridad del contenido" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "establece el nivel LEVEL deseado de replicación" @@ -3289,16 +3427,16 @@ msgstr "«%s» no es un directorio GNUnet\n" msgid "Display contents of a GNUnet directory" msgstr "Muestra los contenidos de un directorio GNUnet" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, c-format msgid "Starting download `%s'.\n" msgstr "Iniciando descarga «%s».\n" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 msgid "" msgstr "" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " @@ -3307,74 +3445,74 @@ msgstr "" "Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en " "descargarse\n" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, c-format msgid "Error downloading: %s.\n" msgstr "Error descargando: %s.\n" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Finalizada descarga «%s» (%s/s).\n" -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, c-format msgid "Unexpected status: %d\n" msgstr "Estado inesperado: %d\n" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 msgid "You need to specify a URI argument.\n" msgstr "Tiene que especificar una URI como parámetro.\n" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, c-format msgid "Failed to parse URI: %s\n" msgstr "Se produjo un fallo al procesar la URI: %s\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "Sólo URI «CHK» o «LOC» soportadas.\n" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "El nombre de fichero de destino debe ser especificado.\n" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "No se pudo inicializar el subsistema «%s».\n" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 msgid "set the desired LEVEL of receiver-anonymity" msgstr "establece el nivel LEVEL deseado de anonimato del receptor" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C=" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "únicamente buscar en el par local (no buscar en la red P2P)" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel downloads that is allowed" msgstr "establece el número máximo de descargas paralelas permitido" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "establece el número máximo de peticiones de bloque paralelas permitido" -#: src/fs/gnunet-download.c:339 +#: src/fs/gnunet-download.c:368 msgid "download a GNUnet directory recursively" msgstr "descarga un directorio de GNUnet recursivamente" -#: src/fs/gnunet-download.c:356 +#: src/fs/gnunet-download.c:386 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" @@ -3382,14 +3520,6 @@ msgstr "" "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/" "chk/...)" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "imprimir una lista de todos los ficheros indexados" - -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" -msgstr "Operaciones especiales de compartición de ficheros" - #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "ejecuta el experimento con «COUNT» pares" @@ -3410,6 +3540,14 @@ msgstr "" "ejecuta una batería de pruebas para medir el rendimiento de la compartición " "de ficheros" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "imprimir una lista de todos los ficheros indexados" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" +msgstr "Operaciones especiales de compartición de ficheros" + #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3544,7 +3682,7 @@ msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3552,7 +3690,7 @@ msgstr "" "imprimir una lista de las palabras clave extraídas que podrían ser usadas, " "pero sin realizar la subida" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3560,11 +3698,11 @@ msgstr "" "añadir una palabra clave adicional para el fichero del nivel más alto o el " "directorio (esta opción puede ser especificada varias veces)" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3572,7 +3710,7 @@ msgstr "" "no indexar, hacer inserciones totales (almacena el fichero entero de forma " "cifrada en la base de datos de GNUnet)" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3580,13 +3718,13 @@ msgstr "" "especificar la ID de una versión actualizada para ser publicada en el futuro " "(para inserciones en el espacio de nombres únicamente)" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el " "espacio)" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" @@ -3594,14 +3732,14 @@ msgstr "" "únicamente simular el proceso pero no publicar nada realmente (útil para " "calcular URI)" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "establece la ID de esta versión de la publicación (para inserciones en el " "espacio únicamente)" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" @@ -3609,7 +3747,7 @@ msgstr "" "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir " "claves con el fichero con la URI respectiva)" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "Publicar un fichero o un directorio en GNUnet" @@ -3688,7 +3826,7 @@ msgstr "" "(HOSTKEY). Saliendo.\n" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Se produjo un fallo al conectar con el servicio «%s».\n" @@ -3738,7 +3876,7 @@ msgstr "# mensajes de detención de migración recibidos" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "Migración de contenido al par «%s» bloqueada durante %s\n" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "# busquedas P2P activas" @@ -3786,20 +3924,20 @@ msgstr "# peticiones «GET» recibidas (de otros pares)" msgid "# requests dropped due to missing reverse route" msgstr "# peticiones omitidas debido a falta de ruta inversa" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 msgid "# requests dropped due TTL underflow" msgstr "# peticiones omitidas debido a expiración del TTL" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 msgid "# P2P query messages received and processed" msgstr "# mensajes de búsqueda P2P recibidos y procesados" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 msgid "# migration stop messages sent" msgstr "# mensajes de detención de migración enviados" @@ -4015,6 +4153,10 @@ msgstr "No se pudo empezar la operación de desindexado.\n" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»." +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -4044,137 +4186,69 @@ msgstr "" msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:238 +#: src/gns/gnunet-dns2gns.c:203 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n" -#: src/gns/gnunet-dns2gns.c:408 +#: src/gns/gnunet-dns2gns.c:404 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "No se puede procesar la petición DNS de %s\n" -#: src/gns/gnunet-dns2gns.c:424 +#: src/gns/gnunet-dns2gns.c:420 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "Recibida petición DNS mal formada de %s\n" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:428 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Recibida petición DNS no soportada de %s\n" -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 +#: src/gns/gnunet-dns2gns.c:587 #, fuzzy msgid "No DNS server specified!\n" msgstr "¡Ninguna palabra clave especificada!\n" -#: src/gns/gnunet-dns2gns.c:760 -#, fuzzy -msgid "No valid GNS zone specified!\n" -msgstr "¡Ninguna palabra clave especificada!\n" - -#: src/gns/gnunet-dns2gns.c:784 +#: src/gns/gnunet-dns2gns.c:687 msgid "IP of recursive DNS resolver to use (required)" msgstr "IP del resolvedor recursivo DNS a usar (requerido)" -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" -"Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu" - -#: src/gns/gnunet-dns2gns.c:802 +#: src/gns/gnunet-dns2gns.c:692 #, fuzzy msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: " "53" -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:826 +#: src/gns/gnunet-dns2gns.c:709 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)" -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-gns-benchmark.c:587 +#, fuzzy +msgid "how long to wait for an answer" +msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre" + +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:276 -#, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +#: src/gns/gnunet-gns-helper-service-w32.c:602 +msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 -#, c-format -msgid "Failed to connect to GNS\n" -msgstr "Se produjo un fallo al conectar con GNS\n" - -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" - -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" -msgstr "Buscar el registro para el nombre dado" - -#: src/gns/gnunet-gns.c:434 -msgid "Specify the type of the record to lookup" -msgstr "Especificar el tipo del registro a buscar" - -#: src/gns/gnunet-gns.c:440 -#, fuzzy -msgid "Specify timeout for the lookup" -msgstr "Especificar el tipo del registro a buscar" - -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" -msgstr "Sin salida innecesaria" - -#: src/gns/gnunet-gns.c:451 -#, fuzzy -msgid "Specify the public key of the zone to lookup the record in" -msgstr "Especificar el tipo del registro a buscar" - -#: src/gns/gnunet-gns.c:457 -#, fuzzy -msgid "Specify the name of the ego of the zone to lookup the record in" -msgstr "Especificar el tipo del registro a buscar" - -#: src/gns/gnunet-gns.c:476 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Herramienta de acceso GNUnet GNS" - -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" -msgstr "" - #: src/gns/gnunet-gns-helper-service-w32.c:739 #, fuzzy, c-format msgid "Failed to connect to identity service\n" @@ -4185,232 +4259,239 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "%s falló en %s:%d: «%s».\n" -#: src/gns/gnunet-gns-proxy.c:887 +#: src/gns/gnunet-gns-proxy.c:910 #, fuzzy, c-format -msgid "Unsupported CURL SSL backend %d\n" +msgid "Unsupported CURL TLS backend %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:933 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "¡No se puede inicializar el resolvedor!\n" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Tipo no soportado «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "No se pudo importar la clave privada del fichero «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, c-format msgid "Unable to import certificate %s\n" msgstr "No se pudo importar el certificado %s\n" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, fuzzy, c-format -msgid "No ego configured for `%s`\n" -msgstr "" -"Ningún puerto fue configurado para el módulo «%s», no se puede probar\n" - -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, fuzzy, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "escuchar en el puerto especificado (predeterminado: 7777)" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "fichero pem para usar como autoridad de certificación (CA)" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "Proxy GNUnet GNS" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "Buscar el registro para el nombre dado" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "Especificar el tipo del registro a buscar" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "Sin salida innecesaria" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Herramienta de acceso GNUnet GNS" + +#: src/gns/gnunet-service-gns.c:513 +#, fuzzy +msgid "Properly base32-encoded public key required" +msgstr "Tipo requerido\n" + +#: src/gns/gnunet-service-gns.c:549 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 msgid "Could not connect to DHT!\n" msgstr "¡No se pudo conectar a la DHT!\n" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, fuzzy, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "Módulo «%s» no encontrado\n" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "No se pudo procesar el registro PKEY «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "No se pudo procesar el registro SOA «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, fuzzy, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -#, fuzzy -msgid "GNS REST API initialized\n" -msgstr "Conexión fallida\n" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4599,36 +4680,36 @@ msgstr "proveer un servidor de listas de máquinas" msgid "GNUnet hostlist server and client" msgstr "Servidor y cliente GNUnet de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 msgid "# bytes downloaded from hostlist servers" msgstr "# bytes descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "# URI de listas de máquinas anunciadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "# URI anunciadas «%s» descargadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " @@ -4637,120 +4718,120 @@ msgstr "" "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI " "anunciada es descartada.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "Límite de descarga de %u bytes superado, parando descarga\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "Descarga de lista de máquinas «%s» completada.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "Inicializando usando lista de máquinas en «%s».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "# descargas de listas de máquinas iniciadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "# milisegundos entre descargas de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" "Hay %u/%u conexiones. Se considerará descargar una lista de máquinas en %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 msgid "# active connections" msgstr "# conexiones activas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "El fichero de listas de máquinas «%s» no existe\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de " "máquinas: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "%u URI de listas de máquinas cargadas del fichero\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 msgid "# hostlist URIs read from file" msgstr "# URI de listas de máquinas leídas de fichero" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas " "de máquinas: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 msgid "# hostlist URIs written to file" msgstr "# URI de listas de máquinas escritas a fichero" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "El aprendizaje está habilitado en este par\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "El aprendizaje no está habilitado en este par\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4770,7 +4851,7 @@ msgstr "direcciones expiradas encontradas" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" @@ -4873,6 +4954,71 @@ msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Las opción «%s» o «%s» es necesaria.\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "el parámetro --section es necesario\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "El almacén de nombres no pudo añadir el registro\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr "Conexión fallida\n" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -4967,34 +5113,11 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" msgid "Failed to create directory `%s' for storing egos\n" msgstr "Se produjo un fallo al leer el directorio «%s»\n" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 #, fuzzy msgid "Identity REST API initialized\n" msgstr "Conexión fallida\n" -#: src/identity-provider/gnunet-identity-token.c:66 -#, fuzzy -msgid "Option `-t' is required\n" -msgstr "Las opción «%s» o «%s» es necesaria.\n" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, fuzzy, c-format -msgid "Token `%s' is malformed\n" -msgstr "El bloque del tipo %u está mal formado\n" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -#, fuzzy -msgid "Identity Token REST API initialized\n" -msgstr "Conexión fallida\n" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -5024,7 +5147,7 @@ msgstr "No se pudo acceder al fichero «%s»: %s\n" msgid "No records found for `%s'" msgstr "No se han encontrado ficheros en «%s»\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "\tRegistro corrupto o no soportado del tipo %u\n" @@ -5044,7 +5167,7 @@ msgstr "Parámetro no válido «%s»\n" msgid "You must specify a name\n" msgstr "¡Debes especificar un receptor!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "nombre del registro a añadir/borrar/mostrar" @@ -5053,7 +5176,7 @@ msgstr "nombre del registro a añadir/borrar/mostrar" msgid "spezifies the public key of the zone to look in" msgstr "Especificar el tipo del registro a buscar" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 msgid "GNUnet zone manipulation tool" msgstr "Herramienta de manipulación de zona de GNUnet" @@ -5068,292 +5191,299 @@ msgstr "El almacén de nombres no pudo añadir el registro" msgid "Error communicating with namecache service" msgstr "Error al comunicar con el servicio ARM.\n" -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Imposible inicializar SQLite: %s.\n" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 #, fuzzy msgid "flat plugin running\n" msgstr "Base de datos sqlite ejecutándose\n" -#: src/namestore/gnunet-namestore.c:301 +# form?? +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Forma de valor no soportada «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "Encontrado nombre «%s» para la clave dada\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "Encontrados %u registros para el dominio «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Se produjo un fallo al crear la página para «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "El nombre de dominio no puede contener «.»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "El nombre de dominio no puede contener «+»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +msgid "Failed to start HTTP server\n" +msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Se produjo un fallo al conectar con GNS\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#, fuzzy +msgid "GNU Name System First Come First Serve name registration service" +msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse" + +#: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" msgstr "No se pudo añadir el registro: %s\n" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "No se pudo borrar el registro: %s\n" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "No se pudo borrar el registro: %s\n" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 +#, c-format +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" +msgstr "" + +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:851 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 -#, fuzzy, c-format -msgid "Ego `%s' not known to identity service\n" -msgstr "'%s': servicio desconocido: %s\n" - -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, c-format msgid "No options given\n" msgstr "No se han proporcionado opciones\n" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -msgid "Failed to connect to namestore\n" -msgstr "Se produjo un fallo al conectar con el almacén de nombres\n" - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "añadir" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, c-format msgid "Unsupported type `%s'\n" msgstr "Tipo no soportado «%s»\n" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "Valor «%s» no válido para el tipo de registro «%s»\n" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, c-format msgid "Invalid time format `%s'\n" msgstr "Formato de tiempo no válido «%s»\n" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "borrar" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Parámetro no válido «%s»\n" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, c-format msgid "Invalid URI `%s'\n" msgstr "URI no válida: «%s»\n" -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "URI no válida: «%s»\n" -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, fuzzy, c-format msgid "No default ego configured in identity service\n" msgstr "'%s': servicio desconocido: %s\n" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "¡No se pudo conectar al servicio %s!\n" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "añadir registro" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "borrar registro" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "mostrar registros" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" "tiempo de expiración del registro a usar (únicamente para añadir), nunca " "(\"never\") es posible" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 #, fuzzy msgid "set the desired nick name for the zone" msgstr "establece el nivel LEVEL deseado de replicación" -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 #, fuzzy msgid "monitor changes in the namestore" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 #, fuzzy msgid "determine our name for the given PKEY" msgstr "establece las preferencias para el par dado" -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "tipo del registro a añadir/borrar/mostrar" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "URI a importar a nuestra zona" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "valor del registro a añadir/borrar" -#: src/namestore/gnunet-namestore.c:1201 +#: src/namestore/gnunet-namestore.c:1315 msgid "create or list public record" msgstr "crear o listar registros públicos" -#: src/namestore/gnunet-namestore.c:1206 +#: src/namestore/gnunet-namestore.c:1319 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1212 +#: src/namestore/gnunet-namestore.c:1324 #, fuzzy msgid "name of the ego controlling the zone" msgstr "nombre de la sección a la que acceder" -# form?? -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Forma de valor no soportada «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" +#: src/namestore/gnunet-service-namestore.c:750 +#, fuzzy, c-format +msgid "Failed to replicate block in namecache: %s\n" +msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "Encontrado nombre «%s» para la clave dada\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "Encontrados %u registros para el dominio «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 -#, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Se produjo un fallo al crear la página para «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:734 -#, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "El nombre de dominio no puede contener «.»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "El nombre de dominio no puede contener «+»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -msgid "Failed to start HTTP server\n" -msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Se produjo un fallo al conectar con GNS\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -#, fuzzy -msgid "GNU Name System First Come First Serve name registration service" -msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse" - -#: src/namestore/gnunet-service-namestore.c:615 -#, fuzzy, c-format -msgid "Failed to replicate block in namecache: %s\n" -msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n" - -#: src/namestore/namestore_api.c:379 +#: src/namestore/namestore_api.c:391 #, fuzzy msgid "Namestore failed to store record\n" msgstr "El almacén de nombres no pudo añadir el registro\n" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 #, fuzzy msgid "flat file database running\n" msgstr "Base de datos de plantilla ejecutándose\n" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "Se produjo un fallo al inciar «%s» en «%s»\n" + +#: src/namestore/plugin_rest_namestore.c:1206 #, fuzzy msgid "Namestore REST API initialized\n" msgstr "Conexión fallida\n" @@ -5382,11 +5512,11 @@ msgstr "Configuración de GNUnet" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5574,62 +5704,62 @@ msgstr "" "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para " "pruebas NAT: %s\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 #, fuzzy msgid "watch for connection reversal requests" msgstr "# pares desconectados debido a petición externa" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 #, fuzzy msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, fuzzy, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" "Puerto inválido \"%s\" en la especificación de la lista local, probando el " "puerto %d.\n" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Colección detenida.\n" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5653,99 +5783,40 @@ msgstr "comando «external-ip» no encontrado\n" msgid "`upnpc' command not found\n" msgstr "comando «upnpc» no encontrado\n" -#: src/nse/gnunet-nse.c:122 -#, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# Estimaciones del tamaño de red recibidas" - -#: src/nse/gnunet-nse-profiler.c:842 +#: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas" -#: src/nse/gnunet-nse-profiler.c:847 +#: src/nse/gnunet-nse-profiler.c:854 msgid "name of the file for writing connection information and statistics" msgstr "" "nombre del fichero para escribir información y estadísticas de la conexión" -#: src/nse/gnunet-nse-profiler.c:859 -msgid "name of the file for writing the main results" -msgstr "nombre del fichero en el que escribir los resultados principales" - #: src/nse/gnunet-nse-profiler.c:866 -msgid "Number of peers to run in each round, separated by commas" -msgstr "Número de pares a ejecutar en cada ronda, separados por comas" - -#: src/nse/gnunet-nse-profiler.c:877 -msgid "delay between rounds" -msgstr "retraso entre rondas" - -#: src/nse/gnunet-nse-profiler.c:886 -msgid "Measure quality and performance of the NSE service." -msgstr "Medir la calidad y rendimiento del servicio NSE." - -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Eliminando dirección de transporte «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "# pares conocidos" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. " -"Eliminado.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Escaneando directorio «%s».\n" +msgid "name of the file for writing the main results" +msgstr "nombre del fichero en el que escribir los resultados principales" -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "¡Aún no se han encontrado pares en «%s»!\n" +#: src/nse/gnunet-nse-profiler.c:873 +msgid "Number of peers to run in each round, separated by commas" +msgstr "Número de pares a ejecutar en cada ronda, separados por comas" -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Escaneando directorio «%s».\n" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "retraso entre rondas" -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "Importando HELLO de «%s»\n" +#: src/nse/gnunet-nse-profiler.c:893 +msgid "Measure quality and performance of the NSE service." +msgstr "Medir la calidad y rendimiento del servicio NSE." -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" -msgstr "" +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# Estimaciones del tamaño de red recibidas" -# Miguel: "Failed to receive" también aquí está traducido como -# "no se obtuvo respuesta" por claridad. -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" msgstr "" -"No se obtuvo respuesta del servicio de información de pares (PEERINFO)." #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5836,6 +5907,65 @@ msgstr "Cargando el módulo de transporte «%s»\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Eliminando dirección de transporte «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "# pares conocidos" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. " +"Eliminado.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Escaneando directorio «%s».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "¡Aún no se han encontrado pares en «%s»!\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Escaneando directorio «%s».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "Importando HELLO de «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +# Miguel: "Failed to receive" también aquí está traducido como +# "no se obtuvo respuesta" por claridad. +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." +msgstr "" +"No se obtuvo respuesta del servicio de información de pares (PEERINFO)." + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6148,12 +6278,12 @@ msgstr "El servicio «%s» no está ejecutandose\n" msgid "Search string `%s' is too long!\n" msgstr "El servicio «%s» no está ejecutandose\n" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 #, fuzzy msgid "listen on specified port (default: 7776)" msgstr "escuchar en el puerto especificado (predeterminado: 7777)" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 #, fuzzy msgid "GNUnet REST server" msgstr "Herramienta de acceso GNUnet GNS" @@ -6290,19 +6420,22 @@ msgid "# revocation set unions completed" msgstr "# transmisiones de fragmentos completadas" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 #, fuzzy msgid "Could not open revocation database file!" msgstr "No se pudo conectar con el almacén de datos." -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 #, fuzzy msgid "You must specify at least one message ID to check!\n" @@ -6358,10 +6491,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #, fuzzy msgid "Connect to CADET failed\n" msgstr "Conexión fallida (¿bug?)\n" @@ -6742,14 +6875,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "El fichero de máquinas no tiene el formato correcto: %s\n" @@ -6823,16 +6956,6 @@ msgstr "Petición ignorada porque el ARM se está apagando.\n" msgid "%.s Unknown result code." msgstr "Código de respuesta del ARM desconocido.\n" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n" - #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo" @@ -6844,6 +6967,16 @@ msgid "" "signal is received" msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n" + #: src/testbed/testbed_api.c:410 #, c-format msgid "Adding host %u failed with error: %s\n" @@ -7085,62 +7218,62 @@ msgstr "Se produjo un fallo al arrancar «%s»: %s\n" msgid "Failed to load configuration from %s\n" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" "Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, " "omitiendo bytes «%s».\n" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, fuzzy, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "# pares en la lista negra" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# peticiones de conexión requeridas al servicio de transporte" # gossiped?? -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 msgid "# HELLO messages gossipped" msgstr "# Mensajes «HELLO» rumoreados" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 msgid "# friends connected" msgstr "# amigos conectados" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" "¡Se produjo un fallo al conectar con el servicio principal, no se puede " "gestionar la topología!\n" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, c-format msgid "Found friend `%s' in configuration\n" msgstr "Encontrado amigo «%s» en la configuración\n" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 msgid "# friends in configuration" msgstr "# amigos en configuración" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" @@ -7148,26 +7281,22 @@ msgstr "" "Menos amigos especificados que los requeridos por el contador mínimo de " "amigos. Sólo me conectaré a amigos.\n" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" "Más conexiones amistosas requeridas que el número objetivo total de " "conexiones.\n" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 msgid "# HELLO messages received" msgstr "# mensajes «HELLO» recibidos" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "# mensajes omitidos debido a un cliente lento" @@ -7216,220 +7345,224 @@ msgstr "" "El servicio de transporte carece de opciones de configuración de clave. " "Saliendo.\n" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "# refrescos de mi «HELLO»" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 #, fuzzy msgid "# session creation failed" msgstr "# sesiones wlan creadas" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 msgid "# DISCONNECT messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "# desconexiones debido a una cuota de 0" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 msgid "# bytes in message queue for other peers" msgstr "# bytes en la cola de mensajes para otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 msgid "# messages transmitted to other peers" msgstr "# mensajes transmitidos a otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 msgid "# transmission failures for messages to other peers" msgstr "# fallos de transmisión en mensajes a otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "# mensajes expirados mientras estaban en la cola de transporte" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 msgid "# KEEPALIVE messages discarded (no session)" msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 msgid "# messages discarded due to lack of neighbour record" msgstr "# mensajes descartados debido a la falta de registro vecinal" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 msgid "# bandwidth quota violations by other peers" msgstr "# violaciones de la cuota de ancho de banda por otros pares" # throttling? -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "# ms de impulso sugeridos" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "" "Se produjo un fallo al procesar el mensaje interno del programa auxiliar " "«%s»\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 #, fuzzy msgid "# SYN messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, fuzzy msgid "# SYN messages received" msgstr "# mensajes PING recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# mensajes SET QUOTA recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 #, fuzzy msgid "# ACK messages received" msgstr "# mensajes «REQUEST CONNECT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 #, fuzzy msgid "# unexpected ACK messages" msgstr "# Mensajes «SESSION ACK» inesperados" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# mensajes de desconexión ignorados (formato antiguo)" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 #, fuzzy msgid "# QUOTA messages received" msgstr "# Mensajes «GAP PUT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 #, fuzzy msgid "# disconnect messages ignored (malformed)" msgstr "# mensajes de desconexión ignorados (formato antiguo)" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# mensajes «REQUEST CONNECT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "# mensajes de desconexión ignorados (marca temporal)" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 msgid "# disconnected from peer upon explicit request" msgstr "# desconexiones del par debido a una petición explícita" @@ -7552,6 +7685,50 @@ msgstr "# Mensajes PONG omitidos, firma expirada" msgid "# validations succeeded" msgstr "# revalidaciones de direcciones iniciadas" +#: src/transport/gnunet-service-transport_validation.c:1627 +#, fuzzy +msgid "# HELLOs given to peerinfo" +msgstr "# «HELLO» obtenidos de «peerinfo»" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# respuestas recibidas de otros pares" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Otras configuraciones" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "número de mensajes a usar por iteración" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "tamaño del mensaje" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "identidad del par" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +msgid "Direct access to transport service." +msgstr "Acceso directo al servicio de transporte." + #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7695,11 +7872,6 @@ msgstr "" msgid "do not resolve hostnames" msgstr "no resolver nombres de máquinas" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "identidad del par" - #: src/transport/gnunet-transport.c:1466 #, fuzzy msgid "monitor plugin sessions" @@ -7709,45 +7881,11 @@ msgstr "# sesiones wlan pendientes" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "enviar data para prueba a otro par (hasta CTRL-C)" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -msgid "Direct access to transport service." -msgstr "Acceso directo al servicio de transporte." - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# respuestas recibidas de otros pares" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Otras configuraciones" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "número de mensajes a usar por iteración" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "tamaño del mensaje" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7826,7 +7964,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" @@ -7941,7 +8079,7 @@ msgstr "Longitud de dirección inesperada: %u bytes\n" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 msgid "# TCP sessions active" msgstr "# Sesiones TCP activas" @@ -7978,73 +8116,56 @@ msgstr "# peticiones de desconexión del servicio de transporte por TCP" msgid "# TCP WELCOME messages received" msgstr "# Mensajes «WELCOME» TCP recibidos" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "# bytes recibidos vía TCP" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr "# conexiones «stream» activas" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 #, fuzzy msgid "# TCP server connect events" msgstr "# Pares conectados" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "# eventos de desconexión TCP a nivel de red" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 msgid "Failed to start service.\n" msgstr "Se produjo un fallo al iniciar el servicio.\n" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "Transporte TCP escuchando en el puerto %llu\n" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "El transporte TCP anuncia que está en el puerto %llu\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" -"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el " -"«socket» en el puerto %d\n" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " @@ -8053,7 +8174,7 @@ msgstr "" "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " "compruebe su configuración de red\n" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 #, fuzzy msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " @@ -8063,41 +8184,58 @@ msgstr "" "configuración de red y deshabilite IPv6 si su conexión carece de una " "dirección IPv6 global\n" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 #, fuzzy msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 msgid "Failed to open UDP sockets\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Se produjo un fallo al crear una nueva firma" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" +"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el " +"«socket» en el puerto %d\n" + #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8217,7 +8355,7 @@ msgstr "" "El código de procesado para el mensaje del tipo %u no llamó a " "«GNUNET_SERVER_receive_done» después de %s\n" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, c-format msgid "Unknown address family %d\n" msgstr "Familia de direcciones %d desconocida\n" @@ -8279,7 +8417,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "El proceso del servicio no devolvió un estado\n" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -8298,19 +8436,19 @@ msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n" msgid "do daemonize (detach from terminal)" msgstr "demonizar (desasociar del terminal)" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, c-format msgid "Could not access configuration file `%s'\n" @@ -8321,61 +8459,61 @@ msgstr "No se pudo acceder al fichero de configuración «%s»\n" msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, c-format msgid "Error reading `%s': %s" msgstr "Error leyendo «%s»: %s" -#: src/util/bio.c:187 +#: src/util/bio.c:191 msgid "End of file" msgstr "Fin del fichero" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "Se produjo un error leyendo la cadena «%s»" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "Se produjo un fallo al deserializar los metadatos «%s»" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "DEPURACIÓN" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "INFORMACIÓN" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "MENSAJE" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "PELIGRO" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "ERROR" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "NINGUNO" @@ -8384,24 +8522,24 @@ msgstr "NINGUNO" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "NO VÁLIDO" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "dirección desconocida" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "dirección no válida" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8414,12 +8552,12 @@ msgstr "" msgid "Syntax error while deserializing in line %u\n" msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Error decodificando clave %u\n" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " @@ -8428,24 +8566,24 @@ msgstr "" "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro " "de las opciones legales\n" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " @@ -8454,43 +8592,43 @@ msgstr "" "El tamaño del fichero en disco es incorrecto para este «Bloom " "filter» (esperado %llu, tiene %llu)\n" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "No se pudo bloquear el fichero «%s»: %s...\n" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 msgid "Creating a new private key. This may take a while.\n" msgstr "Generando una clave privada nueva. Esto puede tomar un tiempo.\n" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" "Esto puede estar bien si alguien está actualmente generando una clave " "privada.\n" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" @@ -8498,13 +8636,13 @@ msgstr "" "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes " "pero al menos %u son necesarios.\n" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" "Esto puede ser correcto si alguien está actualmente generando una clave de " "máquina.\n" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 #, fuzzy msgid "Could not load peer's private key\n" msgstr "No se pudo acceder a la clave de máquina.\n" @@ -8514,12 +8652,12 @@ msgstr "No se pudo acceder a la clave de máquina.\n" msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" @@ -8594,11 +8732,11 @@ msgstr "Use %s para obtener una lista de opciones.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "imprime el número de versión" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8606,94 +8744,100 @@ msgstr "" "Los parámetros obligatorios para las opciones largas también lo son para sus " "versiones cortas.\n" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "imprime esta ayuda" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "crear ficheros de configuración únicos" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Tienes que introducir un número en la opción «%s».\n" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Debes introducir un tiempo relativo en la opción «%s».\n" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Debes introducir un tiempo relativo en la opción «%s».\n" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, fuzzy, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "Tienes que introducir un número en la opción «%s».\n" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, c-format msgid "--section argument is required\n" msgstr "el parámetro --section es necesario\n" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "el parámetro --option es necesario para establecer un valor\n" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" "obtener la opción del valor como un nombre de fichero (con expansión del $)" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "nombre de la sección a la que acceder" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 msgid "name of the option to access" msgstr "nombre de la opción a la que acceder" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "valor a establecer" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 #, fuzzy msgid "print available configuration sections" msgstr "Falta configuración sobre las opciones de claves.\n" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 msgid "Manipulate GNUnet configuration files" msgstr "Manipular ficheros de configuración de GNUnet" @@ -8735,64 +8879,64 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "El fichero de máquinas %s no fue encontrado\n" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "El archivo de amigos «%s» está vacío.\n" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "¡No se puede leer el fichero de claves de máquina!\n" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "No se ha especificado la clave de máquina en la línea de comandos\n" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 #, fuzzy msgid "print the private key in ASCII format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 #, fuzzy msgid "print the public key in HEX format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 msgid "Manipulate GNUnet private ECC key files" msgstr "Manipular los ficheros de clave privada ECC de GNUnet" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "realizar una búsqueda inversa" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "Utilizar el resolvedor interno para pruebas de GNUnet" @@ -8874,12 +9018,12 @@ msgstr "" msgid "Error writing to `%s': %s\n" msgstr "Error escribiendo a «%s»: %s\n" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" @@ -8887,7 +9031,7 @@ msgstr "" "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con " "CTRL-C)!\n" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " @@ -8896,22 +9040,22 @@ msgstr "" "No se pudo determinar la ruta de instalación de %s. Establezca la variable " "de entorno «%s».\n" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "«%s» falló para el puerto %d (%s).\n" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8941,7 +9085,7 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -8950,12 +9094,12 @@ msgstr "" "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en " "la configuración!\n" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n" @@ -8963,13 +9107,13 @@ msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n" # Miguel: He traducido "default" por "predeterminado", la locución # "por defecto" no tiene sentido en sitios como este y he tratado # de ser consistente. -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 #, fuzzy msgid "Resolver not configured correctly.\n" msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "" @@ -8980,7 +9124,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, fuzzy, c-format msgid "" "Processing code for message of type %u did not call " @@ -9059,67 +9203,67 @@ msgstr "días" msgid "end of time" msgstr "fin del plazo" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "La dirección IPv6 no empezaba con «[»\n" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" "La dirección IPv6 contenía «]» antes de «:» para separar el número de " "puerto\n" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" "La dirección IPv6 contenía un número de puerto válido después del último " "«:»\n" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Dirección IPv6 «%s» no válida: %s\n" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Formato no válido para la IP: «%s»\n" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)." -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Formato de tiempo no válido «%s»\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Notación de red no válida (no termina con «;»: «%s»)\n" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Formato «%s» erroneo para máscara de red\n" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, c-format msgid "Wrong format `%s' for network\n" msgstr "Formato «%s» erroneo para red\n" @@ -9300,26 +9444,70 @@ msgstr "el servicio es ofrecido vía UDP" msgid "Setup tunnels via VPN." msgstr "Configurar túneles vía VPN." -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 msgid "Failed to connect to the namestore!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "Aserción fallida en %s:%d.\n" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Violación externa del protocolo detectada en %s:%d.\n" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" +#~ msgid "PUT request sent with key" +#~ msgstr "Petición «PUT» enviada con clave" + +#~ msgid "Timeout sending PUT request!\n" +#~ msgstr "¡Expiró el plazo enviando una petición «PUT»!\n" + +#~ msgid "PUT request not confirmed!\n" +#~ msgstr "¡Petición «PUT» no confirmada!\n" + +#~ msgid "Could not connect to %s service!\n" +#~ msgstr "¡No se pudo conectar al servicio %s!\n" + +#~ msgid "Configured DNS exit `%s' is not working / valid.\n" +#~ msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n" + +#, fuzzy +#~ msgid "No valid GNS zone specified!\n" +#~ msgstr "¡Ninguna palabra clave especificada!\n" + +#~ msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" +#~ msgstr "" +#~ "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu" + +#~ msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" +#~ msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu" + +#, fuzzy +#~ msgid "Specify timeout for the lookup" +#~ msgstr "Especificar el tipo del registro a buscar" + +#, fuzzy +#~ msgid "Specify the name of the ego of the zone to lookup the record in" +#~ msgstr "Especificar el tipo del registro a buscar" + +#, fuzzy +#~ msgid "No ego configured for `%s`\n" +#~ msgstr "" +#~ "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n" + +#, fuzzy +#~ msgid "Token `%s' is malformed\n" +#~ msgstr "El bloque del tipo %u está mal formado\n" + #~ msgid "Failed to create indices\n" #~ msgstr "Se produjo un fallo al crear los índices\n" @@ -10016,10 +10204,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" #~ msgid "Insufficient space for publishing: %s" #~ msgstr "Espacio insuficiente para publicar: %s" -#, fuzzy -#~ msgid "valid public key required" -#~ msgstr "Tipo requerido\n" - #~ msgid "Failed to create or access directory for log file `%s'\n" #~ msgstr "" #~ "Se produjo un fallo al crear o acceder al directorio para el fichero de " @@ -11845,9 +12029,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" #~ "Usuario desconocido «%s». Asegurese de especificar su sufíjo numérico, en " #~ "el caso de que lo haya.\n" -#~ msgid "how long to execute? 0 = forever" -#~ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre" - #~ msgid "Lookup a record using GNS (NOT IMPLEMENTED)" #~ msgstr "Busca un registro usando GNS (NO IMPLEMENTADO)" diff --git a/po/fr.po b/po/fr.po index e8cb288972..9789dc3141 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2015-12-24 01:20+0100\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -230,7 +230,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -239,14 +239,14 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format msgid "Using `%s' instead\n" @@ -348,131 +348,14 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" -msgstr "solveur utilisé" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -msgid "print logging" -msgstr "afficher le journal" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1913 -#, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "fornat invalide : « %s »\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "Arrêter la journalisation\n" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats-tests/ats-testing-log.c:892 #, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "fornat invalide : « %s »\n" +msgid "Start logging `%s'\n" +msgstr "Démarrer la journalisation « %s »\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -484,15 +367,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "Arrêter la journalisation\n" - -#: src/ats-tests/ats-testing-log.c:892 -#, c-format -msgid "Start logging `%s'\n" -msgstr "Démarrer la journalisation « %s »\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -500,6 +374,15 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +msgid "solver to use" +msgstr "solveur utilisé" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -615,6 +498,123 @@ msgstr "" msgid "Print information about ATS state" msgstr "" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +msgid "print logging" +msgstr "afficher le journal" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1913 +#, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "fornat invalide : « %s »\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "fornat invalide : « %s »\n" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -748,288 +748,288 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 msgid "Failed to setup phone (internal error)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, c-format msgid "Connection established to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, c-format msgid "Failed to resolve `%s'\n" msgstr "Résolution de « %s » échouée\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, fuzzy, c-format msgid "Call to `%s' terminated\n" msgstr "Appel terminé\n" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, c-format msgid "Unknown command `%s'\n" msgstr "Commande « %s » inconnue\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, c-format msgid "#%u: `%s'\n" msgstr "#%u : « %s »\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 msgid "Use `/quit' to terminate gnunet-conversation" msgstr "" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, c-format msgid "Name of our ego changed to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, c-format msgid "Our ego `%s' was deleted!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 msgid "You must specify the NAME of an ego to use\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 msgid "Failed to start gnunet-helper-w32-console\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1279 +#: src/conversation/gnunet-conversation.c:1300 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1306 +#: src/conversation/gnunet-conversation.c:1329 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1264,127 +1264,135 @@ msgstr "" msgid "Core service of `%s' ready.\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 msgid "# PING messages transmitted" msgstr "" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 -msgid "# ephemeral keys received" +#: src/core/gnunet-service-core_kx.c:1005 +msgid "# duplicate ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1040 +msgid "# EPHEMERAL_KEYs rejected (bad signature)" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 -msgid "# EPHEMERAL_KEY messages received" +#: src/core/gnunet-service-core_kx.c:1060 +msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1080 +msgid "# valid ephemeral keys received" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 msgid "# PING messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 msgid "# PING messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 msgid "# PONG messages created" msgstr "" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 msgid "# keepalive messages sent" msgstr "" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 msgid "# PONG messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 msgid "# PONG messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 msgid "# PONG messages decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 msgid "# session keys confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1360 +#: src/core/gnunet-service-core_kx.c:1447 msgid "# timeouts prevented via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1367 +#: src/core/gnunet-service-core_kx.c:1454 msgid "# rekey operations confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1521 +#: src/core/gnunet-service-core_kx.c:1642 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1529 +#: src/core/gnunet-service-core_kx.c:1650 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 +#: src/core/gnunet-service-core_kx.c:1653 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 msgid "# bytes dropped (duplicates)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1606 +#: src/core/gnunet-service-core_kx.c:1755 msgid "# bytes dropped (out of sequence)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1648 +#: src/core/gnunet-service-core_kx.c:1797 msgid "# bytes dropped (ancient message)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1656 +#: src/core/gnunet-service-core_kx.c:1805 msgid "# bytes of payload decrypted" msgstr "" @@ -1392,11 +1400,11 @@ msgstr "" #: src/core/gnunet-service-core_sessions.c:350 #: src/dht/gnunet-service-dht_neighbours.c:733 #: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 msgid "# peers connected" msgstr "" @@ -1421,52 +1429,180 @@ msgstr "" msgid "# updates to my type map" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/credential/credential_misc.c:88 +#, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, c-format +msgid "Issuer public key not well-formed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "Impossible d’ouvrir « %s ».\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, c-format +msgid "ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, c-format +msgid "Issuer ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:516 +#, c-format +msgid "Please specify name to lookup, subject key and issuer key!\n" +msgstr "" + +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" + +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" + +#: src/credential/gnunet-credential.c:545 +msgid "The public key of the subject to lookup the credential for" +msgstr "" + +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" +msgstr "" + +#: src/credential/gnunet-credential.c:555 +msgid "The public key of the authority to verify the credential against" +msgstr "" + +#: src/credential/gnunet-credential.c:560 +msgid "The ego to use" +msgstr "" + +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" +msgstr "" + +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" + +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" + +#: src/credential/gnunet-credential.c:588 +msgid "GNUnet credential resolver tool" +msgstr "" + +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, c-format +msgid "Failed to connect to GNS\n" +msgstr "" + +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, c-format +msgid "Failed to connect to namestore\n" +msgstr "" + +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "Résolution de « %s » échouée\n" + +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +msgid "GNS REST API initialized\n" +msgstr "" + +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 msgid "# bytes stored" msgstr "" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 msgid "# items stored" msgstr "" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 msgid "# requests received" msgstr "" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 msgid "# requests for random value received" msgstr "" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 msgid "# proximity search requests received" msgstr "" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1475,16 +1611,17 @@ msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" @@ -1770,7 +1907,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 msgid "Data too large" msgstr "" @@ -1807,32 +1944,34 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 msgid "Sqlite database running\n" msgstr "" @@ -1840,7 +1979,7 @@ msgstr "" msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" @@ -1849,148 +1988,98 @@ msgstr "" "Resultat %d, type %d :\n" "%.*s\n" +#: src/dht/gnunet-dht-get.c:159 +#, fuzzy, c-format +msgid "Result %d, type %d:\n" +msgstr "" +"Resultat %d, type %d :\n" +"%.*s\n" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 msgid "Failed to connect to DHT service!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1188 -#, fuzzy -msgid "number of peers to start" -msgstr "nombre de valeurs" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -msgid "Measure quality and performance of the DHT service." -msgstr "" - -#: src/dht/gnunet-dht-put.c:120 -msgid "PUT request sent with key" -msgstr "" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:126 -msgid "PUT request not confirmed!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:163 -#, c-format -msgid "Could not connect to %s service!\n" -msgstr "" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" +msgstr "Impossible d’ouvrir « %s ».\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" @@ -1998,74 +2087,74 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 msgid "# PUT requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 msgid "# GET requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 msgid "# GET STOP requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 msgid "# GET requests given to datacache" msgstr "" @@ -2193,16 +2282,63 @@ msgstr "" msgid "# DHT requests combined" msgstr "" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "nombre de valeurs" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +msgid "Measure quality and performance of the DHT service." +msgstr "" + +#: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" msgstr "" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "" @@ -2212,34 +2348,29 @@ msgstr "" msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, c-format msgid "Could not bind to any port: %s\n" msgstr "" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 -#, c-format -msgid "Failed to send DNS request to %s\n" -msgstr "" - -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:364 #, c-format -msgid "Sent DNS request to %s\n" +msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "" +#: src/dns/dnsstub.c:511 +#, fuzzy, c-format +msgid "Failed to send DNS request to %s: %s\n" +msgstr "Résolution de « %s » échouée : %s\n" -#: src/dns/dnsstub.c:437 +#: src/dns/dnsstub.c:517 #, c-format -msgid "Received DNS response that is too small (%u bytes)" +msgid "Sent DNS request to %s\n" msgstr "" #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 @@ -2266,48 +2397,48 @@ msgstr "" msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 msgid "need a valid IPv4 or IPv6 address\n" msgstr "" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" @@ -2316,198 +2447,198 @@ msgstr "" msgid "Print information about DV state" msgstr "" -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 msgid "# TCP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 msgid "# ICMP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 msgid "# UDP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 msgid "# Bytes received from CADET" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 msgid "# UDP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 msgid "# UDP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 msgid "# TCP service creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 msgid "# TCP IP-exit creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 msgid "# TCP DATA requests dropped (no session)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 msgid "# TCP data requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 msgid "# ICMP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 msgid "# ICMP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 msgid "# Inbound CADET channels created" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 msgid "# Messages transmitted via cadet channels" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 msgid "# Packets received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 msgid "# Bytes received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "Doit être un nombre" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" @@ -2633,63 +2764,63 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, c-format msgid "Failed to open file `%s' for writing" msgstr "" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, c-format msgid "Download failed: could not open file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 msgid "internal error decoding tree" msgstr "" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 msgid "Invalid URI" msgstr "URI invalide" @@ -2802,12 +2933,12 @@ msgstr "" msgid "Internal error." msgstr "Erreur interne." -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -2854,93 +2985,93 @@ msgstr "" msgid "Failed to compute hash of file." msgstr "" -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "Argument invalide « %s »\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "Type d’URI non reconnu" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "" @@ -2980,19 +3111,19 @@ msgstr "" msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "" @@ -3037,101 +3168,93 @@ msgstr "" msgid "Display contents of a GNUnet directory" msgstr "" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, c-format msgid "Starting download `%s'.\n" msgstr "" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 msgid "" msgstr "" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, c-format msgid "Error downloading: %s.\n" msgstr "" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "" -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 msgid "You need to specify a URI argument.\n" msgstr "" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, c-format msgid "Failed to parse URI: %s\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:339 -msgid "download a GNUnet directory recursively" -msgstr "" - -#: src/fs/gnunet-download.c:356 -msgid "" -"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" -"chk/...)" -msgstr "" - -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" +#: src/fs/gnunet-download.c:368 +msgid "download a GNUnet directory recursively" msgstr "" -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" +#: src/fs/gnunet-download.c:386 +msgid "" +"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" +"chk/...)" msgstr "" #: src/fs/gnunet-fs-profiler.c:211 @@ -3150,6 +3273,14 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" +msgstr "" + #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3279,56 +3410,56 @@ msgstr "" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "" @@ -3400,7 +3531,7 @@ msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, c-format msgid "Failed to connect to `%s' service.\n" msgstr "" @@ -3444,7 +3575,7 @@ msgstr "" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "" @@ -3492,19 +3623,19 @@ msgstr "" msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 msgid "# requests dropped due to full reply queue" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 msgid "# P2P query messages received and processed" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 msgid "# migration stop messages sent" msgstr "" @@ -3712,6 +3843,10 @@ msgstr "" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -3740,126 +3875,63 @@ msgstr "" msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:238 +#: src/gns/gnunet-dns2gns.c:203 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:408 +#: src/gns/gnunet-dns2gns.c:404 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:424 +#: src/gns/gnunet-dns2gns.c:420 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:428 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 +#: src/gns/gnunet-dns2gns.c:587 msgid "No DNS server specified!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:760 -msgid "No valid GNS zone specified!\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:784 +#: src/gns/gnunet-dns2gns.c:687 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:802 +#: src/gns/gnunet-dns2gns.c:692 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" +#: src/gns/gnunet-dns2gns.c:709 +msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-dns2gns.c:826 -msgid "GNUnet DNS-to-GNS proxy (a DNS server)" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +#: src/gns/gnunet-gns-benchmark.c:587 +msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:276 -#, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +#: src/gns/gnunet-gns-helper-service-w32.c:602 +msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 -#, c-format -msgid "Failed to connect to GNS\n" -msgstr "" - -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" - -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:434 -msgid "Specify the type of the record to lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:440 -msgid "Specify timeout for the lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:451 -msgid "Specify the public key of the zone to lookup the record in" -msgstr "" - -#: src/gns/gnunet-gns.c:457 -msgid "Specify the name of the ego of the zone to lookup the record in" -msgstr "" - -#: src/gns/gnunet-gns.c:476 -msgid "GNUnet GNS resolver tool" -msgstr "" - -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" -msgstr "" - #: src/gns/gnunet-gns-helper-service-w32.c:739 #, c-format msgid "Failed to connect to identity service\n" @@ -3870,223 +3942,230 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:887 +#: src/gns/gnunet-gns-proxy.c:910 #, c-format -msgid "Unsupported CURL SSL backend %d\n" +msgid "Unsupported CURL TLS backend %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:933 #, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, c-format msgid "Failed to initialize DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, c-format msgid "Failed to parse DANE record: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, c-format msgid "Unable to import certificate %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 msgid "Failed to pass client to MHD\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, c-format msgid "Unsupported socks command %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, c-format -msgid "No ego configured for `%s`\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +msgid "GNUnet GNS resolver tool" +msgstr "" + +#: src/gns/gnunet-service-gns.c:513 +msgid "Properly base32-encoded public key required" +msgstr "" + +#: src/gns/gnunet-service-gns.c:549 msgid "Failed to connect to the namecache!\n" msgstr "" -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 msgid "Could not connect to DHT!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 msgid "Failed to connect to the DNS service!\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 msgid "Failed to parse DNS response\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -msgid "GNS REST API initialized\n" -msgstr "" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4251,150 +4330,150 @@ msgstr "" msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 msgid "# active connections" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4412,7 +4491,7 @@ msgstr "" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" @@ -4506,6 +4585,68 @@ msgstr "" msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +msgid "Ego is required\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +msgid "Requesting party key is required!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Échec du démarrage de %s\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +msgid "Identity Provider REST API initialized\n" +msgstr "" + #: src/identity/gnunet-identity.c:179 #, c-format msgid "Failed to create ego: %s\n" @@ -4593,31 +4734,10 @@ msgstr "" msgid "Failed to create directory `%s' for storing egos\n" msgstr "" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-identity-token.c:66 -msgid "Option `-t' is required\n" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, c-format -msgid "Token `%s' is malformed\n" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -msgid "Identity Token REST API initialized\n" -msgstr "" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4647,7 +4767,7 @@ msgstr "" msgid "No records found for `%s'" msgstr "" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" @@ -4667,7 +4787,7 @@ msgstr "fornat invalide : « %s »\n" msgid "You must specify a name\n" msgstr "" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "" @@ -4675,7 +4795,7 @@ msgstr "" msgid "spezifies the public key of the zone to look in" msgstr "" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 msgid "GNUnet zone manipulation tool" msgstr "" @@ -4687,280 +4807,287 @@ msgstr "" msgid "Error communicating with namecache service" msgstr "" -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, c-format msgid "Unable to initialize file: %s.\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, c-format msgid "Unable to get filesize: %s.\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Résolution de « %s » échouée\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore.c:301 +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, c-format +msgid "Unsupported form value `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, c-format +msgid "Failed to create page for `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +msgid "Failed to start HTTP server\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +msgid "Failed to connect to identity\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + +#: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 #, c-format -msgid "There are no records under label `%s' that could be deleted.\n" +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format -msgid "" -"There are no records under label `%s' that match the request for deletion.\n" +msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 +#: src/namestore/gnunet-namestore.c:851 #, c-format -msgid "Ego `%s' not known to identity service\n" +msgid "" +"There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -msgid "Failed to connect to namestore\n" -msgstr "" - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "ajouter" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, c-format msgid "Unsupported type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, c-format msgid "Invalid time format `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "supprimer" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, c-format msgid "Invalid URI `%s'\n" msgstr "URI invalide « %s »\n" -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, c-format msgid "Invalid nick `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, c-format msgid "Cannot connect to identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "ajouter un enregistrement" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "suprimer un enregistrement" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "afficher les enregistrements" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 msgid "set the desired nick name for the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 msgid "monitor changes in the namestore" msgstr "" -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 msgid "determine our name for the given PKEY" msgstr "" -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1201 -msgid "create or list public record" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1206 -msgid "" -"create shadow record (only valid if all other records of the same type have " -"expired" -msgstr "" - -#: src/namestore/gnunet-namestore.c:1212 -msgid "name of the ego controlling the zone" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, c-format -msgid "Unsupported form value `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 -#, c-format -msgid "Failed to create page for `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:734 -#, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -msgid "Failed to start HTTP server\n" +#: src/namestore/gnunet-namestore.c:1315 +msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -msgid "Failed to connect to identity\n" +#: src/namestore/gnunet-namestore.c:1319 +msgid "" +"create shadow record (only valid if all other records of the same type have " +"expired" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -msgid "GNU Name System First Come First Serve name registration service" +#: src/namestore/gnunet-namestore.c:1324 +msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-service-namestore.c:615 +#: src/namestore/gnunet-service-namestore.c:750 #, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "" -#: src/namestore/namestore_api.c:379 +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" +msgstr "" + +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" +msgstr "" + +#: src/namestore/namestore_api.c:391 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 msgid "flat file database running\n" msgstr "" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "Échec du démarrage de %s\n" + +#: src/namestore/plugin_rest_namestore.c:1206 msgid "Namestore REST API initialized\n" msgstr "" @@ -4987,11 +5114,11 @@ msgstr "fornat invalide : « %s »\n" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5161,57 +5288,57 @@ msgstr "Résolution de « %s » échouée : %s\n" msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 msgid "Connection reversal request failed\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5235,91 +5362,37 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:842 +#: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:847 +#: src/nse/gnunet-nse-profiler.c:854 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:859 +#: src/nse/gnunet-nse-profiler.c:866 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:873 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:877 +#: src/nse/gnunet-nse-profiler.c:884 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:886 +#: src/nse/gnunet-nse-profiler.c:893 msgid "Measure quality and performance of the NSE service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, c-format -msgid "Scanning directory `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." msgstr "" -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" msgstr "" #: src/peerinfo-tool/gnunet-peerinfo.c:239 @@ -5411,6 +5484,60 @@ msgstr "" msgid "Failed to load transport plugin for `%s'\n" msgstr "" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, c-format +msgid "Scanning directory `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." +msgstr "" + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -5696,11 +5823,11 @@ msgstr "" msgid "Search string `%s' is too long!\n" msgstr "" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 msgid "GNUnet REST server" msgstr "" @@ -5826,18 +5953,21 @@ msgid "# revocation set unions completed" msgstr "" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 msgid "Could not open revocation database file!" msgstr "" -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 msgid "You must specify at least one message ID to check!\n" msgstr "" @@ -5892,10 +6022,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 msgid "Connect to CADET failed\n" msgstr "" @@ -6264,14 +6394,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" @@ -6341,15 +6471,6 @@ msgstr "" msgid "%.s Unknown result code." msgstr "%.s Code d'erreur inconnu" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -msgid "Waiting for child to exit.\n" -msgstr "" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, c-format -msgid "Spawning process `%s'\n" -msgstr "" - #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6361,6 +6482,15 @@ msgid "" "signal is received" msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +msgid "Waiting for child to exit.\n" +msgstr "" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, c-format +msgid "Spawning process `%s'\n" +msgstr "" + #: src/testbed/testbed_api.c:410 #, c-format msgid "Adding host %u failed with error: %s\n" @@ -6579,79 +6709,75 @@ msgstr "" msgid "Failed to load configuration from %s\n" msgstr "" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 msgid "# connect requests issued to ATS" msgstr "" -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 msgid "# friends connected" msgstr "" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, c-format msgid "Found friend `%s' in configuration\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 msgid "# friends in configuration" msgstr "" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 msgid "# HELLO messages received" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -6696,195 +6822,199 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 #, fuzzy msgid "# session creation failed" msgstr "# Session TCP active" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 msgid "# DISCONNECT messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 msgid "# messages transmitted to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Résolution de « %s » échouée\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 msgid "# SYN messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Échec du démarrage de %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 msgid "# SYN_ACK messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Échec du démarrage de %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 msgid "# SYN messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 msgid "# SYN_ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 msgid "# unexpected SYN_ACK messages (no peer)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 msgid "# unexpected SYN_ACK messages (not ready)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 msgid "# ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 msgid "# unexpected ACK messages" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 msgid "# quota messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 msgid "# QUOTA messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 msgid "# DISCONNECT messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 msgid "# disconnected from peer upon explicit request" msgstr "" @@ -6997,6 +7127,46 @@ msgstr "" msgid "# validations succeeded" msgstr "" +#: src/transport/gnunet-service-transport_validation.c:1627 +msgid "# HELLOs given to peerinfo" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +msgid "receive data from peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "nombre de valeurs" + +#: src/transport/gnunet-transport-profiler.c:636 +msgid "message size to use" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +msgid "Direct access to transport service." +msgstr "" + #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7125,11 +7295,6 @@ msgstr "" msgid "do not resolve hostnames" msgstr "" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "" - #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7138,42 +7303,11 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -msgid "Direct access to transport service." -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -msgid "receive data from peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "nombre de valeurs" - -#: src/transport/gnunet-transport-profiler.c:636 -msgid "message size to use" -msgstr "" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7242,7 +7376,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7349,7 +7483,7 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 msgid "# TCP sessions active" msgstr "# Session TCP active" @@ -7386,114 +7520,114 @@ msgstr "" msgid "# TCP WELCOME messages received" msgstr "" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr "# Session TCP active" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 msgid "# TCP server connect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 msgid "Failed to start service.\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -msgid "# Multicast HELLO beacons received via UDP" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 msgid "Failed to open UDP sockets\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "adresse invalide" -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "adresse invalide" -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 msgid "Failed to create UDP network sockets\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +msgid "# Multicast HELLO beacons received via UDP" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_unix.c:1403 #, c-format msgid "Cannot create path to `%s'\n" @@ -7598,7 +7732,7 @@ msgid "" "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, c-format msgid "Unknown address family %d\n" msgstr "" @@ -7655,7 +7789,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -7674,18 +7808,18 @@ msgstr "" msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 msgid "Malformed configuration, exit ...\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, c-format msgid "Could not access configuration file `%s'\n" @@ -7696,61 +7830,61 @@ msgstr "" msgid "Bad mask: %d\n" msgstr "Masque érroné : %d\n" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, c-format msgid "Error reading `%s': %s" msgstr "Erreur de lecture : « %s » : %s" -#: src/util/bio.c:187 +#: src/util/bio.c:191 msgid "End of file" msgstr "Fin de fichier" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "DEBUG" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "AVERTISSEMENT" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "ERREUR" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "AUCUN" @@ -7759,24 +7893,24 @@ msgstr "AUCUN" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "INVALIDE" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "adresse inconnue" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "adresse invalide" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -7787,87 +7921,87 @@ msgstr "" msgid "Syntax error while deserializing in line %u\n" msgstr "" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Erreur de lecture : « %s » : %s" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 msgid "Creating a new private key. This may take a while.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 msgid "Could not load peer's private key\n" msgstr "" @@ -7876,12 +8010,12 @@ msgstr "" msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "" @@ -7956,102 +8090,108 @@ msgstr "" msgid "Missing mandatory option `%s'.\n" msgstr "" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" msgstr "" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "fornat invalide : « %s »\n" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "fornat invalide : « %s »\n" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 msgid "print available configuration sections" msgstr "" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 msgid "Manipulate GNUnet configuration files" msgstr "" @@ -8093,62 +8233,62 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, c-format msgid "Hostkeys file `%s' not found\n" msgstr "" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, c-format msgid "Could not read hostkey file: %s\n" msgstr "" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 msgid "Manipulate GNUnet private ECC key files" msgstr "" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "" @@ -8227,40 +8367,40 @@ msgstr "" msgid "Error writing to `%s': %s\n" msgstr "" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8290,29 +8430,29 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Résolution de « %s » échouée : %s\n" @@ -8322,7 +8462,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8397,63 +8537,63 @@ msgstr "jours" msgid "end of time" msgstr "fin du temps" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, c-format msgid "Malformed port policy `%s'\n" msgstr "" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "" -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, c-format msgid "Invalid format: `%s'\n" msgstr "fornat invalide : « %s »\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, c-format msgid "Wrong format `%s' for network\n" msgstr "" @@ -8622,22 +8762,23 @@ msgstr "" msgid "Setup tunnels via VPN." msgstr "Configurer des tunnels via VPN." -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 msgid "Failed to connect to the namestore!\n" msgstr "" -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" @@ -8723,10 +8864,6 @@ msgstr "" #~ msgid "Failed to start resolver!\n" #~ msgstr "Échec du démarrage de %s\n" -#, fuzzy -#~ msgid "Failed to start NAT test for plugin `%s'\n" -#~ msgstr "Résolution de « %s » échouée\n" - #~ msgid "Benchmarking done\n" #~ msgstr "Benchmark terminé\n" diff --git a/po/sv.po b/po/sv.po index fe90229905..e7f91eb35a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0b\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -236,7 +236,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -245,14 +245,14 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format msgid "Using `%s' instead\n" @@ -355,132 +355,14 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "Startade samling \"%s\".\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "Kunde inte initiera SQLite.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Kunde inte spara konfigurationsfil \"%s\":" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats-tests/ats-testing-log.c:892 #, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Kunde inte spara konfigurationsfil \"%s\":" +msgid "Start logging `%s'\n" +msgstr "Startade samling \"%s\".\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -492,15 +374,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "" - -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Startade samling \"%s\".\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -508,6 +381,15 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +msgid "solver to use" +msgstr "" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -629,6 +511,124 @@ msgstr "" msgid "Print information about ATS state" msgstr "Skriv ut information om GNUnets motparter." +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" +msgstr "Startade samling \"%s\".\n" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "Kunde inte initiera SQLite.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Kunde inte spara konfigurationsfil \"%s\":" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Kunde inte spara konfigurationsfil \"%s\":" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -772,292 +772,292 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "Okänd operation \"%s\"\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "tillåter klienter att fastställa gnunetds konfiguration" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Pseudonym \"%s\" togs bort.\n" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Du måste ange en lista av filer att lägga in.\n" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Misslyckades att starta samling.\n" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1279 +#: src/conversation/gnunet-conversation.c:1300 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1306 +#: src/conversation/gnunet-conversation.c:1329 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1310,240 +1310,383 @@ msgstr "GNUnet-konfiguration" msgid "Core service of `%s' ready.\n" msgstr "\"%s\" är inte en fil.\n" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "# byte krypterade" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "# byte dekrypterade" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 #, fuzzy msgid "# PING messages transmitted" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 +#: src/core/gnunet-service-core_kx.c:1005 #, fuzzy -msgid "# ephemeral keys received" +msgid "# duplicate ephemeral keys ignored" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1040 +#, fuzzy +msgid "# EPHEMERAL_KEYs rejected (bad signature)" +msgstr "# PING-meddelanden skapade" + +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 +#: src/core/gnunet-service-core_kx.c:1060 #, fuzzy -msgid "# EPHEMERAL_KEY messages received" +msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1080 +#, fuzzy +msgid "# valid ephemeral keys received" +msgstr "# krypterade PONG-meddelanden mottagna" + +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 #, fuzzy msgid "# PING messages received" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 #, fuzzy msgid "# PONG messages created" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 #, fuzzy msgid "# sessions terminated by timeout" msgstr "# byte kastade via TCP (utgående)" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 #, fuzzy msgid "# keepalive messages sent" msgstr "# PING-meddelanden i klartext skickade" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 #, fuzzy msgid "# PONG messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 #, fuzzy msgid "# PONG messages decrypted" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# sessionnycklar vägrade" -#: src/core/gnunet-service-core_kx.c:1360 +#: src/core/gnunet-service-core_kx.c:1447 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# byte mottogs via TCP" -#: src/core/gnunet-service-core_kx.c:1367 +#: src/core/gnunet-service-core_kx.c:1454 #, fuzzy msgid "# rekey operations confirmed via PONG" msgstr "# sessionnycklar vägrade" -#: src/core/gnunet-service-core_kx.c:1521 -#, fuzzy -msgid "# DATA message dropped (out of order)" -msgstr "# byte kastade via UDP (utgående)" +#: src/core/gnunet-service-core_kx.c:1642 +#, fuzzy +msgid "# DATA message dropped (out of order)" +msgstr "# byte kastade via UDP (utgående)" + +#: src/core/gnunet-service-core_kx.c:1650 +#, c-format +msgid "" +"Session to peer `%s' went down due to key expiration (should not happen)\n" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1653 +#, fuzzy +msgid "# sessions terminated by key expiration" +msgstr "# byte kastade via TCP (utgående)" + +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 +#, fuzzy +msgid "# bytes dropped (duplicates)" +msgstr "# byte kastade via UDP (utgående)" + +#: src/core/gnunet-service-core_kx.c:1755 +#, fuzzy +msgid "# bytes dropped (out of sequence)" +msgstr "# byte kastade via UDP (utgående)" + +#: src/core/gnunet-service-core_kx.c:1797 +#, fuzzy +msgid "# bytes dropped (ancient message)" +msgstr "# byte kastade via UDP (utgående)" + +#: src/core/gnunet-service-core_kx.c:1805 +#, fuzzy +msgid "# bytes of payload decrypted" +msgstr "# byte dekrypterade" + +#: src/core/gnunet-service-core_sessions.c:260 +#: src/core/gnunet-service-core_sessions.c:350 +#: src/dht/gnunet-service-dht_neighbours.c:733 +#: src/dht/gnunet-service-dht_neighbours.c:795 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 +#, fuzzy +msgid "# peers connected" +msgstr "# av anslutna parter" + +#: src/core/gnunet-service-core_sessions.c:296 +msgid "# type map refreshes sent" +msgstr "" + +#: src/core/gnunet-service-core_sessions.c:416 +#, fuzzy +msgid "# outdated typemap confirmations received" +msgstr "Kunde inte spara konfiguration!" + +#: src/core/gnunet-service-core_sessions.c:433 +#, fuzzy +msgid "# valid typemap confirmations received" +msgstr "Kunde inte spara konfiguration!" + +#: src/core/gnunet-service-core_typemap.c:169 +#: src/core/gnunet-service-core_typemap.c:181 +#, fuzzy +msgid "# type maps received" +msgstr "# krypterade PONG-meddelanden mottagna" + +#: src/core/gnunet-service-core_typemap.c:212 +msgid "# updates to my type map" +msgstr "" + +#: src/credential/credential_misc.c:88 +#, fuzzy, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, fuzzy, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "\"%s\": okänd tjänst: %s\n" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, fuzzy, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "Ogiltigt argument: \"%s\"\n" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, fuzzy, c-format +msgid "Issuer public key not well-formed\n" +msgstr "Ogiltigt argument: \"%s\"\n" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, c-format +msgid "ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, fuzzy, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "Ogiltigt argument: \"%s\"\n" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, c-format +msgid "Issuer ego required\n" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1529 +#: src/credential/gnunet-credential.c:516 #, c-format -msgid "" -"Session to peer `%s' went down due to key expiration (should not happen)\n" +msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 -#, fuzzy -msgid "# sessions terminated by key expiration" -msgstr "# byte kastade via TCP (utgående)" +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 -#, fuzzy -msgid "# bytes dropped (duplicates)" -msgstr "# byte kastade via UDP (utgående)" +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1606 +#: src/credential/gnunet-credential.c:545 #, fuzzy -msgid "# bytes dropped (out of sequence)" -msgstr "# byte kastade via UDP (utgående)" +msgid "The public key of the subject to lookup the credential for" +msgstr "ange prioritet för innehållet" -#: src/core/gnunet-service-core_kx.c:1648 -#, fuzzy -msgid "# bytes dropped (ancient message)" -msgstr "# byte kastade via UDP (utgående)" +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1656 +#: src/credential/gnunet-credential.c:555 #, fuzzy -msgid "# bytes of payload decrypted" -msgstr "# byte dekrypterade" +msgid "The public key of the authority to verify the credential against" +msgstr "ange prioritet för innehållet" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/credential/gnunet-credential.c:560 #, fuzzy -msgid "# peers connected" -msgstr "# av anslutna parter" +msgid "The ego to use" +msgstr "meddelandestorlek" -#: src/core/gnunet-service-core_sessions.c:296 -msgid "# type map refreshes sent" +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/core/gnunet-service-core_sessions.c:416 -#, fuzzy -msgid "# outdated typemap confirmations received" -msgstr "Kunde inte spara konfiguration!" +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" -#: src/core/gnunet-service-core_sessions.c:433 -#, fuzzy -msgid "# valid typemap confirmations received" -msgstr "Kunde inte spara konfiguration!" +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/credential/gnunet-credential.c:588 #, fuzzy -msgid "# type maps received" -msgstr "# krypterade PONG-meddelanden mottagna" +msgid "GNUnet credential resolver tool" +msgstr "Spåra GNUnets nätverkstopologi." -#: src/core/gnunet-service-core_typemap.c:212 -msgid "# updates to my type map" -msgstr "" +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, fuzzy, c-format +msgid "Failed to connect to GNS\n" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, fuzzy, c-format +msgid "Failed to connect to namestore\n" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#, fuzzy +msgid "GNS REST API initialized\n" +msgstr " Anslutning misslyckades\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 #, fuzzy msgid "# bytes stored" msgstr "# byte krypterade" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 #, fuzzy msgid "# items stored" msgstr "# byte krypterade" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 #, fuzzy msgid "# requests received" msgstr "# byte mottogs via TCP" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 #, fuzzy msgid "# requests for random value received" msgstr "# byte mottogs via TCP" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 #, fuzzy msgid "# proximity search requests received" msgstr "# klartext PONG-meddelanden mottagna" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1552,16 +1695,17 @@ msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" @@ -1863,7 +2007,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 #, fuzzy msgid "Data too large" msgstr "antal iterationer" @@ -1902,32 +2046,34 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, fuzzy, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 msgid "Sqlite database running\n" msgstr "" @@ -1935,159 +2081,104 @@ msgstr "" msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" +#: src/dht/gnunet-dht-get.c:159 +#, c-format +msgid "Result %d, type %d:\n" +msgstr "" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "Maximalt antal chattklienter uppnått.\n" - -#: src/dht/gnunet_dht_profiler.c:1188 -#, fuzzy -msgid "number of peers to start" -msgstr "antal iterationer" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Kan inte tillgå tjänsten" - -#: src/dht/gnunet-dht-put.c:120 -#, fuzzy -msgid "PUT request sent with key" -msgstr "# byte mottogs via TCP" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:126 -#, fuzzy -msgid "PUT request not confirmed!\n" -msgstr "# byte mottogs via TCP" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:163 -#, fuzzy, c-format -msgid "Could not connect to %s service!\n" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" @@ -2096,78 +2187,78 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 #, fuzzy msgid "# PUT requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 #, fuzzy msgid "# GET requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 #, fuzzy msgid "# RESULTS queued for clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, fuzzy, c-format msgid "%s request received, but have no datacache!\n" msgstr "# byte mottagna av typen %d" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 #, fuzzy msgid "# GET requests given to datacache" msgstr "# byte mottogs via TCP" @@ -2315,16 +2406,64 @@ msgstr "" msgid "# DHT requests combined" msgstr "# byte mottogs via TCP" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "Maximalt antal chattklienter uppnått.\n" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "antal iterationer" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Kan inte tillgå tjänsten" + +#: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Ingen transport av typ %d är känd.\n" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "" @@ -2334,36 +2473,31 @@ msgstr "" msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "Kunde inte köra \"%s\": %s\n" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 +#: src/dns/dnsstub.c:364 +#, c-format +msgid "Received DNS response that is too small (%u bytes)" +msgstr "" + +#: src/dns/dnsstub.c:511 #, fuzzy, c-format -msgid "Failed to send DNS request to %s\n" +msgid "Failed to send DNS request to %s: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:517 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "" - -#: src/dns/dnsstub.c:437 -#, c-format -msgid "Received DNS response that is too small (%u bytes)" -msgstr "" - #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 msgid "only monitor DNS queries" msgstr "" @@ -2388,50 +2522,50 @@ msgstr "" msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 #, fuzzy msgid "# DNS requests received via TUN interface" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" @@ -2441,214 +2575,214 @@ msgstr "" msgid "Print information about DV state" msgstr "Skriv ut information om GNUnets motparter." -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 #, fuzzy msgid "# Bytes received from CADET" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# PING-meddelanden skapade" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# byte skickade av typen %d" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 #, fuzzy msgid "# Packets received from TUN" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 #, fuzzy msgid "# Bytes received from TUN" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" @@ -2781,64 +2915,64 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 #, fuzzy msgid "internal error decoding tree" msgstr "=\tFel vid läsning av katalog.\n" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 #, fuzzy msgid "Invalid URI" msgstr "Ogiltiga argument: " @@ -2961,12 +3095,12 @@ msgstr "Kunde inte ansluta till gnunetd.\n" msgid "Internal error." msgstr "Okänt fel.\n" -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Fil \"%s\" har URI: %s\n" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -3020,96 +3154,96 @@ msgstr "Misslyckades att ansluta till gnunetd.\n" msgid "Failed to compute hash of file." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 #, fuzzy msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "Inga nyckelord angivna!\n" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "" @@ -3151,19 +3285,19 @@ msgstr "Du måste ange en och endast en fil att avindexera.\n" msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "ange prioritet för innehållet" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "" @@ -3210,106 +3344,97 @@ msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" msgid "Display contents of a GNUnet directory" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Startade samling \"%s\".\n" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 #, fuzzy msgid "" msgstr "Okänt fel" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Fel vid nedladdning: %s\n" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Uppladdning vägrades!" -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Fil \"%s\" har URI: %s\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "skriv filen till FILNAMN" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:339 +#: src/fs/gnunet-download.c:368 msgid "download a GNUnet directory recursively" msgstr "hämta en GNUnet-katalog rekursivt" -#: src/fs/gnunet-download.c:356 +#: src/fs/gnunet-download.c:386 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Visa alla alternativ" - #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3326,6 +3451,15 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Visa alla alternativ" + #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3462,56 +3596,56 @@ msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "" @@ -3589,7 +3723,7 @@ msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "GNUnet-konfiguration" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" @@ -3640,7 +3774,7 @@ msgstr "# krypterade PONG-meddelanden mottagna" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "" @@ -3690,21 +3824,21 @@ msgstr "" msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 #, fuzzy msgid "# migration stop messages sent" msgstr "# krypterade PONG-meddelanden mottagna" @@ -3927,6 +4061,10 @@ msgstr "Kunde inte komma åt namnrymdsinformation.\n" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -3955,134 +4093,65 @@ msgstr "" msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:238 +#: src/gns/gnunet-dns2gns.c:203 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-dns2gns.c:408 +#: src/gns/gnunet-dns2gns.c:404 #, fuzzy, c-format msgid "Cannot parse DNS request from %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-dns2gns.c:424 +#: src/gns/gnunet-dns2gns.c:420 #, fuzzy, c-format msgid "Received malformed DNS request from %s\n" msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:428 #, fuzzy, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Mottog okänd typ av begäran %d vid %s:%d\n" -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 +#: src/gns/gnunet-dns2gns.c:587 #, fuzzy msgid "No DNS server specified!\n" msgstr "Inga nyckelord angivna!\n" -#: src/gns/gnunet-dns2gns.c:760 -#, fuzzy -msgid "No valid GNS zone specified!\n" -msgstr "Inga nyckelord angivna!\n" - -#: src/gns/gnunet-dns2gns.c:784 +#: src/gns/gnunet-dns2gns.c:687 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:802 +#: src/gns/gnunet-dns2gns.c:692 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" +#: src/gns/gnunet-dns2gns.c:709 +msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-dns2gns.c:826 -msgid "GNUnet DNS-to-GNS proxy (a DNS server)" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +#: src/gns/gnunet-gns-benchmark.c:587 +msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:276 -#, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +#: src/gns/gnunet-gns-helper-service-w32.c:602 +msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 -#, fuzzy, c-format -msgid "Failed to connect to GNS\n" -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" - -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:434 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "ange prioritet för innehållet" - -#: src/gns/gnunet-gns.c:440 -#, fuzzy -msgid "Specify timeout for the lookup" -msgstr "ange prioritet för innehållet" - -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:451 -#, fuzzy -msgid "Specify the public key of the zone to lookup the record in" -msgstr "ange prioritet för innehållet" - -#: src/gns/gnunet-gns.c:457 -#, fuzzy -msgid "Specify the name of the ego of the zone to lookup the record in" -msgstr "ange prioritet för innehållet" - -#: src/gns/gnunet-gns.c:476 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Spåra GNUnets nätverkstopologi." - -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" -msgstr "" - #: src/gns/gnunet-gns-helper-service-w32.c:739 #, fuzzy, c-format msgid "Failed to connect to identity service\n" @@ -4093,229 +4162,238 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, fuzzy, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/gns/gnunet-gns-proxy.c:887 +#: src/gns/gnunet-gns-proxy.c:910 #, fuzzy, c-format -msgid "Unsupported CURL SSL backend %d\n" +msgid "Unsupported CURL TLS backend %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:933 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Kunde inte skapa användarkonto:" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, fuzzy, c-format msgid "Unable to import certificate %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, fuzzy, c-format -msgid "Unsupported socks address type %d\n" -msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" - -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, c-format -msgid "No ego configured for `%s`\n" -msgstr "" +msgid "Unsupported socks address type %d\n" +msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, fuzzy, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "ange prioritet för innehållet" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Spåra GNUnets nätverkstopologi." + +#: src/gns/gnunet-service-gns.c:513 +#, fuzzy +msgid "Properly base32-encoded public key required" +msgstr "Ogiltigt argument: \"%s\"\n" + +#: src/gns/gnunet-service-gns.c:549 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, fuzzy, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -#, fuzzy -msgid "GNS REST API initialized\n" -msgstr " Anslutning misslyckades\n" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4484,153 +4562,153 @@ msgstr "" msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Ogiltigt meddelande mottogs den %s:%d." -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "" "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, fuzzy, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 #, fuzzy msgid "# active connections" msgstr "Nätverksanslutning" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "antal meddelanden att använda per iteration" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4649,7 +4727,7 @@ msgstr "" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Skriv ut information om GNUnets motparter." @@ -4746,6 +4824,71 @@ msgstr "\"%s\" är inte tillgänglig." msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "%s: flagga \"%s\" är tvetydig\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "%s: flagga \"%s\" är tvetydig\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Misslyckades att starta samling.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr " Anslutning misslyckades\n" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -4833,34 +4976,11 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":" msgid "Failed to create directory `%s' for storing egos\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 #, fuzzy msgid "Identity REST API initialized\n" msgstr " Anslutning misslyckades\n" -#: src/identity-provider/gnunet-identity-token.c:66 -#, fuzzy -msgid "Option `-t' is required\n" -msgstr "%s: flagga \"%s\" är tvetydig\n" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, fuzzy, c-format -msgid "Token `%s' is malformed\n" -msgstr "Ogiltigt argument: \"%s\"\n" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -#, fuzzy -msgid "Identity Token REST API initialized\n" -msgstr " Anslutning misslyckades\n" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4890,7 +5010,7 @@ msgstr "Kunde inte köra \"%s\": %s\n" msgid "No records found for `%s'" msgstr "%d filer hittades i katalog.\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" @@ -4910,7 +5030,7 @@ msgstr "Ogiltigt argument: \"%s\"\n" msgid "You must specify a name\n" msgstr "Du måste ange en mottagare!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "" @@ -4919,7 +5039,7 @@ msgstr "" msgid "spezifies the public key of the zone to look in" msgstr "ange prioritet för innehållet" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet-konfiguration" @@ -4933,293 +5053,299 @@ msgstr "" msgid "Error communicating with namecache service" msgstr "Skriv ut information om GNUnets motparter." -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore.c:301 +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Misslyckades att starta samling.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + +#: src/namestore/gnunet-namestore.c:313 #, fuzzy, c-format msgid "Adding record failed: %s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 +#, c-format +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" +msgstr "" + +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:851 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 -#, fuzzy, c-format -msgid "Ego `%s' not known to identity service\n" -msgstr "\"%s\": okänd tjänst: %s\n" - -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -#, fuzzy -msgid "Failed to connect to namestore\n" -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, fuzzy, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Ogiltiga argument: " -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Ogiltiga argument: " -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, fuzzy, c-format msgid "No default ego configured in identity service\n" msgstr "\"%s\": okänd tjänst: %s\n" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 #, fuzzy msgid "set the desired nick name for the zone" msgstr "Skriv ut information om GNUnets motparter." -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 #, fuzzy msgid "monitor changes in the namestore" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 #, fuzzy msgid "determine our name for the given PKEY" msgstr "Skriv ut information om GNUnets motparter." -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1201 +#: src/namestore/gnunet-namestore.c:1315 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1206 +#: src/namestore/gnunet-namestore.c:1319 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1212 +#: src/namestore/gnunet-namestore.c:1324 #, fuzzy msgid "name of the ego controlling the zone" msgstr "Visa värde av alternativet" -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 +#: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:734 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" +msgid "Failed to replicate block in namecache: %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Misslyckades att starta samling.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -msgid "GNU Name System First Come First Serve name registration service" +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/gnunet-service-namestore.c:615 -#, fuzzy, c-format -msgid "Failed to replicate block in namecache: %s\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/namestore/namestore_api.c:379 +#: src/namestore/namestore_api.c:391 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 msgid "flat file database running\n" msgstr "" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "Fel vid %s:%d.\n" + +#: src/namestore/plugin_rest_namestore.c:1206 #, fuzzy msgid "Namestore REST API initialized\n" msgstr " Anslutning misslyckades\n" @@ -5248,11 +5374,11 @@ msgstr "GNUnet-konfiguration" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5435,58 +5561,58 @@ msgstr "Misslyckades att binda till UDP-port %d.\n" msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Samling stoppad.\n" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5506,100 +5632,45 @@ msgstr "Misslyckades att starta samling.\n" msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 -msgid "`upnpc' command not found\n" -msgstr "" - -#: src/nse/gnunet-nse.c:122 -#, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# byte mottogs via TCP" - -#: src/nse/gnunet-nse-profiler.c:842 -#, fuzzy -msgid "limit to the number of connections to NSE services, 0 for none" -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/nse/gnunet-nse-profiler.c:847 -msgid "name of the file for writing connection information and statistics" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:859 -msgid "name of the file for writing the main results" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:866 -msgid "Number of peers to run in each round, separated by commas" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:877 -msgid "delay between rounds" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:886 -#, fuzzy -msgid "Measure quality and performance of the NSE service." -msgstr "Kan inte tillgå tjänsten" - -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Tillgängliga transport(er): %s\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" +#: src/nat/gnunet-service-nat_mini.c:656 +msgid "`upnpc' command not found\n" +msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, c-format -msgid "Still no peers found in `%s'!\n" +#: src/nse/gnunet-nse-profiler.c:849 +#, fuzzy +msgid "limit to the number of connections to NSE services, 0 for none" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/nse/gnunet-nse-profiler.c:854 +msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" +#: src/nse/gnunet-nse-profiler.c:866 +msgid "name of the file for writing the main results" +msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" +#: src/nse/gnunet-nse-profiler.c:873 +msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/nse/gnunet-nse-profiler.c:893 #, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" +msgid "Measure quality and performance of the NSE service." +msgstr "Kan inte tillgå tjänsten" + +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# byte mottogs via TCP" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" +msgstr "" #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5691,6 +5762,61 @@ msgstr "Testar transport(er) %s\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Tillgängliga transport(er): %s\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:220 +#, fuzzy +msgid "Failed to receive response from `PEERINFO' service." +msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6004,11 +6130,11 @@ msgstr "\"%s\" är inte en fil.\n" msgid "Search string `%s' is too long!\n" msgstr "\"%s\" är inte en fil.\n" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 #, fuzzy msgid "GNUnet REST server" msgstr "Spåra GNUnets nätverkstopologi." @@ -6143,19 +6269,22 @@ msgid "# revocation set unions completed" msgstr "# klartext PONG-meddelanden mottagna" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 #, fuzzy msgid "Could not open revocation database file!" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 #, fuzzy msgid "You must specify at least one message ID to check!\n" @@ -6211,10 +6340,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Anslutning misslyckades (fel?)\n" @@ -6594,14 +6723,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" @@ -6671,16 +6800,6 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Startade samling \"%s\".\n" - #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6692,6 +6811,16 @@ msgid "" "signal is received" msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Startade samling \"%s\".\n" + #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -6915,83 +7044,79 @@ msgstr "Fel vid %s:%d.\n" msgid "Failed to load configuration from %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# byte mottogs via TCP" -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 #, fuzzy msgid "# friends connected" msgstr "# av anslutna parter" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr " gconfig\tGTK-konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 #, fuzzy msgid "# friends in configuration" msgstr " gconfig\tGTK-konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 #, fuzzy msgid "# HELLO messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -7040,222 +7165,226 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "GNUnet-konfiguration" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 #, fuzzy msgid "# session creation failed" msgstr "# sessionsnycklar accepterade" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 #, fuzzy msgid "# DISCONNECT messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# byte skickade av typen %d" -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 #, fuzzy msgid "# transmission failures for messages to other peers" msgstr "# byte skickade av typen %d" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 #, fuzzy msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 #, fuzzy msgid "# KEEPALIVE messages discarded (no session)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 #, fuzzy msgid "# messages discarded due to lack of neighbour record" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 #, fuzzy msgid "# SYN messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, fuzzy msgid "# SYN messages received" msgstr "# PING-meddelanden skapade" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 #, fuzzy msgid "# ACK messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 #, fuzzy msgid "# unexpected ACK messages" msgstr "# krypterade PONG-meddelanden skickade" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# byte mottogs via TCP" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 #, fuzzy msgid "# QUOTA messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 #, fuzzy msgid "# disconnected from peer upon explicit request" msgstr "# av anslutna parter" @@ -7371,6 +7500,51 @@ msgstr "" msgid "# validations succeeded" msgstr "" +#: src/transport/gnunet-service-transport_validation.c:1627 +#, fuzzy +msgid "# HELLOs given to peerinfo" +msgstr "Meddelande mottaget från klient är ogiltig.\n" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# byte mottagna av typen %d" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Visa alla alternativ" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "antal meddelanden att använda per iteration" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "meddelandestorlek" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +#, fuzzy +msgid "Direct access to transport service." +msgstr "Misslyckades att ansluta till gnunetd.\n" + #: src/transport/gnunet-transport.c:413 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7510,11 +7684,6 @@ msgstr "Skriv ut information om GNUnets motparter." msgid "do not resolve hostnames" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "" - #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7523,46 +7692,11 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -#, fuzzy -msgid "Direct access to transport service." -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# byte mottagna av typen %d" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Visa alla alternativ" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "antal meddelanden att använda per iteration" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "meddelandestorlek" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7633,7 +7767,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7752,7 +7886,7 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 #, fuzzy msgid "# TCP sessions active" msgstr "# sessionsnycklar accepterade" @@ -7795,119 +7929,119 @@ msgstr "" msgid "# TCP WELCOME messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr "Nätverksanslutning" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 #, fuzzy msgid "# TCP server connect events" msgstr "# av anslutna parter" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 #, fuzzy msgid "Failed to start service.\n" msgstr "Misslyckades att starta samling.\n" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# krypterade PONG-meddelanden mottagna" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "\"%s\" är inte tillgänglig." -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "\"%s\" är inte tillgänglig." -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# krypterade PONG-meddelanden mottagna" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8023,7 +8157,7 @@ msgid "" "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, fuzzy, c-format msgid "Unknown address family %d\n" msgstr "Okänd operation \"%s\"\n" @@ -8080,7 +8214,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, fuzzy, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -8099,19 +8233,19 @@ msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n" msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" @@ -8122,62 +8256,62 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Fel vid skapandet av användare" -#: src/util/bio.c:187 +#: src/util/bio.c:191 #, fuzzy msgid "End of file" msgstr "Läs in en konfigurationsfil" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "FELSÖKNING" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "MEDDELANDE" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "VARNING" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "FEL" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "" @@ -8186,24 +8320,24 @@ msgstr "" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8214,88 +8348,88 @@ msgstr "Konfigurationsfil \"%s\" hittades inte. Kör \"gnunet-setup -d\"!\n" msgid "Syntax error while deserializing in line %u\n" msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Fel vid nedladdning: %s\n" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" @@ -8305,12 +8439,12 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" @@ -8385,11 +8519,11 @@ msgstr "Använd --help för att få en lista på flaggor.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "skriv ut versionsnummer" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8397,94 +8531,100 @@ msgstr "" "Argument som är obligatoriska för långa flaggor är också obligatoriska för " "korta flaggor.\n" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "skriv ut denna hjälp" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "var informativ" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, fuzzy, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 #, fuzzy msgid "name of the option to access" msgstr "Visa värde av alternativet" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 #, fuzzy msgid "print available configuration sections" msgstr "GNUnet-konfiguration" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" @@ -8525,63 +8665,63 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "\"%s\" misslyckades: tabell hittades inte!\n" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "antal meddelanden att använda per iteration" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "" @@ -8661,41 +8801,41 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n" msgid "Error writing to `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" # drive = hard drive ? -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "\"%s\" misslyckades för enhet %s: %u\n" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8726,7 +8866,7 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -8735,22 +8875,22 @@ msgstr "" "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s" "\".\n" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" @@ -8760,7 +8900,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8837,63 +8977,63 @@ msgstr " dagar" msgid "end of time" msgstr "" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)." -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Fel format \"%s\" för nätmask: %s\n" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Fel format \"%s\" för nätverk: %s\n" @@ -9076,27 +9216,56 @@ msgstr "# byte mottagna via UDP" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" +#, fuzzy +#~ msgid "PUT request sent with key" +#~ msgstr "# byte mottogs via TCP" + +#, fuzzy +#~ msgid "PUT request not confirmed!\n" +#~ msgstr "# byte mottogs via TCP" + +#, fuzzy +#~ msgid "Could not connect to %s service!\n" +#~ msgstr "Kunde inte ansluta till gnunetd.\n" + +#, fuzzy +#~ msgid "No valid GNS zone specified!\n" +#~ msgstr "Inga nyckelord angivna!\n" + +#, fuzzy +#~ msgid "Specify timeout for the lookup" +#~ msgstr "ange prioritet för innehållet" + +#, fuzzy +#~ msgid "Specify the name of the ego of the zone to lookup the record in" +#~ msgstr "ange prioritet för innehållet" + +#, fuzzy +#~ msgid "Token `%s' is malformed\n" +#~ msgstr "Ogiltigt argument: \"%s\"\n" + #, fuzzy #~ msgid "Failed to create indices\n" #~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" @@ -9582,10 +9751,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" #~ msgid "Unknown operator: %c\n" #~ msgstr "Okänd operation \"%s\"\n" -#, fuzzy -#~ msgid "valid public key required" -#~ msgstr "Ogiltigt argument: \"%s\"\n" - #, fuzzy #~ msgid "Failed to create or access directory for log file `%s'\n" #~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" diff --git a/po/vi.po b/po/vi.po index b26232a555..8dc1904395 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.8.0a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -243,7 +243,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -252,14 +252,14 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format msgid "Using `%s' instead\n" @@ -362,132 +362,15 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats-tests/ats-testing-log.c:837 #, fuzzy -msgid "print logging" +msgid "Stop logging\n" msgstr "Theo dõi" -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "Không thể sơ khởi SQLite: %s.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Không thể lưu tập tin cấu hình « %s »:" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats-tests/ats-testing-log.c:892 #, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Không thể lưu tập tin cấu hình « %s »:" +msgid "Start logging `%s'\n" +msgstr "Đang bắt đầu tài về « %s »\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -499,16 +382,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 -#, fuzzy -msgid "Stop logging\n" -msgstr "Theo dõi" - -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Đang bắt đầu tài về « %s »\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -516,6 +389,15 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +msgid "solver to use" +msgstr "" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -638,6 +520,124 @@ msgstr "" msgid "Print information about ATS state" msgstr "In ra thông tin về các đồng đẳng GNUnet." +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" +msgstr "Theo dõi" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "Không thể sơ khởi SQLite: %s.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Không thể lưu tập tin cấu hình « %s »:" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Không thể lưu tập tin cấu hình « %s »:" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -781,292 +781,292 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "Không rõ câu lệnh « %s ».\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Không thể tạo miền tên.\n" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Biệt hiệu « %s » bị xoá.\n" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1279 +#: src/conversation/gnunet-conversation.c:1300 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1306 +#: src/conversation/gnunet-conversation.c:1329 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1318,242 +1318,385 @@ msgstr "Lưu cấu hình ngay bây giờ không?" msgid "Core service of `%s' ready.\n" msgstr "Không gian tên « %s » có đánh giá %d.\n" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "# các byte đã mã hoá" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "# các byte đã giải mã" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 #, fuzzy msgid "# PING messages transmitted" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 +#: src/core/gnunet-service-core_kx.c:1005 #, fuzzy -msgid "# ephemeral keys received" +msgid "# duplicate ephemeral keys ignored" msgstr "# các thông báo phát hiện dht được nhận" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1040 +#, fuzzy +msgid "# EPHEMERAL_KEYs rejected (bad signature)" +msgstr "# các thông báo được chắp liền" + +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 +#: src/core/gnunet-service-core_kx.c:1060 #, fuzzy -msgid "# EPHEMERAL_KEY messages received" +msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# các thông báo được chắp liền" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1080 +#, fuzzy +msgid "# valid ephemeral keys received" +msgstr "# các thông báo phát hiện dht được nhận" + +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 #, fuzzy msgid "# PING messages received" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 #, fuzzy msgid "# PONG messages created" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 #, fuzzy msgid "# sessions terminated by timeout" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 #, fuzzy msgid "# keepalive messages sent" msgstr "# các thông báo PING nhập thô được gửi" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 #, fuzzy msgid "# PONG messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 #, fuzzy msgid "# PONG messages decrypted" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG" -#: src/core/gnunet-service-core_kx.c:1360 -#, fuzzy -msgid "# timeouts prevented via PONG" -msgstr "# các byte đã nhận qua TCP" +#: src/core/gnunet-service-core_kx.c:1447 +#, fuzzy +msgid "# timeouts prevented via PONG" +msgstr "# các byte đã nhận qua TCP" + +#: src/core/gnunet-service-core_kx.c:1454 +#, fuzzy +msgid "# rekey operations confirmed via PONG" +msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG" + +#: src/core/gnunet-service-core_kx.c:1642 +#, fuzzy +msgid "# DATA message dropped (out of order)" +msgstr "# các byte loại bỏ bởi UDP (đi ra)" + +#: src/core/gnunet-service-core_kx.c:1650 +#, c-format +msgid "" +"Session to peer `%s' went down due to key expiration (should not happen)\n" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1653 +#, fuzzy +msgid "# sessions terminated by key expiration" +msgstr "# các byte loại đi bởi TCP (đi ra)" + +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 +#, fuzzy +msgid "# bytes dropped (duplicates)" +msgstr "# các byte loại bỏ bởi UDP (đi ra)" + +#: src/core/gnunet-service-core_kx.c:1755 +#, fuzzy +msgid "# bytes dropped (out of sequence)" +msgstr "# các byte loại bỏ bởi UDP (đi ra)" + +#: src/core/gnunet-service-core_kx.c:1797 +#, fuzzy +msgid "# bytes dropped (ancient message)" +msgstr "# các byte loại bỏ bởi UDP (đi ra)" + +#: src/core/gnunet-service-core_kx.c:1805 +#, fuzzy +msgid "# bytes of payload decrypted" +msgstr "# các byte đã giải mã" + +#: src/core/gnunet-service-core_sessions.c:260 +#: src/core/gnunet-service-core_sessions.c:350 +#: src/dht/gnunet-service-dht_neighbours.c:733 +#: src/dht/gnunet-service-dht_neighbours.c:795 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 +#, fuzzy +msgid "# peers connected" +msgstr "# của các đồng đẳng đã kết nối" + +#: src/core/gnunet-service-core_sessions.c:296 +#, fuzzy +msgid "# type map refreshes sent" +msgstr "# tổng số yêu cầu lỗ hổng được gửi" + +#: src/core/gnunet-service-core_sessions.c:416 +#, fuzzy +msgid "# outdated typemap confirmations received" +msgstr "Lỗi lưu cấu hình." + +#: src/core/gnunet-service-core_sessions.c:433 +#, fuzzy +msgid "# valid typemap confirmations received" +msgstr "Lỗi lưu cấu hình." + +#: src/core/gnunet-service-core_typemap.c:169 +#: src/core/gnunet-service-core_typemap.c:181 +#, fuzzy +msgid "# type maps received" +msgstr "# các thông báo phát hiện dht được nhận" + +#: src/core/gnunet-service-core_typemap.c:212 +msgid "# updates to my type map" +msgstr "" + +#: src/credential/credential_misc.c:88 +#, fuzzy, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, fuzzy, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "Đối số không hợp lệ cho « %s ».\n" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, fuzzy, c-format +msgid "Issuer public key not well-formed\n" +msgstr "Đối số không hợp lệ cho « %s ».\n" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "Lỗi kết nối đến gnunetd.\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, c-format +msgid "ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, fuzzy, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "Đối số không hợp lệ cho « %s ».\n" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, c-format +msgid "Issuer ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:516 +#, c-format +msgid "Please specify name to lookup, subject key and issuer key!\n" +msgstr "" + +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1367 -#, fuzzy -msgid "# rekey operations confirmed via PONG" -msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG" +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1521 +#: src/credential/gnunet-credential.c:545 #, fuzzy -msgid "# DATA message dropped (out of order)" -msgstr "# các byte loại bỏ bởi UDP (đi ra)" +msgid "The public key of the subject to lookup the credential for" +msgstr "xác định mức ưu tiên của nội dung" -#: src/core/gnunet-service-core_kx.c:1529 -#, c-format -msgid "" -"Session to peer `%s' went down due to key expiration (should not happen)\n" +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 +#: src/credential/gnunet-credential.c:555 #, fuzzy -msgid "# sessions terminated by key expiration" -msgstr "# các byte loại đi bởi TCP (đi ra)" +msgid "The public key of the authority to verify the credential against" +msgstr "xác định mức ưu tiên của nội dung" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 +#: src/credential/gnunet-credential.c:560 #, fuzzy -msgid "# bytes dropped (duplicates)" -msgstr "# các byte loại bỏ bởi UDP (đi ra)" +msgid "The ego to use" +msgstr "kích cỡ tin nhắn" -#: src/core/gnunet-service-core_kx.c:1606 -#, fuzzy -msgid "# bytes dropped (out of sequence)" -msgstr "# các byte loại bỏ bởi UDP (đi ra)" +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1648 -#, fuzzy -msgid "# bytes dropped (ancient message)" -msgstr "# các byte loại bỏ bởi UDP (đi ra)" +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" -#: src/core/gnunet-service-core_kx.c:1656 -#, fuzzy -msgid "# bytes of payload decrypted" -msgstr "# các byte đã giải mã" +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/credential/gnunet-credential.c:588 #, fuzzy -msgid "# peers connected" -msgstr "# của các đồng đẳng đã kết nối" +msgid "GNUnet credential resolver tool" +msgstr "Bản ghi lỗi GNUnet" -#: src/core/gnunet-service-core_sessions.c:296 -#, fuzzy -msgid "# type map refreshes sent" -msgstr "# tổng số yêu cầu lỗ hổng được gửi" +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, fuzzy, c-format +msgid "Failed to connect to GNS\n" +msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/core/gnunet-service-core_sessions.c:416 -#, fuzzy -msgid "# outdated typemap confirmations received" -msgstr "Lỗi lưu cấu hình." +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, fuzzy, c-format +msgid "Failed to connect to namestore\n" +msgstr "Không kết nối được đến trình nền gnunetd." -#: src/core/gnunet-service-core_sessions.c:433 -#, fuzzy -msgid "# valid typemap confirmations received" -msgstr "Lỗi lưu cấu hình." +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 #, fuzzy -msgid "# type maps received" -msgstr "# các thông báo phát hiện dht được nhận" - -#: src/core/gnunet-service-core_typemap.c:212 -msgid "# updates to my type map" -msgstr "" +msgid "GNS REST API initialized\n" +msgstr "Lỗi sơ khởi lõi.\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 #, fuzzy msgid "# bytes stored" msgstr "# các byte trong kho dữ liệu" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 #, fuzzy msgid "# items stored" msgstr "# các byte trong kho dữ liệu" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 #, fuzzy msgid "# requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "# các yêu cầu được lọc theo bộ lọc bloom" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 #, fuzzy msgid "# requests for random value received" msgstr "# tổng số yêu cầu lỗ hổng được nhận" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 #, fuzzy msgid "# proximity search requests received" msgstr "# các yêu cầu khách lỗ hổng được nhận" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 #, fuzzy msgid "Heap datacache running\n" msgstr "kho dữ liệu sqlite" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1562,16 +1705,17 @@ msgstr "kho dữ liệu sqlite" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" @@ -1882,7 +2026,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 #, fuzzy msgid "Data too large" msgstr "số lần lặp lại" @@ -1923,32 +2067,34 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 #, fuzzy msgid "Sqlite database running\n" msgstr "kho dữ liệu sqlite" @@ -1957,159 +2103,104 @@ msgstr "kho dữ liệu sqlite" msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" +#: src/dht/gnunet-dht-get.c:159 +#, c-format +msgid "Result %d, type %d:\n" +msgstr "" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "tăng sổ tối đa các kết nối TCP/IP" - -#: src/dht/gnunet_dht_profiler.c:1188 -#, fuzzy -msgid "number of peers to start" -msgstr "số lần lặp lại" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Không thể truy cập đến dịch vụ" - -#: src/dht/gnunet-dht-put.c:120 -#, fuzzy -msgid "PUT request sent with key" -msgstr "# độ tin cậy được tiêu phí" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:126 -#, fuzzy -msgid "PUT request not confirmed!\n" -msgstr "# độ tin cậy được tiêu phí" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:163 -#, fuzzy, c-format -msgid "Could not connect to %s service!\n" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" @@ -2118,77 +2209,77 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 #, fuzzy msgid "# PUT requests received from clients" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 #, fuzzy msgid "# GET requests received from clients" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, fuzzy, c-format msgid "%s request received, but have no datacache!\n" msgstr "# các byte kiểu %d được nhận" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 #, fuzzy msgid "# GET requests given to datacache" msgstr "# các yêu cầu get (lấy) dht được nhận" @@ -2338,16 +2429,64 @@ msgstr "" msgid "# DHT requests combined" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "tăng sổ tối đa các kết nối TCP/IP" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "số lần lặp lại" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Không thể truy cập đến dịch vụ" + +#: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Không biết truyền tải nào kiểu %d.\n" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "" @@ -2357,36 +2496,31 @@ msgstr "" msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 +#: src/dns/dnsstub.c:364 +#, c-format +msgid "Received DNS response that is too small (%u bytes)" +msgstr "" + +#: src/dns/dnsstub.c:511 #, fuzzy, c-format -msgid "Failed to send DNS request to %s\n" +msgid "Failed to send DNS request to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:517 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "" - -#: src/dns/dnsstub.c:437 -#, c-format -msgid "Received DNS response that is too small (%u bytes)" -msgstr "" - #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 msgid "only monitor DNS queries" msgstr "" @@ -2411,50 +2545,50 @@ msgstr "" msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 #, fuzzy msgid "# DNS requests received via TUN interface" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" @@ -2464,214 +2598,214 @@ msgstr "" msgid "Print information about DV state" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 #, fuzzy msgid "# Bytes received from CADET" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# các truy vấn lỗ hổng được định tuyến" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# các byte được gửi" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 #, fuzzy msgid "# Packets received from TUN" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 #, fuzzy msgid "# Bytes received from TUN" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" @@ -2805,64 +2939,64 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 #, fuzzy msgid "internal error decoding tree" msgstr "=\tLỗi đọc thư mục.\n" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 #, fuzzy msgid "Invalid URI" msgstr "Dữ liệu nhập không hợp lệ.\n" @@ -2985,12 +3119,12 @@ msgstr "« %s »: Không thể kết nối.\n" msgid "Internal error." msgstr "Lỗi VR." -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Tập tin « %s » có URI: %s\n" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -3044,93 +3178,93 @@ msgstr "Không kết nối được đến trình nền gnunetd." msgid "Failed to compute hash of file." msgstr "Không kết nối được đến trình nền gnunetd." -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "Chưa ghi rõ từ khoá.\n" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "Có dấu nháy kép thừa hay thiếu.\n" @@ -3170,19 +3304,19 @@ msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" msgid "set the desired LEVEL of sender-anonymity" msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "xác định mức ưu tiên của nội dung" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "" @@ -3230,109 +3364,100 @@ msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n msgid "Display contents of a GNUnet directory" msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 #, fuzzy msgid "" msgstr "Lỗi không rõ" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n" -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, fuzzy, c-format msgid "Unexpected status: %d\n" msgstr "Gặp sự kiện bất thường: %d\n" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Tập tin « %s » có URI: %s\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 #, fuzzy msgid "set the desired LEVEL of receiver-anonymity" msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "ghi tập tin vào TÊN_TẬP_TIN" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 #, fuzzy msgid "set the maximum number of parallel downloads that is allowed" msgstr "đặt số tối đa các việc tải xuống đồng thời được phép" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 #, fuzzy msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "đặt số tối đa các việc tải xuống đồng thời được phép" -#: src/fs/gnunet-download.c:339 +#: src/fs/gnunet-download.c:368 msgid "download a GNUnet directory recursively" msgstr "tải xuống đệ quy một thư mục GNUnet" -#: src/fs/gnunet-download.c:356 +#: src/fs/gnunet-download.c:386 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Tùy chọn chia sẻ tập tin" - #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3349,6 +3474,15 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Tùy chọn chia sẻ tập tin" + #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3484,7 +3618,7 @@ msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3492,7 +3626,7 @@ msgstr "" "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện " "tải lên" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3500,11 +3634,11 @@ msgstr "" "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra " "tùy chọn này nhiều lần)" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3512,7 +3646,7 @@ msgstr "" "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng " "mã hóa trong cơ sở dữ liệu GNUnet)" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3520,12 +3654,12 @@ msgstr "" "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ " "cho sự chèn không gian tên)" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 #, fuzzy msgid "" "only simulate the process but do not do any actual publishing (useful to " @@ -3533,13 +3667,13 @@ msgid "" msgstr "" "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" @@ -3547,7 +3681,7 @@ msgstr "" "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm " "từ khoá vào tập tin có địa chỉ URI tương ứng)" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "" @@ -3627,7 +3761,7 @@ msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" @@ -3678,7 +3812,7 @@ msgstr "# các thông báo phát hiện dht được nhận" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "" @@ -3732,22 +3866,22 @@ msgstr "" msgid "# requests dropped due to missing reverse route" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 #, fuzzy msgid "# requests dropped due TTL underflow" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# các thông báo phát hiện dht được nhận" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 #, fuzzy msgid "# migration stop messages sent" msgstr "# các thông báo phát hiện dht được nhận" @@ -3973,6 +4107,10 @@ msgstr "Không thể truy cập đến thông tin về không gian tên.\n" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -4001,134 +4139,65 @@ msgstr "" msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:238 +#: src/gns/gnunet-dns2gns.c:203 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-dns2gns.c:408 +#: src/gns/gnunet-dns2gns.c:404 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:424 +#: src/gns/gnunet-dns2gns.c:420 #, fuzzy, c-format msgid "Received malformed DNS request from %s\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:428 #, fuzzy, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 +#: src/gns/gnunet-dns2gns.c:587 #, fuzzy msgid "No DNS server specified!\n" msgstr "Chưa ghi rõ từ khoá.\n" -#: src/gns/gnunet-dns2gns.c:760 -#, fuzzy -msgid "No valid GNS zone specified!\n" -msgstr "Chưa ghi rõ từ khoá.\n" - -#: src/gns/gnunet-dns2gns.c:784 +#: src/gns/gnunet-dns2gns.c:687 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:802 +#: src/gns/gnunet-dns2gns.c:692 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" +#: src/gns/gnunet-dns2gns.c:709 +msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-dns2gns.c:826 -msgid "GNUnet DNS-to-GNS proxy (a DNS server)" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +#: src/gns/gnunet-gns-benchmark.c:587 +msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:276 -#, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +#: src/gns/gnunet-gns-helper-service-w32.c:602 +msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 -#, fuzzy, c-format -msgid "Failed to connect to GNS\n" -msgstr "Lỗi kết nối đến gnunetd.\n" - -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" - -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:434 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "xác định mức ưu tiên của nội dung" - -#: src/gns/gnunet-gns.c:440 -#, fuzzy -msgid "Specify timeout for the lookup" -msgstr "xác định mức ưu tiên của nội dung" - -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:451 -#, fuzzy -msgid "Specify the public key of the zone to lookup the record in" -msgstr "xác định mức ưu tiên của nội dung" - -#: src/gns/gnunet-gns.c:457 -#, fuzzy -msgid "Specify the name of the ego of the zone to lookup the record in" -msgstr "xác định mức ưu tiên của nội dung" - -#: src/gns/gnunet-gns.c:476 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Bản ghi lỗi GNUnet" - -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" -msgstr "" - #: src/gns/gnunet-gns-helper-service-w32.c:739 #, fuzzy, c-format msgid "Failed to connect to identity service\n" @@ -4139,230 +4208,239 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/gns/gnunet-gns-proxy.c:887 +#: src/gns/gnunet-gns-proxy.c:910 #, fuzzy, c-format -msgid "Unsupported CURL SSL backend %d\n" +msgid "Unsupported CURL TLS backend %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:933 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Không thể tạo tài khoản người dùng:" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, fuzzy, c-format msgid "Unable to import certificate %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, c-format -msgid "No ego configured for `%s`\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, fuzzy, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "xác định mức ưu tiên của nội dung" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Bản ghi lỗi GNUnet" + +#: src/gns/gnunet-service-gns.c:513 +#, fuzzy +msgid "Properly base32-encoded public key required" +msgstr "Đối số không hợp lệ cho « %s ».\n" + +#: src/gns/gnunet-service-gns.c:549 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, fuzzy, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -#, fuzzy -msgid "GNS REST API initialized\n" -msgstr "Lỗi sơ khởi lõi.\n" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4534,156 +4612,156 @@ msgstr "trình phục vụ danh sách máy HTTP hợp nhất" msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 #, fuzzy msgid "# bytes downloaded from hostlist servers" msgstr "trình phục vụ danh sách máy HTTP hợp nhất" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 #, fuzzy msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# các HELLO tải xuống qua HTTP" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 #, fuzzy msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# các HELLO tải xuống qua HTTP" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, fuzzy, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, fuzzy, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "Đang nạp và khởi động dùng « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 #, fuzzy msgid "# active connections" msgstr "# các kết nối dht" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 #, fuzzy msgid "# hostlist URIs read from file" msgstr "# các byte danh sách máy được trả về" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, fuzzy msgid "# hostlist URIs written to file" msgstr "# các byte danh sách máy được trả về" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4702,7 +4780,7 @@ msgstr "" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" @@ -4805,6 +4883,71 @@ msgstr "« %s » không sẵn sàng.\n" msgid "Could not start hostlist HTTP server on port %u\n" msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "đặt tên hiệu cần dùng (cần thiết)" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Lỗi bắt đầu thu thập.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr "Lỗi sơ khởi lõi.\n" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -4892,34 +5035,11 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:" msgid "Failed to create directory `%s' for storing egos\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 #, fuzzy msgid "Identity REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" -#: src/identity-provider/gnunet-identity-token.c:66 -#, fuzzy -msgid "Option `-t' is required\n" -msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, fuzzy, c-format -msgid "Token `%s' is malformed\n" -msgstr "Đối số không hợp lệ cho « %s ».\n" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -#, fuzzy -msgid "Identity Token REST API initialized\n" -msgstr "Lỗi sơ khởi lõi.\n" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4949,7 +5069,7 @@ msgstr "Không thể truy cập đến « %s »: %s\n" msgid "No records found for `%s'" msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" @@ -4969,7 +5089,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n" msgid "You must specify a name\n" msgstr "Phải ghi rõ tên hiệu\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "" @@ -4978,7 +5098,7 @@ msgstr "" msgid "spezifies the public key of the zone to look in" msgstr "xác định mức ưu tiên của nội dung" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "Cấu hình GNUnet" @@ -4992,288 +5112,294 @@ msgstr "" msgid "Error communicating with namecache service" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Không thể tạo miền tên.\n" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Không thể tạo miền tên.\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 #, fuzzy msgid "flat plugin running\n" msgstr "kho dữ liệu sqlite" -#: src/namestore/gnunet-namestore.c:301 +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Không thể tạo miền tên.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Lỗi bắt đầu thu thập.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Lỗi kết nối đến gnunetd.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + +#: src/namestore/gnunet-namestore.c:313 #, fuzzy, c-format msgid "Adding record failed: %s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 #, c-format -msgid "There are no records under label `%s' that could be deleted.\n" +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format -msgid "" -"There are no records under label `%s' that match the request for deletion.\n" +msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 +#: src/namestore/gnunet-namestore.c:851 #, c-format -msgid "Ego `%s' not known to identity service\n" +msgid "" +"There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, fuzzy, c-format msgid "No options given\n" msgstr "chưa đưa ra tên" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -#, fuzzy -msgid "Failed to connect to namestore\n" -msgstr "Không kết nối được đến trình nền gnunetd." - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 #, fuzzy msgid "set the desired nick name for the zone" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 #, fuzzy msgid "monitor changes in the namestore" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 #, fuzzy msgid "determine our name for the given PKEY" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1201 +#: src/namestore/gnunet-namestore.c:1315 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1206 +#: src/namestore/gnunet-namestore.c:1319 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1212 +#: src/namestore/gnunet-namestore.c:1324 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Không thể tạo miền tên.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:734 +#: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" +msgid "Failed to replicate block in namecache: %s\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Lỗi bắt đầu thu thập.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Lỗi kết nối đến gnunetd.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -msgid "GNU Name System First Come First Serve name registration service" +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/gnunet-service-namestore.c:615 -#, fuzzy, c-format -msgid "Failed to replicate block in namecache: %s\n" -msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" - -#: src/namestore/namestore_api.c:379 +#: src/namestore/namestore_api.c:391 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 #, fuzzy msgid "flat file database running\n" msgstr "kho dữ liệu sqlite" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "Lỗi chạy %s: %s %d\n" + +#: src/namestore/plugin_rest_namestore.c:1206 #, fuzzy msgid "Namestore REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" @@ -5304,11 +5430,11 @@ msgstr "Cấu hình hạn ngạch" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5485,58 +5611,58 @@ msgstr "Lỗi đóng kết đến cổng %s %d.\n" msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Thu thập bị dừng.\n" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5560,101 +5686,42 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 -#, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# các yêu cầu get (lấy) dht được nhận" - -#: src/nse/gnunet-nse-profiler.c:842 -#, fuzzy -msgid "limit to the number of connections to NSE services, 0 for none" -msgstr "Không kết nối được đến trình nền gnunetd." - -#: src/nse/gnunet-nse-profiler.c:847 -msgid "name of the file for writing connection information and statistics" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:859 -msgid "name of the file for writing the main results" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:866 -msgid "Number of peers to run in each round, separated by commas" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:877 -msgid "delay between rounds" -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:886 -#, fuzzy -msgid "Measure quality and performance of the NSE service." -msgstr "Không thể truy cập đến dịch vụ" - -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 -#, fuzzy -msgid "Value is too large.\n" -msgstr "Giá trị không nằm trong phạm vi được phép." - -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Đã nạp truyền tải « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ " -"bỏ.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" +#: src/nse/gnunet-nse-profiler.c:849 +#, fuzzy +msgid "limit to the number of connections to NSE services, 0 for none" +msgstr "Không kết nối được đến trình nền gnunetd." -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" +#: src/nse/gnunet-nse-profiler.c:854 +msgid "name of the file for writing connection information and statistics" +msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" +#: src/nse/gnunet-nse-profiler.c:866 +msgid "name of the file for writing the main results" +msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" +#: src/nse/gnunet-nse-profiler.c:873 +msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/nse/gnunet-nse-profiler.c:893 #, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" -"\n" -"Không nhận được đáp ứng từ gnunetd.\n" +msgid "Measure quality and performance of the NSE service." +msgstr "Không thể truy cập đến dịch vụ" + +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# các yêu cầu get (lấy) dht được nhận" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#, fuzzy +msgid "Value is too large.\n" +msgstr "Giá trị không nằm trong phạm vi được phép." #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5747,6 +5814,65 @@ msgstr "Đang nạp các truyền tải « %s »\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Đã nạp truyền tải « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ " +"bỏ.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:220 +#, fuzzy +msgid "Failed to receive response from `PEERINFO' service." +msgstr "" +"\n" +"Không nhận được đáp ứng từ gnunetd.\n" + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6059,11 +6185,11 @@ msgstr "« %s » không phải là một tập tin.\n" msgid "Search string `%s' is too long!\n" msgstr "« %s » không phải là một tập tin.\n" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 #, fuzzy msgid "GNUnet REST server" msgstr "Bản ghi lỗi GNUnet" @@ -6198,19 +6324,22 @@ msgid "# revocation set unions completed" msgstr "# các sự truyền PONG bị lỗi" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 #, fuzzy msgid "Could not open revocation database file!" msgstr "« %s »: Không thể kết nối.\n" -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 #, fuzzy msgid "You must specify at least one message ID to check!\n" @@ -6266,10 +6395,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Không kết nối được (lỗi ?)\n" @@ -6647,14 +6776,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" @@ -6724,16 +6853,6 @@ msgstr "« %s » đang tắt.\n" msgid "%.s Unknown result code." msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Đang đợi các đồng đẳng kết nối" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Đang bắt đầu tài về « %s »\n" - #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6745,6 +6864,16 @@ msgid "" "signal is received" msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Đang đợi các đồng đẳng kết nối" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Đang bắt đầu tài về « %s »\n" + #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -6967,90 +7096,86 @@ msgstr "Lỗi chạy %s: %s %d\n" msgid "Failed to load configuration from %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào" -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 #, fuzzy msgid "# HELLO messages gossipped" msgstr "# các thông báo gửi đi bị loại bỏ" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 #, fuzzy msgid "# friends connected" msgstr "# của các đồng đẳng đã kết nối" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr "" "\n" "Kết thúc cấu hình.\n" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 #, fuzzy msgid "# friends in configuration" msgstr "" "\n" "Kết thúc cấu hình.\n" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 #, fuzzy msgid "# HELLO messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 #, fuzzy msgid "# messages dropped due to slow client" @@ -7100,224 +7225,228 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 #, fuzzy msgid "# session creation failed" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 #, fuzzy msgid "# DISCONNECT messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 #, fuzzy msgid "# bytes in message queue for other peers" msgstr "# các byte thông báo gửi đi bị loại bỏ" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# các byte kiểu %d được gửi " -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 #, fuzzy msgid "# transmission failures for messages to other peers" msgstr "# các byte thông báo gửi đi bị loại bỏ" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 #, fuzzy msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 #, fuzzy msgid "# KEEPALIVE messages discarded (no session)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 #, fuzzy msgid "# messages discarded due to lack of neighbour record" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 #, fuzzy msgid "# bandwidth quota violations by other peers" msgstr "theo dõi gnunetd sử dụng dải thông" -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 #, fuzzy msgid "# SYN messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, fuzzy msgid "# SYN messages received" msgstr "# các thông báo PING được tạo" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 #, fuzzy msgid "# ACK messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 #, fuzzy msgid "# unexpected ACK messages" msgstr "# các thông báo PONG đã mật mã được gửi" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 #, fuzzy msgid "# QUOTA messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 #, fuzzy msgid "# disconnected from peer upon explicit request" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" @@ -7434,6 +7563,51 @@ msgstr "" msgid "# validations succeeded" msgstr "" +#: src/transport/gnunet-service-transport_validation.c:1627 +#, fuzzy +msgid "# HELLOs given to peerinfo" +msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Tùy chọn chung" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "số tin nhắn cần dùng mỗi lần lặp" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "kích cỡ tin nhắn" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +#, fuzzy +msgid "Direct access to transport service." +msgstr "Lỗi kết nối đến gnunetd.\n" + #: src/transport/gnunet-transport.c:413 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7573,11 +7747,6 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet." msgid "do not resolve hostnames" msgstr "không quyết định các tên máy" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "" - #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7586,46 +7755,11 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -#, fuzzy -msgid "Direct access to transport service." -msgstr "Lỗi kết nối đến gnunetd.\n" - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Tùy chọn chung" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "số tin nhắn cần dùng mỗi lần lặp" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "kích cỡ tin nhắn" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7695,7 +7829,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7806,7 +7940,7 @@ msgstr "Gặp sự kiện bất thường: %d\n" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 #, fuzzy msgid "# TCP sessions active" msgstr "# các khoá phiên chạy được chấp nhận" @@ -7849,119 +7983,119 @@ msgstr "" msgid "# TCP WELCOME messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "# các byte đã nhận qua TCP" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr "# các kết nối dht" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 #, fuzzy msgid "# TCP server connect events" msgstr "# của các đồng đẳng đã kết nối" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 #, fuzzy msgid "Failed to start service.\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# các thông báo PONG đã mật mã được nhận" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "« %s » không sẵn sàng.\n" -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "« %s » không sẵn sàng.\n" -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Không thể tạo miền tên.\n" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# các thông báo PONG đã mật mã được nhận" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8076,7 +8210,7 @@ msgid "" "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, fuzzy, c-format msgid "Unknown address family %d\n" msgstr "\tKhông rõ miền tên « %s »\n" @@ -8133,7 +8267,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -8152,19 +8286,19 @@ msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n" msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" @@ -8175,61 +8309,61 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Gặp lỗi khi tạo người dùng" -#: src/util/bio.c:187 +#: src/util/bio.c:191 msgid "End of file" msgstr "" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "GỠ LỖI" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "TIN" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "CẢNH BÁO" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "LỖI" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "" @@ -8238,25 +8372,25 @@ msgstr "" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8268,12 +8402,12 @@ msgstr "" msgid "Syntax error while deserializing in line %u\n" msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " @@ -8282,76 +8416,76 @@ msgstr "" "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong " "tập hợp các sự chọn được phép\n" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" @@ -8361,12 +8495,12 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" @@ -8442,11 +8576,11 @@ msgstr "" msgid "Missing mandatory option `%s'.\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "hiển thị số thứ tự phiên bản" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8454,94 +8588,100 @@ msgstr "" "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn " "ngắn.\n" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "hiển thị trợ giúp này" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "xuất chi tiết" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 #, fuzzy msgid "configure logging to write logs to FILENAME" msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, fuzzy, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, fuzzy, c-format msgid "--section argument is required\n" msgstr "đặt tên hiệu cần dùng (cần thiết)" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 #, fuzzy msgid "print available configuration sections" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "cập nhật một giá trị trong tập tin cấu hình" @@ -8582,63 +8722,63 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "" @@ -8718,40 +8858,40 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" msgid "Error writing to `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8782,29 +8922,29 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "không quyết định các tên máy" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, fuzzy, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n" -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Không thể giải quyết « %s » (%s): %s\n" @@ -8814,7 +8954,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8892,63 +9032,63 @@ msgstr " ngày" msgid "end of time" msgstr "" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)." -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Mạng có định dạng sai « %s »: %s\n" @@ -9131,27 +9271,56 @@ msgstr "# các byte đã nhận qua UDP" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, fuzzy, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" +#, fuzzy +#~ msgid "PUT request sent with key" +#~ msgstr "# độ tin cậy được tiêu phí" + +#, fuzzy +#~ msgid "PUT request not confirmed!\n" +#~ msgstr "# độ tin cậy được tiêu phí" + +#, fuzzy +#~ msgid "Could not connect to %s service!\n" +#~ msgstr "Không thể kết nối tới %s:%u: %s\n" + +#, fuzzy +#~ msgid "No valid GNS zone specified!\n" +#~ msgstr "Chưa ghi rõ từ khoá.\n" + +#, fuzzy +#~ msgid "Specify timeout for the lookup" +#~ msgstr "xác định mức ưu tiên của nội dung" + +#, fuzzy +#~ msgid "Specify the name of the ego of the zone to lookup the record in" +#~ msgstr "xác định mức ưu tiên của nội dung" + +#, fuzzy +#~ msgid "Token `%s' is malformed\n" +#~ msgstr "Đối số không hợp lệ cho « %s ».\n" + #, fuzzy #~ msgid "Failed to create indices\n" #~ msgstr "Không thể tạo miền tên.\n" @@ -9668,10 +9837,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s #~ msgid "Insufficient space for publishing: %s" #~ msgstr "Không đủ quyền truy cập cho « %s »: %s\n" -#, fuzzy -#~ msgid "valid public key required" -#~ msgstr "Đối số không hợp lệ cho « %s ».\n" - #, fuzzy #~ msgid "Failed to create or access directory for log file `%s'\n" #~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 11632aed02..c3248d9cab 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet-0.8.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-01-02 02:33+0100\n" +"POT-Creation-Date: 2018-06-04 23:27+0200\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -230,7 +230,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3824 +#: src/transport/plugin_transport_tcp.c:3825 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -239,14 +239,14 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505 +#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510 +#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format msgid "Using `%s' instead\n" @@ -349,132 +349,14 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 -msgid "solver to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 -msgid "experiment to use" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "未知的命令“%s”。\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "无法初始化 SQLite：%s。\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1913 -#, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "解析配置文件“%s”失败\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats-tests/ats-testing-log.c:892 #, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "解析配置文件“%s”失败\n" +msgid "Start logging `%s'\n" +msgstr "未知的命令“%s”。\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -486,15 +368,6 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "初始化“%s”服务失败。\n" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "" - -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "未知的命令“%s”。\n" - #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -502,6 +375,15 @@ msgid "" "= %u KiB/s\n" msgstr "" +#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 +msgid "solver to use" +msgstr "" + +#: src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 +msgid "experiment to use" +msgstr "" + #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -623,6 +505,124 @@ msgstr "" msgid "Print information about ATS state" msgstr "无法获取有关用户“%s”的信息：%s\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" +msgstr "未知的命令“%s”。\n" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "无法初始化 SQLite：%s。\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1913 +#, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "解析配置文件“%s”失败\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "解析配置文件“%s”失败\n" + #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -763,291 +763,291 @@ msgstr "" msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:513 -#: src/conversation/conversation_api_call.c:490 +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:269 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + +#: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:294 +#: src/conversation/gnunet-conversation.c:295 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:329 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:334 +#: src/conversation/gnunet-conversation.c:335 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:352 +#: src/conversation/gnunet-conversation.c:353 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:367 +#: src/conversation/gnunet-conversation.c:368 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "发送消息失败。\n" -#: src/conversation/gnunet-conversation.c:379 +#: src/conversation/gnunet-conversation.c:380 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:401 +#: src/conversation/gnunet-conversation.c:404 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:408 +#: src/conversation/gnunet-conversation.c:411 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/conversation/gnunet-conversation.c:415 +#: src/conversation/gnunet-conversation.c:418 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/conversation/gnunet-conversation.c:423 +#: src/conversation/gnunet-conversation.c:426 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:432 +#: src/conversation/gnunet-conversation.c:435 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:438 +#: src/conversation/gnunet-conversation.c:441 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:443 +#: src/conversation/gnunet-conversation.c:446 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:512 +#: src/conversation/gnunet-conversation.c:517 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/conversation/gnunet-conversation.c:528 -#: src/conversation/gnunet-conversation.c:542 +#: src/conversation/gnunet-conversation.c:533 +#: src/conversation/gnunet-conversation.c:547 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:535 -#: src/conversation/gnunet-conversation.c:592 +#: src/conversation/gnunet-conversation.c:540 +#: src/conversation/gnunet-conversation.c:596 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:550 -#: src/conversation/gnunet-conversation.c:605 +#: src/conversation/gnunet-conversation.c:555 +#: src/conversation/gnunet-conversation.c:609 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:560 +#: src/conversation/gnunet-conversation.c:565 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:616 +#: src/conversation/gnunet-conversation.c:620 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:633 +#: src/conversation/gnunet-conversation.c:637 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:663 +#: src/conversation/gnunet-conversation.c:668 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:686 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:691 +#: src/conversation/gnunet-conversation.c:697 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 -#: src/conversation/gnunet-conversation.c:721 +#: src/conversation/gnunet-conversation.c:703 +#: src/conversation/gnunet-conversation.c:727 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:702 +#: src/conversation/gnunet-conversation.c:708 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:711 +#: src/conversation/gnunet-conversation.c:717 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/conversation/gnunet-conversation.c:716 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:735 +#: src/conversation/gnunet-conversation.c:741 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:747 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/conversation/gnunet-conversation.c:769 -#: src/conversation/gnunet-conversation.c:784 +#: src/conversation/gnunet-conversation.c:776 +#: src/conversation/gnunet-conversation.c:791 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:817 -#: src/conversation/gnunet-conversation.c:833 +#: src/conversation/gnunet-conversation.c:824 +#: src/conversation/gnunet-conversation.c:840 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:847 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:849 +#: src/conversation/gnunet-conversation.c:856 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:866 +#: src/conversation/gnunet-conversation.c:873 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:901 +#: src/conversation/gnunet-conversation.c:908 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:909 +#: src/conversation/gnunet-conversation.c:916 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:926 +#: src/conversation/gnunet-conversation.c:933 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:952 +#: src/conversation/gnunet-conversation.c:959 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:954 +#: src/conversation/gnunet-conversation.c:961 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:956 +#: src/conversation/gnunet-conversation.c:963 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:958 +#: src/conversation/gnunet-conversation.c:965 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:960 +#: src/conversation/gnunet-conversation.c:967 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:962 +#: src/conversation/gnunet-conversation.c:969 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:964 +#: src/conversation/gnunet-conversation.c:971 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:966 +#: src/conversation/gnunet-conversation.c:973 msgid "Use `/quit' to terminate gnunet-conversation" msgstr "" -#: src/conversation/gnunet-conversation.c:968 +#: src/conversation/gnunet-conversation.c:975 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1172 +#: src/conversation/gnunet-conversation.c:1191 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "发送消息失败。\n" -#: src/conversation/gnunet-conversation.c:1185 +#: src/conversation/gnunet-conversation.c:1204 #, c-format msgid "Our ego `%s' was deleted!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1220 +#: src/conversation/gnunet-conversation.c:1242 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "您必须指定一个昵称\n" -#: src/conversation/gnunet-conversation.c:1244 +#: src/conversation/gnunet-conversation.c:1266 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "初始化“%s”服务失败。\n" -#: src/conversation/gnunet-conversation.c:1273 -msgid "sets the NAME of the ego to use for the phone (and name resolution)" +#: src/conversation/gnunet-conversation.c:1295 +msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1279 +#: src/conversation/gnunet-conversation.c:1300 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1306 +#: src/conversation/gnunet-conversation.c:1329 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - -#: src/conversation/gnunet_gst.c:622 #: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:622 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1291,128 +1291,137 @@ msgstr "立即保存配置？" msgid "Core service of `%s' ready.\n" msgstr "服务已删除。\n" -#: src/core/gnunet-service-core_kx.c:566 +#: src/core/gnunet-service-core_kx.c:617 msgid "# bytes encrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:626 +#: src/core/gnunet-service-core_kx.c:677 msgid "# bytes decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:728 +#: src/core/gnunet-service-core_kx.c:779 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:778 +#: src/core/gnunet-service-core_kx.c:829 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:840 +#: src/core/gnunet-service-core_kx.c:891 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:874 +#: src/core/gnunet-service-core_kx.c:925 #, fuzzy msgid "# PING messages transmitted" msgstr "消息尺寸" -#: src/core/gnunet-service-core_kx.c:941 +#: src/core/gnunet-service-core_kx.c:992 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:948 -msgid "# ephemeral keys received" +#: src/core/gnunet-service-core_kx.c:1005 +msgid "# duplicate ephemeral keys ignored" +msgstr "" + +#: src/core/gnunet-service-core_kx.c:1040 +msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "" -#: src/core/gnunet-service-core_kx.c:987 +#: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"Ephemeral key message from peer `%s' rejected as its validity range does not " -"match our system time (%llu not in [%llu,%llu]).\n" +"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:998 -msgid "# EPHEMERAL_KEY messages received" +#: src/core/gnunet-service-core_kx.c:1060 +msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "" -#: src/core/gnunet-service-core_kx.c:1094 +#: src/core/gnunet-service-core_kx.c:1080 +#, fuzzy +msgid "# valid ephemeral keys received" +msgstr "保存配置失败。" + +#: src/core/gnunet-service-core_kx.c:1180 #: src/transport/gnunet-service-transport_validation.c:1128 msgid "# PING messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1103 +#: src/core/gnunet-service-core_kx.c:1189 msgid "# PING messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1161 +#: src/core/gnunet-service-core_kx.c:1248 msgid "# PONG messages created" msgstr "" -#: src/core/gnunet-service-core_kx.c:1187 +#: src/core/gnunet-service-core_kx.c:1274 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1200 +#: src/core/gnunet-service-core_kx.c:1287 msgid "# keepalive messages sent" msgstr "" -#: src/core/gnunet-service-core_kx.c:1264 +#: src/core/gnunet-service-core_kx.c:1351 #: src/transport/gnunet-service-transport_validation.c:1461 msgid "# PONG messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1271 +#: src/core/gnunet-service-core_kx.c:1358 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1276 +#: src/core/gnunet-service-core_kx.c:1363 msgid "# PONG messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1311 +#: src/core/gnunet-service-core_kx.c:1398 msgid "# PONG messages decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:1349 +#: src/core/gnunet-service-core_kx.c:1436 msgid "# session keys confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1360 +#: src/core/gnunet-service-core_kx.c:1447 msgid "# timeouts prevented via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1367 +#: src/core/gnunet-service-core_kx.c:1454 msgid "# rekey operations confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1521 +#: src/core/gnunet-service-core_kx.c:1642 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1529 +#: src/core/gnunet-service-core_kx.c:1650 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1532 +#: src/core/gnunet-service-core_kx.c:1653 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1593 -#: src/core/gnunet-service-core_kx.c:1619 +#: src/core/gnunet-service-core_kx.c:1742 +#: src/core/gnunet-service-core_kx.c:1768 msgid "# bytes dropped (duplicates)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1606 +#: src/core/gnunet-service-core_kx.c:1755 msgid "# bytes dropped (out of sequence)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1648 +#: src/core/gnunet-service-core_kx.c:1797 msgid "# bytes dropped (ancient message)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1656 +#: src/core/gnunet-service-core_kx.c:1805 msgid "# bytes of payload decrypted" msgstr "" @@ -1420,11 +1429,11 @@ msgstr "" #: src/core/gnunet-service-core_sessions.c:350 #: src/dht/gnunet-service-dht_neighbours.c:733 #: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520 -#: src/topology/gnunet-daemon-topology.c:612 -#: src/topology/gnunet-daemon-topology.c:714 -#: src/transport/gnunet-service-transport_neighbours.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:727 +#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 +#: src/topology/gnunet-daemon-topology.c:617 +#: src/topology/gnunet-daemon-topology.c:719 +#: src/transport/gnunet-service-transport_neighbours.c:721 +#: src/transport/gnunet-service-transport_neighbours.c:729 msgid "# peers connected" msgstr "" @@ -1451,53 +1460,183 @@ msgstr "" msgid "# updates to my type map" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:294 +#: src/credential/credential_misc.c:88 +#, fuzzy, c-format +msgid "Unable to parse CRED record string `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 +#: src/namestore/plugin_rest_namestore.c:1022 +#, c-format +msgid "Ego `%s' not known to identity service\n" +msgstr "" + +#: src/credential/gnunet-credential.c:280 +#: src/credential/gnunet-credential.c:434 +#, fuzzy, c-format +msgid "Issuer public key `%s' is not well-formed\n" +msgstr "“%s”的参数无效。\n" + +#: src/credential/gnunet-credential.c:361 +#: src/credential/gnunet-credential.c:423 +#, fuzzy, c-format +msgid "Issuer public key not well-formed\n" +msgstr "“%s”的参数无效。\n" + +#: src/credential/gnunet-credential.c:372 +#: src/credential/gnunet-credential.c:444 +#, fuzzy, c-format +msgid "Failed to connect to CREDENTIAL\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/credential/gnunet-credential.c:379 +#, c-format +msgid "You must provide issuer the attribute\n" +msgstr "" + +#: src/credential/gnunet-credential.c:387 +#, c-format +msgid "ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:403 +#, c-format +msgid "Subject public key needed\n" +msgstr "" + +#: src/credential/gnunet-credential.c:414 +#, fuzzy, c-format +msgid "Subject public key `%s' is not well-formed\n" +msgstr "“%s”的参数无效。\n" + +#: src/credential/gnunet-credential.c:451 +#, c-format +msgid "You must provide issuer and subject attributes\n" +msgstr "" + +#: src/credential/gnunet-credential.c:504 +#, c-format +msgid "Issuer ego required\n" +msgstr "" + +#: src/credential/gnunet-credential.c:516 +#, c-format +msgid "Please specify name to lookup, subject key and issuer key!\n" +msgstr "" + +#: src/credential/gnunet-credential.c:536 +msgid "create credential" +msgstr "" + +#: src/credential/gnunet-credential.c:540 +msgid "verify credential against attribute" +msgstr "" + +#: src/credential/gnunet-credential.c:545 +msgid "The public key of the subject to lookup the credential for" +msgstr "" + +#: src/credential/gnunet-credential.c:550 +msgid "The name of the credential presented by the subject" +msgstr "" + +#: src/credential/gnunet-credential.c:555 +msgid "The public key of the authority to verify the credential against" +msgstr "" + +#: src/credential/gnunet-credential.c:560 +#, fuzzy +msgid "The ego to use" +msgstr "消息尺寸" + +#: src/credential/gnunet-credential.c:565 +msgid "The issuer attribute to verify against or to issue" +msgstr "" + +#: src/credential/gnunet-credential.c:570 +msgid "The time to live for the credential" +msgstr "" + +#: src/credential/gnunet-credential.c:574 +msgid "collect credentials" +msgstr "" + +#: src/credential/gnunet-credential.c:588 +#, fuzzy +msgid "GNUnet credential resolver tool" +msgstr "GNUnet 错误日志" + +#: src/credential/gnunet-service-credential.c:1138 +#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#, fuzzy, c-format +msgid "Failed to connect to GNS\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/credential/gnunet-service-credential.c:1144 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 +#: src/namestore/gnunet-namestore.c:914 +#: src/namestore/plugin_rest_namestore.c:1035 +#, fuzzy, c-format +msgid "Failed to connect to namestore\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/credential/plugin_gnsrecord_credential.c:186 +#, fuzzy, c-format +msgid "Unable to parse ATTR record string `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +msgid "GNS REST API initialized\n" +msgstr "" + +#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 #: src/datastore/gnunet-service-datastore.c:757 msgid "# bytes stored" msgstr "" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:298 +#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 msgid "# items stored" msgstr "" -#: src/datacache/datacache.c:202 +#: src/datacache/datacache.c:206 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:213 +#: src/datacache/datacache.c:217 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" -#: src/datacache/datacache.c:329 +#: src/datacache/datacache.c:344 msgid "# requests received" msgstr "" -#: src/datacache/datacache.c:339 +#: src/datacache/datacache.c:354 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:367 +#: src/datacache/datacache.c:384 msgid "# requests for random value received" msgstr "" -#: src/datacache/datacache.c:399 +#: src/datacache/datacache.c:416 msgid "# proximity search requests received" msgstr "" -#: src/datacache/plugin_datacache_heap.c:466 +#: src/datacache/plugin_datacache_heap.c:550 #, fuzzy msgid "Heap datacache running\n" msgstr "sqlite 数据仓库" -#: src/datacache/plugin_datacache_sqlite.c:113 -#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datacache/plugin_datacache_sqlite.c:118 +#: src/datacache/plugin_datacache_sqlite.c:127 #: src/datastore/plugin_datastore_mysql.c:892 #: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92 -#: src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:66 +#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 +#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 +#: src/namecache/plugin_namecache_sqlite.c:52 #: src/namestore/plugin_namestore_sqlite.c:53 #: src/peerstore/plugin_peerstore_sqlite.c:52 #: src/psycstore/plugin_psycstore_mysql.c:62 @@ -1506,16 +1645,17 @@ msgstr "sqlite 数据仓库" #: src/testbed/gnunet-daemon-testbed-underlay.c:56 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744 +#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 #: src/scalarproduct/scalarproduct.h:35 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/datacache/plugin_datacache_sqlite.c:817 -#: src/datastore/plugin_datastore_sqlite.c:456 -#: src/namecache/plugin_namecache_sqlite.c:296 -#: src/namestore/plugin_namestore_sqlite.c:355 +#: src/datacache/plugin_datacache_sqlite.c:862 +#: src/datastore/plugin_datastore_sqlite.c:508 +#: src/identity-provider/plugin_identity_provider_sqlite.c:336 +#: src/namecache/plugin_namecache_sqlite.c:329 +#: src/namestore/plugin_namestore_sqlite.c:264 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" @@ -1808,7 +1948,7 @@ msgid "MySQL statement run failure" msgstr "" #: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:626 +#: src/datastore/plugin_datastore_sqlite.c:678 #, fuzzy msgid "Data too large" msgstr "迭代次数" @@ -1847,32 +1987,34 @@ msgid "`%s' failed at %s:%u with error: %s" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" #: src/datastore/plugin_datastore_sqlite.c:271 -#: src/namecache/plugin_namecache_sqlite.c:194 -#: src/namestore/plugin_namestore_sqlite.c:222 +#: src/identity-provider/plugin_identity_provider_sqlite.c:212 +#: src/namecache/plugin_namecache_sqlite.c:209 +#: src/namestore/plugin_namestore_sqlite.c:205 #: src/peerstore/plugin_peerstore_sqlite.c:535 #: src/psycstore/plugin_psycstore_sqlite.c:325 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/datastore/plugin_datastore_sqlite.c:577 +#: src/datastore/plugin_datastore_sqlite.c:629 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1259 +#: src/datastore/plugin_datastore_sqlite.c:1322 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1293 +#: src/datastore/plugin_datastore_sqlite.c:1356 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1337 -#: src/namecache/plugin_namecache_sqlite.c:603 -#: src/namestore/plugin_namestore_sqlite.c:802 +#: src/datastore/plugin_datastore_sqlite.c:1400 +#: src/identity-provider/plugin_identity_provider_sqlite.c:711 +#: src/namecache/plugin_namecache_sqlite.c:640 +#: src/namestore/plugin_namestore_sqlite.c:754 #, fuzzy msgid "Sqlite database running\n" msgstr "sqlite 数据仓库" @@ -1881,157 +2023,104 @@ msgstr "sqlite 数据仓库" msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:157 +#: src/dht/gnunet-dht-get.c:158 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" +#: src/dht/gnunet-dht-get.c:159 +#, c-format +msgid "Result %d, type %d:\n" +msgstr "" + #: src/dht/gnunet-dht-get.c:204 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248 +#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "初始化“%s”服务失败。\n" -#: src/dht/gnunet-dht-get.c:218 +#: src/dht/gnunet-dht-get.c:219 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298 -#: src/dht/gnunet-dht-put.c:222 +#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 +#: src/dht/gnunet-dht-put.c:198 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:251 +#: src/dht/gnunet-dht-get.c:253 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304 +#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:264 +#: src/dht/gnunet-dht-get.c:263 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227 +#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:283 +#: src/dht/gnunet-dht-get.c:280 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:310 +#: src/dht/gnunet-dht-monitor.c:319 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344 -#: src/nse/gnunet-nse-profiler.c:871 +#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 +#: src/nse/gnunet-nse-profiler.c:878 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:328 +#: src/dht/gnunet-dht-monitor.c:337 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "增加 TCP/IP 的最大连接数" - -#: src/dht/gnunet_dht_profiler.c:1188 -#, fuzzy -msgid "number of peers to start" -msgstr "迭代次数" - -#: src/dht/gnunet_dht_profiler.c:1194 -msgid "" -"maximum number of times we try to search for successor circle formation (0 " -"for R5N)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1206 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1212 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1218 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1223 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1230 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1248 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "无法访问该服务" - -#: src/dht/gnunet-dht-put.c:120 -msgid "PUT request sent with key" -msgstr "" - -#: src/dht/gnunet-dht-put.c:123 -msgid "Timeout sending PUT request!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:126 -msgid "PUT request not confirmed!\n" -msgstr "" - -#: src/dht/gnunet-dht-put.c:156 +#: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:163 -#, fuzzy, c-format -msgid "Could not connect to %s service!\n" +#: src/dht/gnunet-dht-put.c:142 +#, fuzzy +msgid "Could not connect to DHT service!\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/dht/gnunet-dht-put.c:174 +#: src/dht/gnunet-dht-put.c:153 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:210 +#: src/dht/gnunet-dht-put.c:188 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:193 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:207 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:238 +#: src/dht/gnunet-dht-put.c:211 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:244 +#: src/dht/gnunet-dht-put.c:216 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:262 +#: src/dht/gnunet-dht-put.c:233 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" @@ -2039,74 +2128,74 @@ msgstr "" msgid "# GET requests from clients injected" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:485 +#: src/dht/gnunet-service-dht_clients.c:483 msgid "# PUT requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:624 +#: src/dht/gnunet-service-dht_clients.c:616 msgid "# GET requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:850 +#: src/dht/gnunet-service-dht_clients.c:842 msgid "# GET STOP requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1035 +#: src/dht/gnunet-service-dht_clients.c:1027 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1050 +#: src/dht/gnunet-service-dht_clients.c:1042 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1096 +#: src/dht/gnunet-service-dht_clients.c:1088 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1103 +#: src/dht/gnunet-service-dht_clients.c:1095 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1181 +#: src/dht/gnunet-service-dht_clients.c:1173 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:72 +#: src/dht/gnunet-service-dht_datacache.c:73 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:82 +#: src/dht/gnunet-service-dht_datacache.c:83 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:198 +#: src/dht/gnunet-service-dht_datacache.c:202 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:210 +#: src/dht/gnunet-service-dht_datacache.c:214 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:216 +#: src/dht/gnunet-service-dht_datacache.c:220 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:222 +#: src/dht/gnunet-service-dht_datacache.c:226 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:234 +#: src/dht/gnunet-service-dht_datacache.c:238 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:242 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:273 +#: src/dht/gnunet-service-dht_datacache.c:277 msgid "# GET requests given to datacache" msgstr "" @@ -2234,16 +2323,64 @@ msgstr "" msgid "# DHT requests combined" msgstr "" -#: src/dht/plugin_block_dht.c:187 +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "增加 TCP/IP 的最大连接数" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "迭代次数" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "无法访问该服务" + +#: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" msgstr "" -#: src/dht/plugin_block_dht.c:194 +#: src/dht/plugin_block_dht.c:198 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:204 +#: src/dht/plugin_block_dht.c:209 #, c-format msgid "Block of type %u is malformed\n" msgstr "" @@ -2253,36 +2390,31 @@ msgstr "" msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsparser.c:818 +#: src/dns/dnsparser.c:823 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsstub.c:176 +#: src/dns/dnsstub.c:233 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382 +#: src/dns/dnsstub.c:364 +#, c-format +msgid "Received DNS response that is too small (%u bytes)" +msgstr "" + +#: src/dns/dnsstub.c:511 #, fuzzy, c-format -msgid "Failed to send DNS request to %s\n" +msgid "Failed to send DNS request to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsstub.c:298 +#: src/dns/dnsstub.c:517 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsstub.c:367 -#, c-format -msgid "Configured DNS exit `%s' is not working / valid.\n" -msgstr "" - -#: src/dns/dnsstub.c:437 -#, c-format -msgid "Received DNS response that is too small (%u bytes)" -msgstr "" - #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 msgid "only monitor DNS queries" msgstr "" @@ -2307,49 +2439,49 @@ msgstr "" msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:608 +#: src/dns/gnunet-service-dns.c:610 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:738 +#: src/dns/gnunet-service-dns.c:740 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:813 +#: src/dns/gnunet-service-dns.c:815 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:928 +#: src/dns/gnunet-service-dns.c:930 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:944 +#: src/dns/gnunet-service-dns.c:946 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:953 +#: src/dns/gnunet-service-dns.c:955 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:963 +#: src/dns/gnunet-service-dns.c:965 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:967 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1032 +#: src/dns/gnunet-service-dns.c:1034 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569 +#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "无效的进程优先级“%s”\n" -#: src/dns/gnunet-service-dns.c:1090 +#: src/dns/gnunet-service-dns.c:1092 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" @@ -2359,204 +2491,204 @@ msgstr "" msgid "Print information about DV state" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/exit/gnunet-daemon-exit.c:961 +#: src/exit/gnunet-daemon-exit.c:960 msgid "# TCP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1062 +#: src/exit/gnunet-daemon-exit.c:1061 msgid "# ICMP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1341 +#: src/exit/gnunet-daemon-exit.c:1340 msgid "# UDP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573 -#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702 -#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954 -#: src/exit/gnunet-daemon-exit.c:2208 +#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 +#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 +#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 +#: src/exit/gnunet-daemon-exit.c:2207 msgid "# Bytes received from CADET" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1468 +#: src/exit/gnunet-daemon-exit.c:1467 msgid "# UDP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1576 +#: src/exit/gnunet-daemon-exit.c:1575 msgid "# UDP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1616 +#: src/exit/gnunet-daemon-exit.c:1615 msgid "# TCP service creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1705 +#: src/exit/gnunet-daemon-exit.c:1704 msgid "# TCP IP-exit creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1789 +#: src/exit/gnunet-daemon-exit.c:1788 msgid "# TCP DATA requests dropped (no session)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1826 +#: src/exit/gnunet-daemon-exit.c:1825 msgid "# TCP data requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1957 +#: src/exit/gnunet-daemon-exit.c:1956 msgid "# ICMP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280 -#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828 +#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 +#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339 -#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887 +#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 +#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2211 +#: src/exit/gnunet-daemon-exit.c:2210 msgid "# ICMP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985 +#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 #: src/vpn/gnunet-service-vpn.c:2096 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875 +#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069 +#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 #, fuzzy msgid "# Inbound CADET channels created" msgstr "" "\n" "按任意键继续\n" -#: src/exit/gnunet-daemon-exit.c:2523 +#: src/exit/gnunet-daemon-exit.c:2522 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2542 +#: src/exit/gnunet-daemon-exit.c:2541 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "" "\n" "按任意键继续\n" -#: src/exit/gnunet-daemon-exit.c:2720 +#: src/exit/gnunet-daemon-exit.c:2719 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2728 +#: src/exit/gnunet-daemon-exit.c:2727 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2802 +#: src/exit/gnunet-daemon-exit.c:2801 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2874 +#: src/exit/gnunet-daemon-exit.c:2873 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2922 +#: src/exit/gnunet-daemon-exit.c:2921 msgid "# Packets received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2936 +#: src/exit/gnunet-daemon-exit.c:2935 msgid "# Bytes received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2962 +#: src/exit/gnunet-daemon-exit.c:2961 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2989 +#: src/exit/gnunet-daemon-exit.c:2988 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3035 +#: src/exit/gnunet-daemon-exit.c:3034 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3043 +#: src/exit/gnunet-daemon-exit.c:3042 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256 +#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "%s：选项“%s”有歧义\n" -#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278 +#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3319 +#: src/exit/gnunet-daemon-exit.c:3318 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346 +#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3358 +#: src/exit/gnunet-daemon-exit.c:3357 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3503 +#: src/exit/gnunet-daemon-exit.c:3501 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3511 +#: src/exit/gnunet-daemon-exit.c:3509 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3518 +#: src/exit/gnunet-daemon-exit.c:3516 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3524 +#: src/exit/gnunet-daemon-exit.c:3522 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3694 +#: src/exit/gnunet-daemon-exit.c:3690 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3809 +#: src/exit/gnunet-daemon-exit.c:3805 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3970 +#: src/exit/gnunet-daemon-exit.c:3966 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" @@ -2682,64 +2814,64 @@ msgstr "" msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "" -#: src/fs/fs_download.c:309 +#: src/fs/fs_download.c:310 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:334 +#: src/fs/fs_download.c:335 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:346 +#: src/fs/fs_download.c:347 #, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "" -#: src/fs/fs_download.c:533 src/fs/fs_download.c:545 +#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:955 +#: src/fs/fs_download.c:956 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" -#: src/fs/fs_download.c:1046 +#: src/fs/fs_download.c:1047 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1074 +#: src/fs/fs_download.c:1075 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1098 +#: src/fs/fs_download.c:1099 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:1110 +#: src/fs/fs_download.c:1111 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:1119 +#: src/fs/fs_download.c:1120 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_download.c:1219 +#: src/fs/fs_download.c:1220 #, fuzzy msgid "internal error decoding tree" msgstr "未知错误。\n" -#: src/fs/fs_download.c:1884 +#: src/fs/fs_download.c:1885 #, fuzzy msgid "Invalid URI" msgstr "无效条目。\n" @@ -2855,12 +2987,12 @@ msgstr "" msgid "Internal error." msgstr "未知错误。\n" -#: src/fs/fs_search.c:809 src/fs/fs_search.c:879 +#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/fs_search.c:966 +#: src/fs/fs_search.c:979 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" @@ -2912,93 +3044,93 @@ msgstr "打开日志文件“%s”失败：%s\n" msgid "Failed to compute hash of file." msgstr "" -#: src/fs/fs_uri.c:223 +#: src/fs/fs_uri.c:234 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:282 +#: src/fs/fs_uri.c:293 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:300 +#: src/fs/fs_uri.c:311 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:307 +#: src/fs/fs_uri.c:318 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:377 +#: src/fs/fs_uri.c:388 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:418 +#: src/fs/fs_uri.c:429 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:433 +#: src/fs/fs_uri.c:444 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:512 +#: src/fs/fs_uri.c:523 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:527 +#: src/fs/fs_uri.c:538 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:537 +#: src/fs/fs_uri.c:548 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:545 +#: src/fs/fs_uri.c:556 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:553 +#: src/fs/fs_uri.c:564 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:559 +#: src/fs/fs_uri.c:570 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:565 +#: src/fs/fs_uri.c:576 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:574 +#: src/fs/fs_uri.c:585 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:580 +#: src/fs/fs_uri.c:591 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:586 +#: src/fs/fs_uri.c:597 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:598 +#: src/fs/fs_uri.c:609 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:632 +#: src/fs/fs_uri.c:643 #, fuzzy msgid "invalid argument" msgstr "“%s”的参数无效。\n" -#: src/fs/fs_uri.c:644 +#: src/fs/fs_uri.c:655 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075 +#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 msgid "No keywords specified!\n" msgstr "" -#: src/fs/fs_uri.c:1081 +#: src/fs/fs_uri.c:1092 msgid "Number of double-quotes not balanced!\n" msgstr "" @@ -3038,19 +3170,19 @@ msgstr "" msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911 +#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949 +#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 msgid "specify the priority of the content" msgstr "" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962 +#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 msgid "set the desired replication LEVEL" msgstr "" @@ -3097,105 +3229,97 @@ msgstr "更改 GNUnet 目录的权限出错" msgid "Display contents of a GNUnet directory" msgstr "更改 GNUnet 目录的权限出错" -#: src/fs/gnunet-download.c:137 +#: src/fs/gnunet-download.c:139 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "未知的命令“%s”。\n" -#: src/fs/gnunet-download.c:147 +#: src/fs/gnunet-download.c:149 #, fuzzy msgid "" msgstr "未知错误" -#: src/fs/gnunet-download.c:157 +#: src/fs/gnunet-download.c:158 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:179 +#: src/fs/gnunet-download.c:184 #, c-format msgid "Error downloading: %s.\n" msgstr "" -#: src/fs/gnunet-download.c:194 +#: src/fs/gnunet-download.c:201 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "" -#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295 +#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:233 +#: src/fs/gnunet-download.c:246 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "您必须指定一个昵称\n" -#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:264 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:253 +#: src/fs/gnunet-download.c:273 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870 +#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "初始化“%s”服务失败。\n" -#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:311 +#: src/fs/gnunet-download.c:344 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:322 +#: src/fs/gnunet-download.c:354 msgid "write the file to FILENAME" msgstr "" -#: src/fs/gnunet-download.c:328 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:334 +#: src/fs/gnunet-download.c:364 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:339 +#: src/fs/gnunet-download.c:368 msgid "download a GNUnet directory recursively" msgstr "" -#: src/fs/gnunet-download.c:356 +#: src/fs/gnunet-download.c:386 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" -msgstr "" - #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3208,8 +3332,16 @@ msgstr "" msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 -msgid "run a testbed to measure file-sharing performance" +#: src/fs/gnunet-fs-profiler.c:233 +msgid "run a testbed to measure file-sharing performance" +msgstr "" + +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" msgstr "" #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 @@ -3343,56 +3475,56 @@ msgstr "" msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:916 +#: src/fs/gnunet-publish.c:913 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:923 +#: src/fs/gnunet-publish.c:919 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:935 +#: src/fs/gnunet-publish.c:930 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:942 +#: src/fs/gnunet-publish.c:937 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:955 +#: src/fs/gnunet-publish.c:950 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:968 +#: src/fs/gnunet-publish.c:960 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:975 +#: src/fs/gnunet-publish.c:966 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:982 +#: src/fs/gnunet-publish.c:973 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:998 +#: src/fs/gnunet-publish.c:989 msgid "Publish a file or directory on GNUnet" msgstr "" @@ -3465,7 +3597,7 @@ msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "立即保存配置？" #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1203 +#: src/topology/gnunet-daemon-topology.c:1202 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "初始化“%s”服务失败。\n" @@ -3514,7 +3646,7 @@ msgstr "" msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343 +#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 msgid "# P2P searches active" msgstr "" @@ -3562,19 +3694,19 @@ msgstr "" msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1239 +#: src/fs/gnunet-service-fs_cp.c:1241 msgid "# requests dropped due to full reply queue" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1295 +#: src/fs/gnunet-service-fs_cp.c:1297 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1339 +#: src/fs/gnunet-service-fs_cp.c:1341 msgid "# P2P query messages received and processed" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1706 +#: src/fs/gnunet-service-fs_cp.c:1708 msgid "# migration stop messages sent" msgstr "" @@ -3782,6 +3914,10 @@ msgstr "" msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" +#: src/gns/gns_tld_api.c:276 +msgid "Expected a base32-encoded public zone key\n" +msgstr "" + #: src/gns/gnunet-bcd.c:127 #, c-format msgid "Refusing `%s' request to HTTP server\n" @@ -3810,128 +3946,64 @@ msgstr "" msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:238 +#: src/gns/gnunet-dns2gns.c:203 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-dns2gns.c:408 +#: src/gns/gnunet-dns2gns.c:404 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:424 +#: src/gns/gnunet-dns2gns.c:420 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:432 +#: src/gns/gnunet-dns2gns.c:428 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:711 -msgid "No ego configured for `dns2gns` subsystem\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:739 +#: src/gns/gnunet-dns2gns.c:587 msgid "No DNS server specified!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:760 -msgid "No valid GNS zone specified!\n" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:784 +#: src/gns/gnunet-dns2gns.c:687 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:790 -msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:796 -msgid "Authoritative DNS suffix to use (optional); default: zkey.eu" -msgstr "" - -#: src/gns/gnunet-dns2gns.c:802 +#: src/gns/gnunet-dns2gns.c:692 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:808 -msgid "Public key of the GNS zone to use (overrides default)" +#: src/gns/gnunet-dns2gns.c:709 +msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-dns2gns.c:826 -msgid "GNUnet DNS-to-GNS proxy (a DNS server)" +#: src/gns/gnunet-gns-benchmark.c:582 +msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" +#: src/gns/gnunet-gns-benchmark.c:587 +msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns.c:252 -#, c-format -msgid "Please specify name to lookup!\n" +#: src/gns/gnunet-gns-benchmark.c:591 +msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:276 -#, c-format -msgid "Ego for `%s' not found, cannot perform lookup.\n" +#: src/gns/gnunet-gns-helper-service-w32.c:602 +msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701 -#: src/gns/plugin_rest_gns.c:422 -#, c-format +#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727 -#, fuzzy, c-format -msgid "Failed to connect to GNS\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/gns/gnunet-gns.c:374 -#, c-format -msgid "Public key `%s' is not well-formed\n" -msgstr "" - -#: src/gns/gnunet-gns.c:428 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:434 -msgid "Specify the type of the record to lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:440 -msgid "Specify timeout for the lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:445 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:451 -msgid "Specify the public key of the zone to lookup the record in" -msgstr "" - -#: src/gns/gnunet-gns.c:457 -msgid "Specify the name of the ego of the zone to lookup the record in" -msgstr "" - -#: src/gns/gnunet-gns.c:476 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "GNUnet 错误日志" - -#: src/gns/gnunet-gns-helper-service-w32.c:602 -msgid "Not ready to process requests, lacking ego data\n" -msgstr "" - #: src/gns/gnunet-gns-helper-service-w32.c:739 #, fuzzy, c-format msgid "Failed to connect to identity service\n" @@ -3942,228 +4014,237 @@ msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" #: src/gns/gnunet-gns-proxy.c:109 -#: src/hostlist/gnunet-daemon-hostlist_client.c:569 -#: src/hostlist/gnunet-daemon-hostlist_client.c:787 -#: src/hostlist/gnunet-daemon-hostlist_client.c:793 -#: src/hostlist/gnunet-daemon-hostlist_client.c:845 -#: src/hostlist/gnunet-daemon-hostlist_client.c:854 -#: src/hostlist/gnunet-daemon-hostlist_client.c:965 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1060 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1065 +#: src/hostlist/gnunet-daemon-hostlist_client.c:535 +#: src/hostlist/gnunet-daemon-hostlist_client.c:753 +#: src/hostlist/gnunet-daemon-hostlist_client.c:759 +#: src/hostlist/gnunet-daemon-hostlist_client.c:811 +#: src/hostlist/gnunet-daemon-hostlist_client.c:820 +#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1026 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 #: src/transport/plugin_transport_http_client.c:598 #: src/transport/plugin_transport_http_client.c:616 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:887 +#: src/gns/gnunet-gns-proxy.c:910 #, fuzzy, c-format -msgid "Unsupported CURL SSL backend %d\n" +msgid "Unsupported CURL TLS backend %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:933 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/gns/gnunet-gns-proxy.c:946 +#: src/gns/gnunet-gns-proxy.c:969 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:961 +#: src/gns/gnunet-gns-proxy.c:984 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:971 +#: src/gns/gnunet-gns-proxy.c:994 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:995 +#: src/gns/gnunet-gns-proxy.c:1018 #, c-format -msgid "SSL certificate subject name (%s) does not match `%s'\n" +msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1104 +#: src/gns/gnunet-gns-proxy.c:1132 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1709 +#: src/gns/gnunet-gns-proxy.c:1868 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2172 +#: src/gns/gnunet-gns-proxy.c:2364 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "无法创建用户账户：" -#: src/gns/gnunet-gns-proxy.c:2202 +#: src/gns/gnunet-gns-proxy.c:2394 #, fuzzy, c-format msgid "Unable to import certificate %s\n" msgstr "无法保存配置文件“%s”：" -#: src/gns/gnunet-gns-proxy.c:2375 +#: src/gns/gnunet-gns-proxy.c:2573 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533 +#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:2716 +#: src/gns/gnunet-gns-proxy.c:2925 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2745 +#: src/gns/gnunet-gns-proxy.c:2954 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792 -msgid "SSL connection to plain IPv4 address requested\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:2842 +#: src/gns/gnunet-gns-proxy.c:3035 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403 -#, c-format -msgid "No ego configured for `%s`\n" -msgstr "" - -#: src/gns/gnunet-gns-proxy.c:3238 +#: src/gns/gnunet-gns-proxy.c:3316 #, fuzzy, c-format -msgid "Failed to load SSL/TLS key and certificate from `%s'\n" +msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:3281 +#: src/gns/gnunet-gns-proxy.c:3443 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3287 +#: src/gns/gnunet-gns-proxy.c:3448 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3312 +#: src/gns/gnunet-gns-proxy.c:3473 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:442 +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "GNUnet 错误日志" + +#: src/gns/gnunet-service-gns.c:513 +#, fuzzy +msgid "Properly base32-encoded public key required" +msgstr "“%s”的参数无效。\n" + +#: src/gns/gnunet-service-gns.c:549 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-service-gns.c:461 -#: src/zonemaster/gnunet-service-zonemaster.c:742 +#: src/gns/gnunet-service-gns.c:568 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/zonemaster/gnunet-service-zonemaster.c:875 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/gns/gnunet-service-gns_interceptor.c:263 +#: src/gns/gnunet-service-gns_interceptor.c:259 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:370 +#: src/gns/gnunet-service-gns_interceptor.c:366 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-service-gns_resolver.c:641 +#: src/gns/gnunet-service-gns_resolver.c:713 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:652 +#: src/gns/gnunet-service-gns_resolver.c:724 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:844 +#: src/gns/gnunet-service-gns_resolver.c:927 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-service-gns_resolver.c:986 +#: src/gns/gnunet-service-gns_resolver.c:1102 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1347 +#: src/gns/gnunet-service-gns_resolver.c:1796 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1865 +#: src/gns/gnunet-service-gns_resolver.c:1839 +msgid "GNS lookup failed (zero records found)\n" +msgstr "" + +#: src/gns/gnunet-service-gns_resolver.c:2253 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1889 +#: src/gns/gnunet-service-gns_resolver.c:2276 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-service-gns_resolver.c:2171 +#: src/gns/gnunet-service-gns_resolver.c:2563 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2318 -#, c-format -msgid "Hostname `%s' is not well-formed, resolution fails\n" -msgstr "" - -#: src/gns/plugin_gnsrecord_gns.c:203 +#: src/gns/plugin_gnsrecord_gns.c:181 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:232 +#: src/gns/plugin_gnsrecord_gns.c:212 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:253 +#: src/gns/plugin_gnsrecord_gns.c:233 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:276 +#: src/gns/plugin_gnsrecord_gns.c:258 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:312 +#: src/gns/plugin_gnsrecord_gns.c:294 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:360 -#, fuzzy, c-format -msgid "Unable to parse REVERSE record string `%s'\n" -msgstr "解析配置文件“%s”失败\n" - #: src/gns/plugin_rest_gns.c:384 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gns/plugin_rest_gns.c:668 -msgid "GNS REST API initialized\n" -msgstr "" - #: src/gnsrecord/plugin_gnsrecord_dns.c:359 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" @@ -4331,150 +4412,150 @@ msgstr "" msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:371 +#: src/hostlist/gnunet-daemon-hostlist_client.c:349 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:392 -#: src/hostlist/gnunet-daemon-hostlist_client.c:437 +#: src/hostlist/gnunet-daemon-hostlist_client.c:370 +#: src/hostlist/gnunet-daemon-hostlist_client.c:403 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:395 -#: src/hostlist/gnunet-daemon-hostlist_client.c:440 +#: src/hostlist/gnunet-daemon-hostlist_client.c:373 +#: src/hostlist/gnunet-daemon-hostlist_client.c:406 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:413 +#: src/hostlist/gnunet-daemon-hostlist_client.c:391 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:695 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1441 +#: src/hostlist/gnunet-daemon-hostlist_client.c:661 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:725 +#: src/hostlist/gnunet-daemon-hostlist_client.c:691 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:768 +#: src/hostlist/gnunet-daemon-hostlist_client.c:734 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:862 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:876 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:930 +#: src/hostlist/gnunet-daemon-hostlist_client.c:896 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:936 +#: src/hostlist/gnunet-daemon-hostlist_client.c:902 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:944 +#: src/hostlist/gnunet-daemon-hostlist_client.c:910 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:997 +#: src/hostlist/gnunet-daemon-hostlist_client.c:963 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1005 +#: src/hostlist/gnunet-daemon-hostlist_client.c:971 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1132 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1698 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1141 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1200 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1221 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 msgid "# active connections" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1387 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1392 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1435 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1438 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1484 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1491 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1515 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1532 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1527 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1628 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 #: src/transport/plugin_transport_http_client.c:2274 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1657 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1671 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1684 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4492,7 +4573,7 @@ msgstr "" #: src/hostlist/gnunet-daemon-hostlist_server.c:531 #: src/peerinfo-tool/gnunet-peerinfo.c:385 #: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:857 +#: src/topology/gnunet-daemon-topology.c:862 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" @@ -4588,6 +4669,70 @@ msgstr "“%s”不可用。\n" msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "%s：选项“%s”有歧义\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "设置要使用的昵称(必须)" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "运行 %s失败：%s %d\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +msgid "Identity Provider REST API initialized\n" +msgstr "" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -4675,32 +4820,10 @@ msgstr "解析配置文件“%s”失败\n" msgid "Failed to create directory `%s' for storing egos\n" msgstr "解析配置文件“%s”失败\n" -#: src/identity/plugin_rest_identity.c:967 +#: src/identity/plugin_rest_identity.c:968 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-identity-token.c:66 -#, fuzzy -msgid "Option `-t' is required\n" -msgstr "%s：选项“%s”有歧义\n" - -#: src/identity-provider/gnunet-identity-token.c:77 -#, fuzzy, c-format -msgid "Token `%s' is malformed\n" -msgstr "“%s”的参数无效。\n" - -#: src/identity-provider/gnunet-identity-token.c:166 -msgid "GNUid token" -msgstr "" - -#: src/identity-provider/gnunet-identity-token.c:171 -msgid "Print token contents" -msgstr "" - -#: src/identity-provider/plugin_rest_identity_provider.c:1166 -msgid "Identity Token REST API initialized\n" -msgstr "" - #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4730,7 +4853,7 @@ msgstr "无法解析“%s”(%s)：%s\n" msgid "No records found for `%s'" msgstr "运行 %s失败：%s %d\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415 +#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" @@ -4750,7 +4873,7 @@ msgstr "“%s”的参数无效。\n" msgid "You must specify a name\n" msgstr "您必须指定一个接收方！\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170 +#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 msgid "name of the record to add/delete/display" msgstr "" @@ -4758,7 +4881,7 @@ msgstr "" msgid "spezifies the public key of the zone to look in" msgstr "" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228 +#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet 配置" @@ -4772,288 +4895,294 @@ msgstr "" msgid "Error communicating with namecache service" msgstr "连接 %s:%u 出错。守护程序在运行吗？\n" -#: src/namecache/plugin_namecache_flat.c:119 -#: src/namecache/plugin_namecache_flat.c:253 -#: src/namestore/plugin_namestore_flat.c:179 -#: src/namestore/plugin_namestore_flat.c:375 +#: src/namecache/plugin_namecache_flat.c:121 +#: src/namecache/plugin_namecache_flat.c:255 +#: src/namestore/plugin_namestore_flat.c:150 +#: src/namestore/plugin_namestore_flat.c:385 #: src/peerstore/plugin_peerstore_flat.c:379 #: src/peerstore/plugin_peerstore_flat.c:538 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/namecache/plugin_namecache_flat.c:130 -#: src/namestore/plugin_namestore_flat.c:190 +#: src/namecache/plugin_namecache_flat.c:132 +#: src/namestore/plugin_namestore_flat.c:161 #: src/peerstore/plugin_peerstore_flat.c:394 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "发送消息失败。\n" -#: src/namecache/plugin_namecache_flat.c:149 -#: src/namestore/plugin_namestore_flat.c:203 +#: src/namecache/plugin_namecache_flat.c:151 +#: src/namestore/plugin_namestore_flat.c:174 #: src/peerstore/plugin_peerstore_flat.c:406 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "发送消息失败。\n" -#: src/namecache/plugin_namecache_flat.c:408 +#: src/namecache/plugin_namecache_flat.c:410 #, fuzzy msgid "flat plugin running\n" msgstr "sqlite 数据仓库" -#: src/namestore/gnunet-namestore.c:301 +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "未知的命令“%s”。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "发送消息失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + +#: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:330 -#: src/namestore/plugin_rest_namestore.c:562 +#: src/namestore/gnunet-namestore.c:343 +#: src/namestore/plugin_rest_namestore.c:572 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:337 -#: src/namestore/plugin_rest_namestore.c:571 +#: src/namestore/gnunet-namestore.c:350 +#: src/namestore/plugin_rest_namestore.c:581 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527 -#: src/namestore/gnunet-namestore.c:535 +#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561 -#: src/namestore/gnunet-namestore.c:573 +#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:698 -#: src/namestore/plugin_rest_namestore.c:597 +#: src/namestore/gnunet-namestore.c:677 #, c-format -msgid "There are no records under label `%s' that could be deleted.\n" +msgid "" +"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:739 +#: src/namestore/gnunet-namestore.c:810 +#: src/namestore/plugin_rest_namestore.c:607 #, c-format -msgid "" -"There are no records under label `%s' that match the request for deletion.\n" +msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:776 -#: src/namestore/plugin_rest_namestore.c:1004 +#: src/namestore/gnunet-namestore.c:851 #, c-format -msgid "Ego `%s' not known to identity service\n" +msgid "" +"There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:791 +#: src/namestore/gnunet-namestore.c:903 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:802 -#: src/namestore/gnunet-namestore-fcfsd.c:1034 -#: src/namestore/plugin_rest_namestore.c:1017 -#, fuzzy -msgid "Failed to connect to namestore\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819 -#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861 -#: src/namestore/gnunet-namestore.c:915 +#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 +#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 +#: src/namestore/gnunet-namestore.c:1027 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "配置文件“%s”已写入。\n" -#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820 -#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863 +#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 +#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:829 -#: src/namestore/plugin_rest_namestore.c:671 +#: src/namestore/gnunet-namestore.c:941 +#: src/namestore/plugin_rest_namestore.c:684 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/namestore/gnunet-namestore.c:851 -#: src/namestore/plugin_rest_namestore.c:689 -#: src/namestore/plugin_rest_namestore.c:729 +#: src/namestore/gnunet-namestore.c:963 +#: src/namestore/plugin_rest_namestore.c:704 +#: src/namestore/plugin_rest_namestore.c:746 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:896 +#: src/namestore/gnunet-namestore.c:1008 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/namestore/gnunet-namestore.c:916 +#: src/namestore/gnunet-namestore.c:1028 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:950 +#: src/namestore/gnunet-namestore.c:1071 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1100 +#: src/peerinfo-tool/gnunet-peerinfo.c:775 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "无效条目。\n" -#: src/namestore/gnunet-namestore.c:1014 +#: src/namestore/gnunet-namestore.c:1135 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "无效条目。\n" -#: src/namestore/gnunet-namestore.c:1051 -#: src/namestore/plugin_rest_namestore.c:1047 +#: src/namestore/gnunet-namestore.c:1175 +#: src/namestore/plugin_rest_namestore.c:1065 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1108 -#: src/namestore/plugin_rest_namestore.c:1143 +#: src/namestore/gnunet-namestore.c:1239 +#: src/namestore/plugin_rest_namestore.c:1161 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/namestore/gnunet-namestore.c:1137 +#: src/namestore/gnunet-namestore.c:1264 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1142 +#: src/namestore/gnunet-namestore.c:1268 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1147 +#: src/namestore/gnunet-namestore.c:1272 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1153 +#: src/namestore/gnunet-namestore.c:1277 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1159 +#: src/namestore/gnunet-namestore.c:1282 #, fuzzy msgid "set the desired nick name for the zone" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/namestore/gnunet-namestore.c:1164 +#: src/namestore/gnunet-namestore.c:1286 #, fuzzy msgid "monitor changes in the namestore" msgstr "初始化“%s”服务失败。\n" -#: src/namestore/gnunet-namestore.c:1176 +#: src/namestore/gnunet-namestore.c:1296 #, fuzzy msgid "determine our name for the given PKEY" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/namestore/gnunet-namestore.c:1184 +#: src/namestore/gnunet-namestore.c:1301 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1190 +#: src/namestore/gnunet-namestore.c:1306 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1196 +#: src/namestore/gnunet-namestore.c:1311 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1201 +#: src/namestore/gnunet-namestore.c:1315 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1206 +#: src/namestore/gnunet-namestore.c:1319 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1212 +#: src/namestore/gnunet-namestore.c:1324 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:508 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "未知的命令“%s”。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:535 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:555 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:585 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:662 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:718 +#: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format -msgid "Failed to create page for `%s'\n" +msgid "Failed to replicate block in namecache: %s\n" msgstr "发送消息失败。\n" -#: src/namestore/gnunet-namestore-fcfsd.c:734 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:770 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:778 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:974 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1000 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1042 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1074 -msgid "GNU Name System First Come First Serve name registration service" +#: src/namestore/gnunet-zoneimport.c:2035 +msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-service-namestore.c:615 -#, fuzzy, c-format -msgid "Failed to replicate block in namecache: %s\n" -msgstr "发送消息失败。\n" +#: src/namestore/gnunet-zoneimport.c:2040 +msgid "minimum expiration time we assume for imported records" +msgstr "" -#: src/namestore/namestore_api.c:379 +#: src/namestore/namestore_api.c:391 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:656 +#: src/namestore/plugin_namestore_flat.c:767 #, fuzzy msgid "flat file database running\n" msgstr "sqlite 数据仓库" -#: src/namestore/plugin_rest_namestore.c:1188 +#: src/namestore/plugin_namestore_sqlite.c:218 +#: src/namestore/plugin_namestore_sqlite.c:229 +#, fuzzy, c-format +msgid "Failed to setup database at `%s'\n" +msgstr "运行 %s失败：%s %d\n" + +#: src/namestore/plugin_rest_namestore.c:1206 msgid "Namestore REST API initialized\n" msgstr "" @@ -5083,11 +5212,11 @@ msgstr "配额配置" msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452 +#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 msgid "use UDP" msgstr "" @@ -5262,57 +5391,57 @@ msgstr "解析配置文件“%s”失败\n" msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/nat/gnunet-nat.c:425 +#: src/nat/gnunet-nat.c:431 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:437 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:443 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:442 +#: src/nat/gnunet-nat.c:448 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:457 +#: src/nat/gnunet-nat.c:463 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:469 +#: src/nat/gnunet-nat.c:475 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1335 +#: src/nat/gnunet-service-nat.c:1339 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1345 +#: src/nat/gnunet-service-nat.c:1349 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1361 +#: src/nat/gnunet-service-nat.c:1365 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1372 +#: src/nat/gnunet-service-nat.c:1376 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1837 +#: src/nat/gnunet-service-nat.c:1841 msgid "Connection reversal request failed\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1910 +#: src/nat/gnunet-service-nat.c:1914 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" @@ -5336,95 +5465,41 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." -msgstr "" - -#: src/nse/gnunet-nse-profiler.c:842 +#: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:847 +#: src/nse/gnunet-nse-profiler.c:854 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:859 +#: src/nse/gnunet-nse-profiler.c:866 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:873 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:877 +#: src/nse/gnunet-nse-profiler.c:884 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:886 +#: src/nse/gnunet-nse-profiler.c:893 #, fuzzy msgid "Measure quality and performance of the NSE service." msgstr "无法访问该服务" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." +msgstr "" + #: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 #, fuzzy msgid "Value is too large.\n" msgstr "值不在合法范围内。" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:310 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:331 -#: src/peerinfo/gnunet-service-peerinfo.c:362 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:446 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:489 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:655 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:663 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1080 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1409 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1422 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" - #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format msgid "%sPeer `%s'\n" @@ -5516,6 +5591,60 @@ msgstr "" msgid "Failed to load transport plugin for `%s'\n" msgstr "解析配置文件“%s”失败\n" +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" + +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." +msgstr "" + #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -5819,11 +5948,11 @@ msgstr "服务已删除。\n" msgid "Search string `%s' is too long!\n" msgstr "服务已删除。\n" -#: src/rest/gnunet-rest-server.c:790 +#: src/rest/gnunet-rest-server.c:927 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:807 +#: src/rest/gnunet-rest-server.c:944 #, fuzzy msgid "GNUnet REST server" msgstr "GNUnet 错误日志" @@ -5956,19 +6085,22 @@ msgid "# revocation set unions completed" msgstr "" #: src/revocation/gnunet-service-revocation.c:525 -#: src/revocation/gnunet-service-revocation.c:773 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:864 +#: src/revocation/gnunet-service-revocation.c:867 #, fuzzy msgid "Could not open revocation database file!" msgstr "无法连接到 %s:%u：%s\n" -#: src/rps/gnunet-rps.c:146 +#: src/rps/gnunet-rps.c:203 msgid "Seed a PeerID" msgstr "" +#: src/rps/gnunet-rps.c:207 +msgid "Get updates of view (0 for infinite updates)" +msgstr "" + #: src/scalarproduct/gnunet-scalarproduct.c:220 #, fuzzy msgid "You must specify at least one message ID to check!\n" @@ -6024,10 +6156,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 #, fuzzy msgid "Connect to CADET failed\n" msgstr "“%s”已连接到“%s”。\n" @@ -6405,14 +6537,14 @@ msgstr "" msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:247 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306 +#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" @@ -6482,15 +6614,6 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -msgid "Waiting for child to exit.\n" -msgstr "" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "卸载 GNUnet 服务" - #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6502,6 +6625,15 @@ msgid "" "signal is received" msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +msgid "Waiting for child to exit.\n" +msgstr "" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "卸载 GNUnet 服务" + #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -6724,84 +6856,80 @@ msgstr "运行 %s失败：%s %d\n" msgid "Failed to load configuration from %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/topology/friends.c:106 +#: src/topology/friends.c:126 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "配置文件“%s”第 %d 行有语法错误。\n" -#: src/topology/friends.c:160 +#: src/topology/friends.c:180 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:225 +#: src/topology/gnunet-daemon-topology.c:230 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:339 +#: src/topology/gnunet-daemon-topology.c:344 msgid "# connect requests issued to ATS" msgstr "" -#: src/topology/gnunet-daemon-topology.c:533 +#: src/topology/gnunet-daemon-topology.c:538 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:635 -#: src/topology/gnunet-daemon-topology.c:721 +#: src/topology/gnunet-daemon-topology.c:640 +#: src/topology/gnunet-daemon-topology.c:726 msgid "# friends connected" msgstr "" -#: src/topology/gnunet-daemon-topology.c:918 +#: src/topology/gnunet-daemon-topology.c:923 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:951 +#: src/topology/gnunet-daemon-topology.c:956 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:958 +#: src/topology/gnunet-daemon-topology.c:963 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr "" "\n" "结束配置。\n" -#: src/topology/gnunet-daemon-topology.c:980 +#: src/topology/gnunet-daemon-topology.c:985 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:983 +#: src/topology/gnunet-daemon-topology.c:988 #, fuzzy msgid "# friends in configuration" msgstr "" "\n" "结束配置。\n" -#: src/topology/gnunet-daemon-topology.c:990 +#: src/topology/gnunet-daemon-topology.c:995 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:996 +#: src/topology/gnunet-daemon-topology.c:1001 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1059 +#: src/topology/gnunet-daemon-topology.c:1054 #: src/transport/plugin_transport_wlan.c:1517 msgid "# HELLO messages received" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1233 +#: src/topology/gnunet-daemon-topology.c:1232 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -6847,197 +6975,201 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "立即保存配置？" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:804 +#: src/transport/gnunet-service-transport_neighbours.c:806 msgid "# session creation failed" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1047 +#: src/transport/gnunet-service-transport_neighbours.c:1053 msgid "# DISCONNECT messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1168 +#: src/transport/gnunet-service-transport_neighbours.c:1176 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1311 -#: src/transport/gnunet-service-transport_neighbours.c:1764 +#: src/transport/gnunet-service-transport_neighbours.c:1324 +#: src/transport/gnunet-service-transport_neighbours.c:1785 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1316 +#: src/transport/gnunet-service-transport_neighbours.c:1329 msgid "# messages transmitted to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1322 +#: src/transport/gnunet-service-transport_neighbours.c:1335 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1382 +#: src/transport/gnunet-service-transport_neighbours.c:1395 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1458 +#: src/transport/gnunet-service-transport_neighbours.c:1479 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1494 +#: src/transport/gnunet-service-transport_neighbours.c:1515 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1502 +#: src/transport/gnunet-service-transport_neighbours.c:1523 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1512 +#: src/transport/gnunet-service-transport_neighbours.c:1533 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1557 +#: src/transport/gnunet-service-transport_neighbours.c:1578 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1566 +#: src/transport/gnunet-service-transport_neighbours.c:1587 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1574 +#: src/transport/gnunet-service-transport_neighbours.c:1595 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1583 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1588 +#: src/transport/gnunet-service-transport_neighbours.c:1609 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1594 +#: src/transport/gnunet-service-transport_neighbours.c:1615 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1661 +#: src/transport/gnunet-service-transport_neighbours.c:1682 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1695 +#: src/transport/gnunet-service-transport_neighbours.c:1716 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1710 +#: src/transport/gnunet-service-transport_neighbours.c:1731 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1830 +#: src/transport/gnunet-service-transport_neighbours.c:1854 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1850 +#: src/transport/gnunet-service-transport_neighbours.c:1874 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1889 +#: src/transport/gnunet-service-transport_neighbours.c:1913 #, fuzzy msgid "# SYN messages sent" msgstr "消息尺寸" -#: src/transport/gnunet-service-transport_neighbours.c:1906 +#: src/transport/gnunet-service-transport_neighbours.c:1930 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport_neighbours.c:1936 +#: src/transport/gnunet-service-transport_neighbours.c:1960 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2001 +#: src/transport/gnunet-service-transport_neighbours.c:2028 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-service-transport_neighbours.c:2055 +#: src/transport/gnunet-service-transport_neighbours.c:2082 msgid "# SYN_ACK messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2072 +#: src/transport/gnunet-service-transport_neighbours.c:2099 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport_neighbours.c:2233 +#: src/transport/gnunet-service-transport_neighbours.c:2262 msgid "# SYN messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2238 +#: src/transport/gnunet-service-transport_neighbours.c:2267 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2623 +#: src/transport/gnunet-service-transport_neighbours.c:2654 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3105 +#: src/transport/gnunet-service-transport_neighbours.c:3139 msgid "# SYN_ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3113 +#: src/transport/gnunet-service-transport_neighbours.c:3147 msgid "# unexpected SYN_ACK messages (no peer)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3131 -#: src/transport/gnunet-service-transport_neighbours.c:3155 +#: src/transport/gnunet-service-transport_neighbours.c:3165 +#: src/transport/gnunet-service-transport_neighbours.c:3189 msgid "# unexpected SYN_ACK messages (not ready)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3167 +#: src/transport/gnunet-service-transport_neighbours.c:3201 msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3192 +#: src/transport/gnunet-service-transport_neighbours.c:3226 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3205 +#: src/transport/gnunet-service-transport_neighbours.c:3239 msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3377 +#: src/transport/gnunet-service-transport_neighbours.c:3412 msgid "# ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3413 +#: src/transport/gnunet-service-transport_neighbours.c:3448 msgid "# unexpected ACK messages" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3501 +#: src/transport/gnunet-service-transport_neighbours.c:3536 msgid "# quota messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3508 +#: src/transport/gnunet-service-transport_neighbours.c:3543 msgid "# QUOTA messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3548 +#: src/transport/gnunet-service-transport_neighbours.c:3583 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3555 +#: src/transport/gnunet-service-transport_neighbours.c:3590 msgid "# DISCONNECT messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3566 +#: src/transport/gnunet-service-transport_neighbours.c:3601 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3700 +#: src/transport/gnunet-service-transport_neighbours.c:3736 msgid "# disconnected from peer upon explicit request" msgstr "" @@ -7151,6 +7283,48 @@ msgstr "" msgid "# validations succeeded" msgstr "" +#: src/transport/gnunet-service-transport_validation.c:1627 +msgid "# HELLOs given to peerinfo" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +msgid "receive data from peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "每次迭代所使用的消息数量" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "消息尺寸" + +#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1462 +msgid "peer identity" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1482 +#, fuzzy +msgid "Direct access to transport service." +msgstr "初始化“%s”服务失败。\n" + #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7287,11 +7461,6 @@ msgstr "" msgid "do not resolve hostnames" msgstr "" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 -msgid "peer identity" -msgstr "" - #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7300,44 +7469,11 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 -#, fuzzy -msgid "Direct access to transport service." -msgstr "初始化“%s”服务失败。\n" - -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -msgid "receive data from peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "每次迭代所使用的消息数量" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "消息尺寸" - #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3890 -#: src/transport/plugin_transport_tcp.c:3897 +#: src/transport/plugin_transport_tcp.c:3891 +#: src/transport/plugin_transport_tcp.c:3898 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7407,7 +7543,7 @@ msgid "Found %u addresses to report to NAT service\n" msgstr "" #: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3622 +#: src/transport/plugin_transport_udp.c:3623 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7518,7 +7654,7 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1730 #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4013 +#: src/transport/plugin_transport_tcp.c:4014 msgid "# TCP sessions active" msgstr "" @@ -7555,122 +7691,122 @@ msgstr "" msgid "# TCP WELCOME messages received" msgstr "" -#: src/transport/plugin_transport_tcp.c:3408 +#: src/transport/plugin_transport_tcp.c:3409 msgid "# bytes received via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3459 -#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_tcp.c:3460 +#: src/transport/plugin_transport_tcp.c:3518 #, fuzzy msgid "# TCP server connections active" msgstr "" "\n" "按任意键继续\n" -#: src/transport/plugin_transport_tcp.c:3463 +#: src/transport/plugin_transport_tcp.c:3464 #, fuzzy msgid "# TCP server connect events" msgstr "" "\n" "按任意键继续\n" -#: src/transport/plugin_transport_tcp.c:3469 +#: src/transport/plugin_transport_tcp.c:3470 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3471 +#: src/transport/plugin_transport_tcp.c:3472 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3511 +#: src/transport/plugin_transport_tcp.c:3512 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3521 +#: src/transport/plugin_transport_tcp.c:3522 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3840 +#: src/transport/plugin_transport_tcp.c:3841 #, fuzzy msgid "Failed to start service.\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/plugin_transport_tcp.c:4001 +#: src/transport/plugin_transport_tcp.c:4002 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4005 +#: src/transport/plugin_transport_tcp.c:4006 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_tcp.c:4010 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -msgid "# Multicast HELLO beacons received via UDP" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - -#: src/transport/plugin_transport_udp.c:3366 +#: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3380 +#: src/transport/plugin_transport_udp.c:3381 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3698 -#: src/transport/plugin_transport_udp.c:3797 +#: src/transport/plugin_transport_udp.c:3699 +#: src/transport/plugin_transport_udp.c:3798 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_udp.c:3716 +#: src/transport/plugin_transport_udp.c:3717 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3807 +#: src/transport/plugin_transport_udp.c:3808 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_udp.c:3878 -#: src/transport/plugin_transport_udp.c:3892 +#: src/transport/plugin_transport_udp.c:3879 +#: src/transport/plugin_transport_udp.c:3893 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3924 +#: src/transport/plugin_transport_udp.c:3925 #, fuzzy msgid "must be valid IPv4 address" msgstr "“%s”不可用。\n" -#: src/transport/plugin_transport_udp.c:3951 +#: src/transport/plugin_transport_udp.c:3952 #, fuzzy msgid "must be valid IPv6 address" msgstr "“%s”不可用。\n" -#: src/transport/plugin_transport_udp.c:4015 +#: src/transport/plugin_transport_udp.c:4016 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "发送消息失败。\n" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +msgid "# Multicast HELLO beacons received via UDP" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -7775,7 +7911,7 @@ msgid "" "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346 +#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 #, c-format msgid "Unknown address family %d\n" msgstr "" @@ -7832,7 +7968,7 @@ msgstr "" msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488 +#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 #: src/util/service.c:1378 #, c-format msgid "Cannot obtain information about user `%s': %s\n" @@ -7851,19 +7987,19 @@ msgstr "无法更改用户/组为“%s”：%s\n" msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255 +#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 #: src/util/service.c:1790 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 #: src/util/service.c:1801 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267 +#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 #: src/util/service.c:1807 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" @@ -7874,61 +8010,61 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n" msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:177 src/util/bio.c:185 +#: src/util/bio.c:181 src/util/bio.c:189 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "创建用户出错" -#: src/util/bio.c:187 +#: src/util/bio.c:191 msgid "End of file" msgstr "" -#: src/util/bio.c:244 +#: src/util/bio.c:248 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:254 +#: src/util/bio.c:258 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:300 +#: src/util/bio.c:306 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:314 +#: src/util/bio.c:328 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:911 +#: src/util/client.c:914 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1132 +#: src/util/common_logging.c:259 src/util/common_logging.c:1146 msgid "DEBUG" msgstr "调试" -#: src/util/common_logging.c:261 src/util/common_logging.c:1130 +#: src/util/common_logging.c:261 src/util/common_logging.c:1144 msgid "INFO" msgstr "信息" -#: src/util/common_logging.c:263 src/util/common_logging.c:1128 +#: src/util/common_logging.c:263 src/util/common_logging.c:1142 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1126 +#: src/util/common_logging.c:265 src/util/common_logging.c:1140 msgid "WARNING" msgstr "警告" -#: src/util/common_logging.c:267 src/util/common_logging.c:1124 +#: src/util/common_logging.c:267 src/util/common_logging.c:1138 msgid "ERROR" msgstr "错误" -#: src/util/common_logging.c:269 src/util/common_logging.c:1134 +#: src/util/common_logging.c:269 src/util/common_logging.c:1148 msgid "NONE" msgstr "" @@ -7937,24 +8073,24 @@ msgstr "" msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n" -#: src/util/common_logging.c:1135 +#: src/util/common_logging.c:1149 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1326 +#: src/util/common_logging.c:1442 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1368 +#: src/util/common_logging.c:1484 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1386 +#: src/util/common_logging.c:1502 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "配置不满足配置规范文件“%s”的约束！\n" -#: src/util/common_logging.c:1407 +#: src/util/common_logging.c:1523 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -7965,88 +8101,88 @@ msgstr "配置不满足配置规范文件“%s”的约束！\n" msgid "Syntax error while deserializing in line %u\n" msgstr "配置文件“%s”第 %d 行有语法错误。\n" -#: src/util/configuration.c:355 +#: src/util/configuration.c:363 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "解析 dscl 输出时出错。\n" -#: src/util/configuration.c:1034 +#: src/util/configuration.c:1051 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1153 +#: src/util/configuration.c:1170 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1186 +#: src/util/configuration.c:1203 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "配置文件“%s”已写入。\n" -#: src/util/configuration.c:1254 +#: src/util/configuration.c:1271 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:531 +#: src/util/container_bloomfilter.c:532 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:810 +#: src/util/crypto_ecc.c:836 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:860 +#: src/util/crypto_ecc.c:886 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:934 +#: src/util/crypto_ecc.c:960 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:991 +#: src/util/crypto_ecc.c:1017 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161 -#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317 +#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 +#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284 +#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "正在启动数据仓库转换(可能需要一段时间)。\n" -#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322 +#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356 +#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:415 +#: src/util/crypto_ecc_setup.c:471 #, fuzzy msgid "Could not load peer's private key\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" @@ -8056,12 +8192,12 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n" msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n" -#: src/util/crypto_rsa.c:835 +#: src/util/crypto_rsa.c:834 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_rsa.c:1166 +#: src/util/crypto_rsa.c:1165 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" @@ -8136,103 +8272,109 @@ msgstr "请使用 --help 获取选项列表。\n" msgid "Missing mandatory option `%s'.\n" msgstr "配置文件“%s”已写入。\n" -#: src/util/getopt_helpers.c:68 +#: src/util/getopt_helpers.c:70 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:111 +#: src/util/getopt_helpers.c:115 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" msgstr "长选项的必选参数对短选项也是必选的。\n" -#: src/util/getopt_helpers.c:199 +#: src/util/getopt_helpers.c:203 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:274 +#: src/util/getopt_helpers.c:281 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:410 +#: src/util/getopt_helpers.c:422 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:488 +#: src/util/getopt_helpers.c:502 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:510 +#: src/util/getopt_helpers.c:524 #, fuzzy msgid "use configuration file FILENAME" msgstr "更改配置文件中的一个值" -#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740 +#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 +#: src/util/getopt_helpers.c:825 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:610 +#: src/util/getopt_helpers.c:626 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:675 +#: src/util/getopt_helpers.c:692 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:823 +#: src/util/getopt_helpers.c:832 +#, fuzzy, c-format +msgid "You must pass a number below %u to the `%s' option.\n" +msgstr "您必须向“%s”选项传递一个数字。\n" + +#: src/util/getopt_helpers.c:918 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:124 +#: src/util/gnunet-config.c:134 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "解析配置文件“%s”失败\n" -#: src/util/gnunet-config.c:137 +#: src/util/gnunet-config.c:147 #, fuzzy, c-format msgid "--section argument is required\n" msgstr "设置要使用的昵称(必须)" -#: src/util/gnunet-config.c:140 +#: src/util/gnunet-config.c:150 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:191 +#: src/util/gnunet-config.c:201 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:229 +#: src/util/gnunet-config.c:240 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:234 +#: src/util/gnunet-config.c:245 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:239 +#: src/util/gnunet-config.c:250 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:244 +#: src/util/gnunet-config.c:255 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:248 +#: src/util/gnunet-config.c:259 #, fuzzy msgid "print available configuration sections" msgstr "立即保存配置？" -#: src/util/gnunet-config.c:252 +#: src/util/gnunet-config.c:263 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:265 +#: src/util/gnunet-config.c:276 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "更改配置文件中的一个值" @@ -8273,63 +8415,63 @@ msgid "" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:288 +#: src/util/gnunet-ecc.c:290 #, c-format msgid "Hostkeys file `%s' not found\n" msgstr "" -#: src/util/gnunet-ecc.c:299 +#: src/util/gnunet-ecc.c:305 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/util/gnunet-ecc.c:321 +#: src/util/gnunet-ecc.c:334 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/util/gnunet-ecc.c:372 +#: src/util/gnunet-ecc.c:391 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:437 +#: src/util/gnunet-ecc.c:456 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:442 +#: src/util/gnunet-ecc.c:461 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:447 +#: src/util/gnunet-ecc.c:466 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:451 +#: src/util/gnunet-ecc.c:470 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:455 +#: src/util/gnunet-ecc.c:474 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:459 +#: src/util/gnunet-ecc.c:478 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:463 +#: src/util/gnunet-ecc.c:482 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:479 +#: src/util/gnunet-ecc.c:498 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "更改配置文件中的一个值" -#: src/util/gnunet-resolver.c:150 +#: src/util/gnunet-resolver.c:168 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:161 +#: src/util/gnunet-resolver.c:179 msgid "Use build-in GNUnet stub resolver" msgstr "" @@ -8409,40 +8551,40 @@ msgstr "打开日志文件“%s”失败：%s\n" msgid "Error writing to `%s': %s\n" msgstr "创建用户出错" -#: src/util/network.c:137 +#: src/util/network.c:136 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1793 src/util/network.c:1977 +#: src/util/network.c:1795 src/util/network.c:1979 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:501 +#: src/util/os_installation.c:509 #, fuzzy, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "无法确定安装路径。请尝试设置“%s”\n" -#: src/util/os_installation.c:873 +#: src/util/os_installation.c:881 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/util/os_installation.c:913 +#: src/util/os_installation.c:922 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:944 +#: src/util/os_installation.c:953 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/os_installation.c:954 +#: src/util/os_installation.c:963 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" @@ -8473,29 +8615,29 @@ msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:223 +#: src/util/resolver_api.c:224 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:827 +#: src/util/resolver_api.c:851 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "" -#: src/util/resolver_api.c:840 +#: src/util/resolver_api.c:864 #, fuzzy, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/util/resolver_api.c:1024 +#: src/util/resolver_api.c:1048 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133 -#: src/util/resolver_api.c:1147 +#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 +#: src/util/resolver_api.c:1171 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "无法解析“%s”(%s)：%s\n" @@ -8505,7 +8647,7 @@ msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2091 +#: src/util/service.c:2093 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8582,63 +8724,63 @@ msgstr " 天" msgid "end of time" msgstr "" -#: src/util/strings.c:1270 +#: src/util/strings.c:1272 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1278 +#: src/util/strings.c:1280 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1284 +#: src/util/strings.c:1286 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1291 +#: src/util/strings.c:1293 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1300 +#: src/util/strings.c:1302 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "无效的进程优先级“%s”\n" -#: src/util/strings.c:1572 src/util/strings.c:1588 +#: src/util/strings.c:1574 src/util/strings.c:1590 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1597 +#: src/util/strings.c:1599 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759 -#: src/util/strings.c:1780 +#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 +#: src/util/strings.c:1782 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/util/strings.c:1737 +#: src/util/strings.c:1739 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。" -#: src/util/strings.c:1789 +#: src/util/strings.c:1791 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/util/strings.c:1841 +#: src/util/strings.c:1843 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n" -#: src/util/strings.c:1891 +#: src/util/strings.c:1893 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "网络掩码的格式“%s”错误\n" -#: src/util/strings.c:1922 +#: src/util/strings.c:1924 #, c-format msgid "Wrong format `%s' for network\n" msgstr "网络的格式“%s”错误\n" @@ -8813,27 +8955,36 @@ msgstr "" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:706 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:838 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "初始化“%s”服务失败。\n" -#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696 -#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714 +#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 +#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:726 +#: src/include/gnunet_common.h:803 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762 +#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" +#, fuzzy +#~ msgid "Could not connect to %s service!\n" +#~ msgstr "无法连接到 %s:%u：%s\n" + +#, fuzzy +#~ msgid "Token `%s' is malformed\n" +#~ msgstr "“%s”的参数无效。\n" + #, fuzzy #~ msgid "Failed to create indices\n" #~ msgstr "发送消息失败。\n" @@ -9198,10 +9349,6 @@ msgstr "" #~ msgid "Unknown operator: %c\n" #~ msgstr "未知错误" -#, fuzzy -#~ msgid "valid public key required" -#~ msgstr "“%s”的参数无效。\n" - #, fuzzy #~ msgid "Failed to create or access directory for log file `%s'\n" #~ msgstr "解析配置文件“%s”失败\n" diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8697d0941c..d0db6b141c 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -292,7 +292,7 @@ plugin_LTLIBRARIES = \ if HAVE_EXPERIMENTAL plugin_LTLIBRARIES += \ libgnunet_plugin_transport_xt.la \ - libgnunet_plugin_transport_xu.la + libgnunet_plugin_transport_xu.la endif # Note: real plugins of course need to be added @@ -301,7 +301,7 @@ noinst_LTLIBRARIES = \ libgnunet_plugin_transport_template.la libgnunet_plugin_transport_tcp_la_SOURCES = \ - plugin_transport_tcp.c + plugin_transport_tcp.c libgnunet_plugin_transport_tcp_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -313,7 +313,7 @@ libgnunet_plugin_transport_tcp_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_xt_la_SOURCES = \ - plugin_transport_xt.c + plugin_transport_xt.c libgnunet_plugin_transport_xt_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -374,7 +374,7 @@ libgnunet_plugin_transport_udp_la_LDFLAGS = \ libgnunet_plugin_transport_xu_la_SOURCES = \ plugin_transport_xu.c plugin_transport_xu.h -libgnunet_plugin_transport_udp_la_LIBADD = \ +libgnunet_plugin_transport_xu_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ @@ -382,7 +382,7 @@ libgnunet_plugin_transport_udp_la_LIBADD = \ $(top_builddir)/src/nat/libgnunetnatnew.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) -libgnunet_plugin_transport_udp_la_LDFLAGS = \ +libgnunet_plugin_transport_xu_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_transport_unix_la_SOURCES = \ -- cgit v1.2.3-18-g5258 From 5eb8efafea6d28afb22316e6a51ca9fcabc882cd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 23:28:30 +0200 Subject: script was removed --- contrib/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 8e07a5d8c2..d3710a10c1 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -61,7 +61,6 @@ EXTRA_DIST = \ scripts/gnunet-chk.py.in \ scripts/removetrailingwhitespace.py.in \ scripts/pydiffer.py.in \ - scripts/gnunet-gns-import.sh \ packages/nix/default.nix \ packages/nix/gnunet-dex.nix \ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ -- cgit v1.2.3-18-g5258 From eec5a96f455942cac2f972f76babfe624849dccc Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 23:29:34 +0200 Subject: fix a few disting issues --- contrib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d3710a10c1..56fcb9aeab 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -62,7 +62,7 @@ EXTRA_DIST = \ scripts/removetrailingwhitespace.py.in \ scripts/pydiffer.py.in \ packages/nix/default.nix \ - packages/nix/gnunet-dex.nix \ + packages/nix/gnunet-dev.nix \ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \ 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \ -- cgit v1.2.3-18-g5258 From 324f6168c2374d7bb71c3632fb6521860d8fdfa1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 23:32:09 +0200 Subject: testcase cleanup --- src/datacache/test_datacache_quota.c | 39 ++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index 35357a8d28..b89d71a27c 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -49,8 +49,6 @@ run (void *cls, char *const *args, const char *cfgfile, struct GNUNET_DATACACHE_Handle *h; struct GNUNET_HashCode k; struct GNUNET_HashCode n; - unsigned int i; - unsigned int j; char buf[3200]; struct GNUNET_TIME_Absolute exp; @@ -59,36 +57,43 @@ run (void *cls, char *const *args, const char *cfgfile, if (h == NULL) { - FPRINTF (stderr, "%s", "Failed to initialize datacache. Database likely not setup, skipping test.\n"); + FPRINTF (stderr, + "%s", + "Failed to initialize datacache. Database likely not setup, skipping test.\n"); return; } exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS); memset (buf, 1, sizeof (buf)); memset (&k, 0, sizeof (struct GNUNET_HashCode)); - for (i = 0; i < 10; i++) + for (unsigned int i = 0; i < 10; i++) { - FPRINTF (stderr, "%s", "."); - GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); - for (j = i; j < sizeof (buf); j += 10) + FPRINTF (stderr, + "%s", + "."); + GNUNET_CRYPTO_hash (&k, + sizeof (struct GNUNET_HashCode), + &n); + for (unsigned int j = i; j < sizeof (buf); j += 10) { exp.abs_value_us++; buf[j] = i; - ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, - &k, - GNUNET_YES, - j, - buf, - 1 + i, - exp, - 0, - NULL)); + ASSERT (GNUNET_OK == + GNUNET_DATACACHE_put (h, + &k, + GNUNET_YES, + j, + buf, + 1 + i, + exp, + 0, + NULL)); ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL)); } k = n; } FPRINTF (stderr, "%s", "\n"); memset (&k, 0, sizeof (struct GNUNET_HashCode)); - for (i = 0; i < 10; i++) + for (unsigned int i = 0; i < 10; i++) { FPRINTF (stderr, "%s", "."); GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); -- cgit v1.2.3-18-g5258 From 1f083a4593b1f07dcf24549853963dedde7f4d02 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 00:37:06 +0200 Subject: use real GNS record types in tests to avoid failures in new extra serialization/deserialization checking --- src/gnsrecord/test_gnsrecord_crypto.c | 3 +- src/gnsrecord/test_gnsrecord_serialization.c | 106 +++++++++++---------- src/namecache/test_namecache_api_cache_block.c | 5 +- src/namestore/perf_namestore_api_zone_iteration.c | 5 +- src/namestore/test_namestore_api_lookup_nick.c | 3 +- src/namestore/test_namestore_api_lookup_private.c | 3 +- src/namestore/test_namestore_api_lookup_public.c | 3 +- src/namestore/test_namestore_api_lookup_shadow.c | 3 +- .../test_namestore_api_lookup_shadow_filter.c | 4 +- src/namestore/test_namestore_api_monitoring.c | 14 ++- .../test_namestore_api_monitoring_existing.c | 5 +- src/namestore/test_namestore_api_remove.c | 3 +- src/namestore/test_namestore_api_store.c | 3 +- src/namestore/test_namestore_api_store_update.c | 9 +- src/namestore/test_namestore_api_zone_iteration.c | 5 +- .../test_namestore_api_zone_iteration_nick.c | 5 +- ...st_namestore_api_zone_iteration_specific_zone.c | 5 +- .../test_namestore_api_zone_iteration_stop.c | 12 ++- src/namestore/test_namestore_api_zone_to_name.c | 5 +- src/namestore/test_plugin_namestore.c | 6 +- 20 files changed, 123 insertions(+), 84 deletions(-) diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c index 9ba303e662..9dd09c0bf4 100644 --- a/src/gnsrecord/test_gnsrecord_crypto.c +++ b/src/gnsrecord/test_gnsrecord_crypto.c @@ -23,11 +23,12 @@ */ #include "platform.h" #include "gnunet_util_lib.h" +#include "gnunet_dnsparser_lib.h" #include "gnunet_gnsrecord_lib.h" #define RECORDS 5 -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c index 3edd2bc488..a43bf2efa8 100644 --- a/src/gnsrecord/test_gnsrecord_serialization.c +++ b/src/gnsrecord/test_gnsrecord_serialization.c @@ -24,6 +24,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_gnsrecord_lib.h" +#include "gnunet_dnsparser_lib.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) @@ -31,7 +32,9 @@ static int res; static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { size_t len; @@ -46,7 +49,7 @@ run (void *cls, char *const *args, const char *cfgfile, data_len = 0; for (c = 0; c < rd_count; c++) { - src[c].record_type = c+1; + src[c].record_type = GNUNET_DNSPARSER_TYPE_TXT; src[c].data_size = data_len; src[c].data = GNUNET_malloc (data_len); @@ -69,58 +72,61 @@ run (void *cls, char *const *args, const char *cfgfile, (unsigned int) len); GNUNET_assert (rd_ser != NULL); - - struct GNUNET_GNSRECORD_Data dst[rd_count]; - GNUNET_assert (GNUNET_OK == - GNUNET_GNSRECORD_records_deserialize (len, - rd_ser, - rd_count, - dst)); - - GNUNET_assert (dst != NULL); - - for (c = 0; c < rd_count; c++) { - if (src[c].data_size != dst[c].data_size) - { - GNUNET_break (0); - res = 1; - } - if (src[c].expiration_time != dst[c].expiration_time) - { - GNUNET_break (0); - res = 1; - } - if (src[c].flags != dst[c].flags) - { - GNUNET_break (0); - res = 1; - } - if (src[c].record_type != dst[c].record_type) - { - GNUNET_break (0); - res = 1; - } + struct GNUNET_GNSRECORD_Data dst[rd_count]; + GNUNET_assert (GNUNET_OK == + GNUNET_GNSRECORD_records_deserialize (len, + rd_ser, + rd_count, + dst)); - size_t data_size = src[c].data_size; - char data[data_size]; - memset (data, 'a', data_size); - if (0 != memcmp (data, dst[c].data, data_size)) - { - GNUNET_break (0); - res = 1; - } - if (0 != memcmp (data, src[c].data, data_size)) - { - GNUNET_break (0); - res = 1; - } - if (0 != memcmp (src[c].data, dst[c].data, src[c].data_size)) + GNUNET_assert (dst != NULL); + + for (c = 0; c < rd_count; c++) { - GNUNET_break (0); - res = 1; + if (src[c].data_size != dst[c].data_size) + { + GNUNET_break (0); + res = 1; + } + if (src[c].expiration_time != dst[c].expiration_time) + { + GNUNET_break (0); + res = 1; + } + if (src[c].flags != dst[c].flags) + { + GNUNET_break (0); + res = 1; + } + if (src[c].record_type != dst[c].record_type) + { + GNUNET_break (0); + res = 1; + } + + { + size_t data_size = src[c].data_size; + char data[data_size]; + + memset (data, 'a', data_size); + if (0 != memcmp (data, dst[c].data, data_size)) + { + GNUNET_break (0); + res = 1; + } + if (0 != memcmp (data, src[c].data, data_size)) + { + GNUNET_break (0); + res = 1; + } + if (0 != memcmp (src[c].data, dst[c].data, src[c].data_size)) + { + GNUNET_break (0); + res = 1; + } + } } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Element [%i]: EQUAL\n", c); } diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c index 7b0e6e3185..f70388c2a3 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/namecache/test_namecache_api_cache_block.c @@ -24,8 +24,9 @@ #include "platform.h" #include "gnunet_namecache_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 @@ -108,7 +109,7 @@ rd_decrypt_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Block was decrypted successfully \n"); - + GNUNET_SCHEDULER_add_now (&end, NULL); } diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c index 55d6fafa0d..e73c61ea24 100644 --- a/src/namestore/perf_namestore_api_zone_iteration.c +++ b/src/namestore/perf_namestore_api_zone_iteration.c @@ -26,6 +26,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT /** * A #BENCHMARK_SIZE of 1000 takes less than a minute on a reasonably @@ -141,7 +144,7 @@ create_record (unsigned int count) rd = GNUNET_malloc (count + sizeof (struct GNUNET_GNSRECORD_Data)); rd->expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd->record_type = count; + rd->record_type = TEST_RECORD_TYPE; rd->data_size = count; rd->data = (void *) &rd[1]; rd->flags = 0; diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index b9ae93bf2b..acb30e79df 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c @@ -24,8 +24,9 @@ #include "platform.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c index 689e73a2e9..3557e71fad 100644 --- a/src/namestore/test_namestore_api_lookup_private.c +++ b/src/namestore/test_namestore_api_lookup_private.c @@ -24,8 +24,9 @@ #include "platform.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c index 28a68daf9c..f17bb6fc88 100644 --- a/src/namestore/test_namestore_api_lookup_public.c +++ b/src/namestore/test_namestore_api_lookup_public.c @@ -25,8 +25,9 @@ #include "gnunet_namecache_service.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index 39ce4e564f..1cab0a9f68 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c @@ -27,8 +27,9 @@ #include "gnunet_namecache_service.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c index 09fd8ce073..0ccdf1f4bf 100644 --- a/src/namestore/test_namestore_api_lookup_shadow_filter.c +++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c @@ -28,9 +28,11 @@ #include "gnunet_namecache_service.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_NAME "dummy.dummy.gnunet" -#define TEST_RECORD_TYPE 1234 #define TEST_RECORD_DATALEN 123 #define TEST_RECORD_DATA 'a' #define TEST_SHADOW_RECORD_DATA 'b' diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index de202d5355..7c8ee27d74 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c @@ -25,6 +25,10 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT + #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) @@ -244,14 +248,14 @@ put_cont (void *cls, static struct GNUNET_GNSRECORD_Data * create_record (unsigned int count) { - unsigned int c; - struct GNUNET_GNSRECORD_Data * rd; + struct GNUNET_GNSRECORD_Data *rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data)); - for (c = 0; c < count; c++) + rd = GNUNET_new_array (count, + struct GNUNET_GNSRECORD_Data); + for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index 449b36d65d..89fd9c8e9d 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c @@ -25,6 +25,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) @@ -292,7 +295,7 @@ create_record (unsigned int count) for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index c9e2802bd7..8f7782300f 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -24,8 +24,9 @@ #include "platform.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index 4abcfa4d33..5112126c1e 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c @@ -24,8 +24,9 @@ #include "platform.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index 7b13cd9c58..d636018afb 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c @@ -27,15 +27,14 @@ #include "gnunet_namecache_service.h" #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" -#define TEST_RECORD_TYPE 1234 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TEST_RECORD_DATALEN 123 #define TEST_RECORD_DATA 'a' -#define TEST_RECORD_TYPE2 4321 - #define TEST_RECORD_DATALEN2 234 #define TEST_RECORD_DATA2 'b' @@ -149,7 +148,7 @@ rd_decrypt_cb (void *cls, rd_new.flags = GNUNET_GNSRECORD_RF_NONE; rd_new.expiration_time = GNUNET_TIME_absolute_get().abs_value_us + 1000000000; - rd_new.record_type = TEST_RECORD_TYPE2; + rd_new.record_type = TEST_RECORD_TYPE; rd_new.data_size = TEST_RECORD_DATALEN2; rd_new.data = GNUNET_malloc (TEST_RECORD_DATALEN2); memset ((char *) rd_new.data, @@ -172,7 +171,7 @@ rd_decrypt_cb (void *cls, memset (rd_cmp_data, TEST_RECORD_DATA2, TEST_RECORD_DATALEN2); - GNUNET_assert (TEST_RECORD_TYPE2 == rd[0].record_type); + GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type); GNUNET_assert (TEST_RECORD_DATALEN2 == rd[0].data_size); GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 68c3de9b83..00b65a5762 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -25,6 +25,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) @@ -322,7 +325,7 @@ create_record (unsigned int count) for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index d950b7e693..ff1b3d402b 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c @@ -25,6 +25,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define ZONE_NICK_1 "nick1" #define ZONE_NICK_2 "nick2" @@ -322,7 +325,7 @@ create_record (unsigned int count) for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 0b137cc629..a861842977 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -26,6 +26,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" + +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) @@ -299,7 +302,7 @@ create_record (unsigned int count) for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index c7358fc6ea..98514885c1 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -25,7 +25,9 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) @@ -349,14 +351,14 @@ put_cont (void *cls, int32_t success, const char *emsg) static struct GNUNET_GNSRECORD_Data * create_record (unsigned int count) { - unsigned int c; - struct GNUNET_GNSRECORD_Data * rd; + struct GNUNET_GNSRECORD_Data *rd; - rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data)); - for (c = 0; c < count; c++) + rd = GNUNET_new_array (count, + struct GNUNET_GNSRECORD_Data); + for (unsigned int c = 0; c < count; c++) { rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; - rd[c].record_type = 1111; + rd[c].record_type = TEST_RECORD_TYPE; rd[c].data_size = 50; rd[c].data = GNUNET_malloc(50); rd[c].flags = 0; diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 292d8f7019..4ce940114d 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -25,10 +25,11 @@ #include "gnunet_namestore_service.h" #include "gnunet_testing_lib.h" #include "namestore.h" +#include "gnunet_dnsparser_lib.h" -#define RECORDS 5 +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT -#define TEST_RECORD_TYPE 1234 +#define RECORDS 5 #define TEST_RECORD_DATALEN 123 diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index 8732acbcb2..5c8f5e6f74 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c @@ -26,7 +26,9 @@ #include "gnunet_util_lib.h" #include "gnunet_namestore_plugin.h" #include "gnunet_testing_lib.h" +#include "gnunet_dnsparser_lib.h" +#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT static int ok; @@ -110,7 +112,7 @@ test_record (void *cls, { GNUNET_assert (rd[i].data_size == id % 10); GNUNET_assert (0 == memcmp ("Hello World", rd[i].data, id % 10)); - GNUNET_assert (rd[i].record_type == 1 + (id % 13)); + GNUNET_assert (rd[i].record_type == TEST_RECORD_TYPE); GNUNET_assert (rd[i].flags == 0); } memset (&tzone_private_key, @@ -154,7 +156,7 @@ put_record (struct GNUNET_NAMESTORE_PluginFunctions *nsp, rd[i].data = "Hello World"; rd[i].data_size = id % 10; rd[i].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES).abs_value_us; - rd[i].record_type = 1 + (id % 13); + rd[i].record_type = TEST_RECORD_TYPE; rd[i].flags = 0; } memset (&zone_private_key, (id % 241), sizeof (zone_private_key)); -- cgit v1.2.3-18-g5258 From 16952fae55657c0a99274560363a60108ff1d220 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 4 Jun 2018 23:26:12 +0200 Subject: typo --- src/util/getopt_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index f9341f528c..fb8cc4d455 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -819,7 +819,7 @@ set_uint16 (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx, (void) ctx; if (1 != SSCANF (value, "%u", - v)) + &v)) { FPRINTF (stderr, _("You must pass a number to the `%s' option.\n"), -- cgit v1.2.3-18-g5258 From 7661f73f0d6def50830323e420ba7b78e791369a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 09:32:30 +0200 Subject: fix handling of chunked encoding by proxy, and handling of connection termination --- src/gns/gnunet-gns-proxy.c | 88 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 17 deletions(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 0d7d83b4b5..fcd69599b3 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -626,6 +626,11 @@ struct Socks5Request * Did we suspend MHD processing? */ int suspended; + + /** + * Did we pause CURL processing? + */ + int curl_paused; }; @@ -823,7 +828,9 @@ mhd_content_cb (void *cls, start the download, the IO buffer is still full with upload data. */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Pausing MHD download, not yet ready for download\n"); + "Pausing MHD download %s%s, not yet ready for download\n", + s5r->domain, + s5r->url); return 0; /* not yet ready for data download */ } bytes_to_copy = GNUNET_MIN (max, @@ -832,12 +839,21 @@ mhd_content_cb (void *cls, (SOCKS5_SOCKET_DOWNLOAD_DONE != s5r->state) ) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Pausing MHD download, no data available\n"); + "Pausing MHD download %s%s, no data available\n", + s5r->domain, + s5r->url); if (NULL != s5r->curl) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Continuing CURL interaction\n"); - curl_easy_pause (s5r->curl, CURLPAUSE_CONT); + "Continuing CURL interaction for %s%s\n", + s5r->domain, + s5r->url); + if (GNUNET_YES == s5r->curl_paused) + { + s5r->curl_paused = GNUNET_NO; + curl_easy_pause (s5r->curl, + CURLPAUSE_CONT); + } curl_download_prepare (); } if (GNUNET_NO == s5r->suspended) @@ -851,13 +867,17 @@ mhd_content_cb (void *cls, (SOCKS5_SOCKET_DOWNLOAD_DONE == s5r->state) ) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Completed MHD download\n"); + "Completed MHD download %s%s\n", + s5r->domain, + s5r->url); return MHD_CONTENT_READER_END_OF_STREAM; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Writing %llu/%llu bytes\n", + "Writing %llu/%llu bytes for %s%s\n", (unsigned long long) bytes_to_copy, - (unsigned long long) s5r->io_len); + (unsigned long long) s5r->io_len, + s5r->domain, + s5r->url); GNUNET_memcpy (buf, s5r->io_buf, bytes_to_copy); @@ -865,10 +885,14 @@ mhd_content_cb (void *cls, &s5r->io_buf[bytes_to_copy], s5r->io_len - bytes_to_copy); s5r->io_len -= bytes_to_copy; - if (NULL != s5r->curl) + if ( (NULL != s5r->curl) && + (GNUNET_YES == s5r->curl_paused) ) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Continuing CURL interaction\n"); + "Continuing CURL interaction for %s%s\n", + s5r->domain, + s5r->url); + s5r->curl_paused = GNUNET_NO; curl_easy_pause (s5r->curl, CURLPAUSE_CONT); } @@ -1269,6 +1293,7 @@ create_mhd_response_from_s5r (struct Socks5Request *s5r) return GNUNET_OK; } + /** * Handle response payload data from cURL. Copies it into our `io_buf` to make * it available to MHD. @@ -1288,6 +1313,12 @@ curl_download_cb (void *ptr, struct Socks5Request *s5r = ctx; size_t total = size * nmemb; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Receiving %ux%u bytes for `%s%s' from cURL\n", + (unsigned int) size, + (unsigned int) nmemb, + s5r->domain, + s5r->url); if (NULL == s5r->response) GNUNET_assert (GNUNET_OK == create_mhd_response_from_s5r (s5r)); @@ -1302,6 +1333,7 @@ curl_download_cb (void *ptr, "Pausing CURL download `%s%s', waiting for UPLOAD to finish\n", s5r->domain, s5r->url); + s5r->curl_paused = GNUNET_YES; return CURL_WRITEFUNC_PAUSE; /* not yet ready for data download */ } if (sizeof (s5r->io_buf) - s5r->io_len < total) @@ -1313,6 +1345,7 @@ curl_download_cb (void *ptr, (unsigned long long) sizeof (s5r->io_buf), (unsigned long long) s5r->io_len, (unsigned long long) total); + s5r->curl_paused = GNUNET_YES; return CURL_WRITEFUNC_PAUSE; /* not enough space */ } GNUNET_memcpy (&s5r->io_buf[s5r->io_len], @@ -1381,7 +1414,9 @@ curl_upload_cb (void *buf, } to_copy = GNUNET_MIN (s5r->io_len, len); - GNUNET_memcpy (buf, s5r->io_buf, to_copy); + GNUNET_memcpy (buf, + s5r->io_buf, + to_copy); memmove (s5r->io_buf, &s5r->io_buf[to_copy], s5r->io_len - to_copy); @@ -1495,6 +1530,9 @@ curl_task_download (void *cls) running = 0; mret = curl_multi_perform (curl_multi, &running); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Checking CURL multi status: %d\n", + mret); while (NULL != (msg = curl_multi_info_read (curl_multi, &msgnum))) { @@ -1527,7 +1565,12 @@ curl_task_download (void *cls) GNUNET_assert (GNUNET_OK == create_mhd_response_from_s5r (s5r)); } - s5r->state = SOCKS5_SOCKET_DOWNLOAD_DONE; + s5r->state = SOCKS5_SOCKET_DOWNLOAD_DONE; + if (GNUNET_YES == s5r->suspended) + { + MHD_resume_connection (s5r->con); + s5r->suspended = GNUNET_NO; + } run_mhd_now (s5r->hd); break; default: @@ -1538,6 +1581,11 @@ curl_task_download (void *cls) curl_easy_strerror (msg->data.result)); /* FIXME: indicate error somehow? close MHD connection badly as well? */ s5r->state = SOCKS5_SOCKET_DOWNLOAD_DONE; + if (GNUNET_YES == s5r->suspended) + { + MHD_resume_connection (s5r->con); + s5r->suspended = GNUNET_NO; + } run_mhd_now (s5r->hd); break; } @@ -1737,7 +1785,7 @@ create_response (void *cls, curl_easy_setopt (s5r->curl, CURLOPT_TIMEOUT, 600L); curl_easy_setopt (s5r->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (s5r->curl, CURLOPT_HTTP_CONTENT_DECODING, 0); - curl_easy_setopt (s5r->curl, CURLOPT_HTTP_TRANSFER_DECODING, 0); + // curl_easy_setopt (s5r->curl, CURLOPT_HTTP_TRANSFER_DECODING, 0); curl_easy_setopt (s5r->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (s5r->curl, CURLOPT_PRIVATE, s5r); curl_easy_setopt (s5r->curl, CURLOPT_VERBOSE, 0L); @@ -1941,8 +1989,12 @@ create_response (void *cls, s5r->io_len += left; *upload_data_size -= left; GNUNET_assert (NULL != s5r->curl); - curl_easy_pause (s5r->curl, - CURLPAUSE_CONT); + if (GNUNET_YES == s5r->curl_paused) + { + s5r->curl_paused = GNUNET_NO; + curl_easy_pause (s5r->curl, + CURLPAUSE_CONT); + } return MHD_YES; } if (SOCKS5_SOCKET_UPLOAD_STARTED == s5r->state) @@ -2442,9 +2494,11 @@ generate_gns_certificate (const char *name) etime = mktime (tm_data); gnutls_x509_crt_set_expiration_time (request, etime); - gnutls_x509_crt_sign (request, - proxy_ca.cert, - proxy_ca.key); + gnutls_x509_crt_sign2 (request, + proxy_ca.cert, + proxy_ca.key, + GNUTLS_DIG_SHA512, + 0); key_buf_size = sizeof (pgc->key); cert_buf_size = sizeof (pgc->cert); gnutls_x509_crt_export (request, GNUTLS_X509_FMT_PEM, -- cgit v1.2.3-18-g5258 From 09f7c260e7cd3bc0f12ad89e2dcf7d813f4089d8 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 09:45:43 +0200 Subject: update gitignore --- src/util/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/.gitignore b/src/util/.gitignore index d32a668336..23139a1abc 100644 --- a/src/util/.gitignore +++ b/src/util/.gitignore @@ -68,3 +68,4 @@ perf_crypto_asymmetric perf_crypto_hash perf_crypto_symmetric perf_crypto_rsa +perf_crypto_ecc_dlog -- cgit v1.2.3-18-g5258 From 1cc9d829c0add9533f1bb7fab59c32a7328086d0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 10:00:23 +0200 Subject: code cleanup, fix strlen --- po/POTFILES.in | 124 +++++++++--------- src/gns/gnunet-gns-proxy.c | 313 +++++++++++++++++++++++++++++++++------------ 2 files changed, 293 insertions(+), 144 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 120e3be787..35a9d6977c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -4,21 +4,13 @@ src/arm/arm_monitor_api.c src/arm/gnunet-arm.c src/arm/gnunet-service-arm.c src/arm/mockup-service.c -src/ats-tests/ats-testing-experiment.c -src/ats-tests/ats-testing-log.c -src/ats-tests/ats-testing-preferences.c -src/ats-tests/ats-testing-traffic.c -src/ats-tests/ats-testing.c -src/ats-tests/gnunet-ats-sim.c -src/ats-tests/gnunet-solver-eval.c -src/ats-tool/gnunet-ats.c src/ats/ats_api_connectivity.c src/ats/ats_api_performance.c src/ats/ats_api_scanner.c src/ats/ats_api_scheduling.c src/ats/gnunet-ats-solver-eval.c -src/ats/gnunet-service-ats.c src/ats/gnunet-service-ats_addresses.c +src/ats/gnunet-service-ats.c src/ats/gnunet-service-ats_connectivity.c src/ats/gnunet-service-ats_normalization.c src/ats/gnunet-service-ats_performance.c @@ -29,6 +21,14 @@ src/ats/gnunet-service-ats_scheduling.c src/ats/plugin_ats_mlp.c src/ats/plugin_ats_proportional.c src/ats/plugin_ats_ril.c +src/ats-tests/ats-testing.c +src/ats-tests/ats-testing-experiment.c +src/ats-tests/ats-testing-log.c +src/ats-tests/ats-testing-preferences.c +src/ats-tests/ats-testing-traffic.c +src/ats-tests/gnunet-ats-sim.c +src/ats-tests/gnunet-solver-eval.c +src/ats-tool/gnunet-ats.c src/auction/gnunet-auction-create.c src/auction/gnunet-auction-info.c src/auction/gnunet-auction-join.c @@ -40,8 +40,8 @@ src/block/plugin_block_test.c src/cadet/cadet_api.c src/cadet/cadet_test_lib.c src/cadet/desirability_table.c -src/cadet/gnunet-cadet-profiler.c src/cadet/gnunet-cadet.c +src/cadet/gnunet-cadet-profiler.c src/cadet/gnunet-service-cadet.c src/cadet/gnunet-service-cadet_channel.c src/cadet/gnunet-service-cadet_connection.c @@ -57,15 +57,15 @@ src/consensus/gnunet-service-consensus.c src/consensus/plugin_block_consensus.c src/conversation/conversation_api.c src/conversation/conversation_api_call.c -src/conversation/gnunet-conversation-test.c src/conversation/gnunet-conversation.c -src/conversation/gnunet-helper-audio-playback-gst.c +src/conversation/gnunet-conversation-test.c +src/conversation/gnunet_gst.c +src/conversation/gnunet_gst_test.c src/conversation/gnunet-helper-audio-playback.c -src/conversation/gnunet-helper-audio-record-gst.c +src/conversation/gnunet-helper-audio-playback-gst.c src/conversation/gnunet-helper-audio-record.c +src/conversation/gnunet-helper-audio-record-gst.c src/conversation/gnunet-service-conversation.c -src/conversation/gnunet_gst.c -src/conversation/gnunet_gst_test.c src/conversation/microphone.c src/conversation/plugin_gnsrecord_conversation.c src/conversation/speaker.c @@ -102,6 +102,7 @@ src/dht/dht_api.c src/dht/dht_test_lib.c src/dht/gnunet-dht-get.c src/dht/gnunet-dht-monitor.c +src/dht/gnunet_dht_profiler.c src/dht/gnunet-dht-put.c src/dht/gnunet-service-dht.c src/dht/gnunet-service-dht_clients.c @@ -110,7 +111,6 @@ src/dht/gnunet-service-dht_hello.c src/dht/gnunet-service-dht_neighbours.c src/dht/gnunet-service-dht_nse.c src/dht/gnunet-service-dht_routing.c -src/dht/gnunet_dht_profiler.c src/dht/plugin_block_dht.c src/dns/dns_api.c src/dns/dnsparser.c @@ -126,8 +126,8 @@ src/dv/gnunet-dv.c src/dv/gnunet-service-dv.c src/dv/plugin_transport_dv.c src/exit/gnunet-daemon-exit.c -src/exit/gnunet-helper-exit-windows.c src/exit/gnunet-helper-exit.c +src/exit/gnunet-helper-exit-windows.c src/fragmentation/defragmentation.c src/fragmentation/fragmentation.c src/fs/fs_api.c @@ -152,8 +152,8 @@ src/fs/gnunet-auto-share.c src/fs/gnunet-daemon-fsprofiler.c src/fs/gnunet-directory.c src/fs/gnunet-download.c -src/fs/gnunet-fs-profiler.c src/fs/gnunet-fs.c +src/fs/gnunet-fs-profiler.c src/fs/gnunet-helper-fs-publish.c src/fs/gnunet-publish.c src/fs/gnunet-search.c @@ -173,10 +173,10 @@ src/gns/gns_tld_api.c src/gns/gnunet-bcd.c src/gns/gnunet-dns2gns.c src/gns/gnunet-gns-benchmark.c +src/gns/gnunet-gns.c src/gns/gnunet-gns-helper-service-w32.c src/gns/gnunet-gns-import.c src/gns/gnunet-gns-proxy.c -src/gns/gnunet-gns.c src/gns/gnunet-service-gns.c src/gns/gnunet-service-gns_interceptor.c src/gns/gnunet-service-gns_resolver.c @@ -185,15 +185,15 @@ src/gns/nss/nss_gns_query.c src/gns/plugin_block_gns.c src/gns/plugin_gnsrecord_gns.c src/gns/plugin_rest_gns.c -src/gns/w32nsp-install.c -src/gns/w32nsp-resolve.c -src/gns/w32nsp-uninstall.c -src/gns/w32nsp.c src/gnsrecord/gnsrecord.c src/gnsrecord/gnsrecord_crypto.c src/gnsrecord/gnsrecord_misc.c src/gnsrecord/gnsrecord_serialization.c src/gnsrecord/plugin_gnsrecord_dns.c +src/gns/w32nsp.c +src/gns/w32nsp-install.c +src/gns/w32nsp-resolve.c +src/gns/w32nsp-uninstall.c src/hello/address.c src/hello/gnunet-hello.c src/hello/hello.c @@ -202,6 +202,11 @@ src/hostlist/gnunet-daemon-hostlist_client.c src/hostlist/gnunet-daemon-hostlist_server.c src/identity-attribute/identity_attribute.c src/identity-attribute/plugin_identity_attribute_gnuid.c +src/identity/gnunet-identity.c +src/identity/gnunet-service-identity.c +src/identity/identity_api.c +src/identity/identity_api_lookup.c +src/identity/plugin_rest_identity.c src/identity-provider/gnunet-idp.c src/identity-provider/gnunet-service-identity-provider.c src/identity-provider/identity_provider_api.c @@ -210,20 +215,15 @@ src/identity-provider/plugin_gnsrecord_identity_provider.c src/identity-provider/plugin_identity_provider_sqlite.c src/identity-provider/plugin_rest_identity_provider.c src/identity-provider/plugin_rest_openid_connect.c -src/identity/gnunet-identity.c -src/identity/gnunet-service-identity.c -src/identity/identity_api.c -src/identity/identity_api_lookup.c -src/identity/plugin_rest_identity.c -src/json/json.c -src/json/json_generator.c -src/json/json_helper.c -src/json/json_mhd.c src/jsonapi/jsonapi.c src/jsonapi/jsonapi_document.c src/jsonapi/jsonapi_error.c src/jsonapi/jsonapi_relationship.c src/jsonapi/jsonapi_resource.c +src/json/json.c +src/json/json_generator.c +src/json/json_helper.c +src/json/json_mhd.c src/multicast/gnunet-multicast.c src/multicast/gnunet-service-multicast.c src/multicast/multicast_api.c @@ -237,8 +237,8 @@ src/namecache/namecache_api.c src/namecache/plugin_namecache_flat.c src/namecache/plugin_namecache_postgres.c src/namecache/plugin_namecache_sqlite.c -src/namestore/gnunet-namestore-fcfsd.c src/namestore/gnunet-namestore.c +src/namestore/gnunet-namestore-fcfsd.c src/namestore/gnunet-service-namestore.c src/namestore/gnunet-zoneimport.c src/namestore/namestore_api.c @@ -254,10 +254,10 @@ src/nat-auto/gnunet-service-nat-auto.c src/nat-auto/gnunet-service-nat-auto_legacy.c src/nat-auto/nat_auto_api.c src/nat-auto/nat_auto_api_test.c -src/nat/gnunet-helper-nat-client-windows.c src/nat/gnunet-helper-nat-client.c -src/nat/gnunet-helper-nat-server-windows.c +src/nat/gnunet-helper-nat-client-windows.c src/nat/gnunet-helper-nat-server.c +src/nat/gnunet-helper-nat-server-windows.c src/nat/gnunet-nat.c src/nat/gnunet-service-nat.c src/nat/gnunet-service-nat_externalip.c @@ -266,15 +266,15 @@ src/nat/gnunet-service-nat_mini.c src/nat/gnunet-service-nat_stun.c src/nat/nat_api.c src/nat/nat_api_stun.c -src/nse/gnunet-nse-profiler.c src/nse/gnunet-nse.c +src/nse/gnunet-nse-profiler.c src/nse/gnunet-service-nse.c src/nse/nse_api.c -src/peerinfo-tool/gnunet-peerinfo.c -src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerinfo/gnunet-service-peerinfo.c src/peerinfo/peerinfo_api.c src/peerinfo/peerinfo_api_notify.c +src/peerinfo-tool/gnunet-peerinfo.c +src/peerinfo-tool/gnunet-peerinfo_plugins.c src/peerstore/gnunet-peerstore.c src/peerstore/gnunet-service-peerstore.c src/peerstore/peerstore_api.c @@ -325,13 +325,13 @@ src/rps/gnunet-service-rps_custommap.c src/rps/gnunet-service-rps_sampler.c src/rps/gnunet-service-rps_sampler_elem.c src/rps/gnunet-service-rps_view.c -src/rps/rps-test_util.c src/rps/rps_api.c +src/rps/rps-test_util.c src/scalarproduct/gnunet-scalarproduct.c -src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c -src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c src/scalarproduct/gnunet-service-scalarproduct_alice.c src/scalarproduct/gnunet-service-scalarproduct_bob.c +src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c src/scalarproduct/scalarproduct_api.c src/secretsharing/gnunet-secretsharing-profiler.c src/secretsharing/gnunet-service-secretsharing.c @@ -360,16 +360,15 @@ src/statistics/gnunet-statistics.c src/statistics/statistics_api.c src/template/gnunet-service-template.c src/template/gnunet-template.c -src/testbed-logger/gnunet-service-testbed-logger.c -src/testbed-logger/testbed_logger_api.c src/testbed/generate-underlay-topology.c src/testbed/gnunet-daemon-latency-logger.c src/testbed/gnunet-daemon-testbed-blacklist.c src/testbed/gnunet-daemon-testbed-underlay.c src/testbed/gnunet-helper-testbed.c +src/testbed/gnunet_mpi_test.c src/testbed/gnunet-service-test-barriers.c -src/testbed/gnunet-service-testbed.c src/testbed/gnunet-service-testbed_barriers.c +src/testbed/gnunet-service-testbed.c src/testbed/gnunet-service-testbed_cache.c src/testbed/gnunet-service-testbed_connectionpool.c src/testbed/gnunet-service-testbed_cpustatus.c @@ -377,19 +376,20 @@ src/testbed/gnunet-service-testbed_links.c src/testbed/gnunet-service-testbed_meminfo.c src/testbed/gnunet-service-testbed_oc.c src/testbed/gnunet-service-testbed_peers.c -src/testbed/gnunet-testbed-profiler.c -src/testbed/gnunet_mpi_test.c src/testbed/gnunet_testbed_mpi_spawn.c -src/testbed/testbed_api.c +src/testbed/gnunet-testbed-profiler.c +src/testbed-logger/gnunet-service-testbed-logger.c +src/testbed-logger/testbed_logger_api.c src/testbed/testbed_api_barriers.c +src/testbed/testbed_api.c src/testbed/testbed_api_hosts.c src/testbed/testbed_api_operations.c src/testbed/testbed_api_peers.c src/testbed/testbed_api_sd.c src/testbed/testbed_api_services.c src/testbed/testbed_api_statistics.c -src/testbed/testbed_api_test.c src/testbed/testbed_api_testbed.c +src/testbed/testbed_api_test.c src/testbed/testbed_api_topology.c src/testbed/testbed_api_underlay.c src/testing/gnunet-testing.c @@ -398,39 +398,36 @@ src/testing/testing.c src/topology/friends.c src/topology/gnunet-daemon-topology.c src/transport/gnunet-helper-transport-bluetooth.c -src/transport/gnunet-helper-transport-wlan-dummy.c src/transport/gnunet-helper-transport-wlan.c -src/transport/gnunet-service-transport.c +src/transport/gnunet-helper-transport-wlan-dummy.c src/transport/gnunet-service-transport_ats.c +src/transport/gnunet-service-transport.c src/transport/gnunet-service-transport_hello.c src/transport/gnunet-service-transport_manipulation.c src/transport/gnunet-service-transport_neighbours.c src/transport/gnunet-service-transport_plugins.c src/transport/gnunet-service-transport_validation.c +src/transport/gnunet-transport.c src/transport/gnunet-transport-certificate-creation.c src/transport/gnunet-transport-profiler.c src/transport/gnunet-transport-wlan-receiver.c src/transport/gnunet-transport-wlan-sender.c -src/transport/gnunet-transport.c src/transport/plugin_transport_http_client.c src/transport/plugin_transport_http_common.c src/transport/plugin_transport_http_server.c src/transport/plugin_transport_smtp.c src/transport/plugin_transport_tcp.c src/transport/plugin_transport_template.c -src/transport/plugin_transport_udp.c src/transport/plugin_transport_udp_broadcasting.c +src/transport/plugin_transport_udp.c src/transport/plugin_transport_unix.c src/transport/plugin_transport_wlan.c +src/transport/plugin_transport_xt.c +src/transport/plugin_transport_xu.c src/transport/tcp_connection_legacy.c src/transport/tcp_server_legacy.c src/transport/tcp_server_mst_legacy.c src/transport/tcp_service_legacy.c -src/transport/transport-testing-filenames.c -src/transport/transport-testing-loggers.c -src/transport/transport-testing-main.c -src/transport/transport-testing-send.c -src/transport/transport-testing.c src/transport/transport_api_address_to_string.c src/transport/transport_api_blacklist.c src/transport/transport_api_core.c @@ -439,6 +436,11 @@ src/transport/transport_api_manipulation.c src/transport/transport_api_monitor_peers.c src/transport/transport_api_monitor_plugins.c src/transport/transport_api_offer_hello.c +src/transport/transport-testing.c +src/transport/transport-testing-filenames.c +src/transport/transport-testing-loggers.c +src/transport/transport-testing-main.c +src/transport/transport-testing-send.c src/tun/regex.c src/tun/tun.c src/util/bandwidth.c @@ -452,8 +454,8 @@ src/util/configuration_loader.c src/util/container_bloomfilter.c src/util/container_heap.c src/util/container_meta_data.c -src/util/container_multihashmap.c src/util/container_multihashmap32.c +src/util/container_multihashmap.c src/util/container_multipeermap.c src/util/container_multishortmap.c src/util/crypto_abe.c @@ -474,8 +476,8 @@ src/util/crypto_symmetric.c src/util/disk.c src/util/getopt.c src/util/getopt_helpers.c -src/util/gnunet-config-diff.c src/util/gnunet-config.c +src/util/gnunet-config-diff.c src/util/gnunet-ecc.c src/util/gnunet-helper-w32-console.c src/util/gnunet-resolver.c @@ -506,13 +508,13 @@ src/util/time.c src/util/w32cat.c src/util/win.c src/util/winproc.c -src/vpn/gnunet-helper-vpn-windows.c src/vpn/gnunet-helper-vpn.c +src/vpn/gnunet-helper-vpn-windows.c src/vpn/gnunet-service-vpn.c src/vpn/gnunet-vpn.c src/vpn/vpn_api.c -src/zonemaster/gnunet-service-zonemaster-monitor.c src/zonemaster/gnunet-service-zonemaster.c +src/zonemaster/gnunet-service-zonemaster-monitor.c src/fs/fs_api.h src/include/gnunet_common.h src/include/gnunet_mq_lib.h diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index fcd69599b3..e4fa5cc109 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -106,7 +106,13 @@ * @param fun name of curl_easy-function that gave the error * @param rc return code from curl */ -#define LOG_CURL_EASY(level,fun,rc) GNUNET_log(level, _("%s failed at %s:%d: `%s'\n"), fun, __FILE__, __LINE__, curl_easy_strerror (rc)) +#define LOG_CURL_EASY(level,fun,rc) \ + GNUNET_log (level, \ + _("%s failed at %s:%d: `%s'\n"), \ + fun, \ + __FILE__, \ + __LINE__, \ + curl_easy_strerror (rc)) /* *************** Socks protocol definitions (move to TUN?) ****************** */ @@ -768,21 +774,37 @@ cleanup_s5r (struct Socks5Request *s5r) } if ( (NULL != s5r->response) && (curl_failure_response != s5r->response) ) + { MHD_destroy_response (s5r->response); + s5r->response = NULL; + } if (NULL != s5r->rtask) + { GNUNET_SCHEDULER_cancel (s5r->rtask); + s5r->rtask = NULL; + } if (NULL != s5r->timeout_task) + { GNUNET_SCHEDULER_cancel (s5r->timeout_task); + s5r->timeout_task = NULL; + } if (NULL != s5r->wtask) + { GNUNET_SCHEDULER_cancel (s5r->wtask); + s5r->wtask = NULL; + } if (NULL != s5r->gns_lookup) + { GNUNET_GNS_lookup_with_tld_cancel (s5r->gns_lookup); + s5r->gns_lookup = NULL; + } if (NULL != s5r->sock) { if (SOCKS5_SOCKET_WITH_MHD <= s5r->state) GNUNET_NETWORK_socket_free_memory_only_ (s5r->sock); else GNUNET_NETWORK_socket_close (s5r->sock); + s5r->sock = NULL; } GNUNET_CONTAINER_DLL_remove (s5r_head, s5r_tail, @@ -1129,7 +1151,9 @@ curl_check_hdr (void *buffer, domain_matched = GNUNET_NO; /* make sure we match domain at most once */ for (tok = strtok (hdr_val, ";"); NULL != tok; tok = strtok (NULL, ";")) { - if ( (0 == strncasecmp (tok, " domain", strlen (" domain"))) && + if ( (0 == strncasecmp (tok, + " domain", + strlen (" domain"))) && (GNUNET_NO == domain_matched) ) { domain_matched = GNUNET_YES; @@ -1137,7 +1161,8 @@ curl_check_hdr (void *buffer, if (strlen (cookie_domain) < strlen (s5r->leho)) { delta_cdomain = strlen (s5r->leho) - strlen (cookie_domain); - if (0 == strcasecmp (cookie_domain, s5r->leho + delta_cdomain)) + if (0 == strcasecmp (cookie_domain, + s5r->leho + delta_cdomain)) { offset += sprintf (new_cookie_hdr + offset, " domain=%s;", @@ -1145,7 +1170,8 @@ curl_check_hdr (void *buffer, continue; } } - else if (0 == strcmp (cookie_domain, s5r->leho)) + else if (0 == strcmp (cookie_domain, + s5r->leho)) { offset += sprintf (new_cookie_hdr + offset, " domain=%s;", @@ -1156,7 +1182,9 @@ curl_check_hdr (void *buffer, _("Cookie domain `%s' supplied by server is invalid\n"), tok); } - GNUNET_memcpy (new_cookie_hdr + offset, tok, strlen (tok)); + GNUNET_memcpy (new_cookie_hdr + offset, + tok, + strlen (tok)); offset += strlen (tok); new_cookie_hdr[offset++] = ';'; } @@ -1164,7 +1192,8 @@ curl_check_hdr (void *buffer, } new_location = NULL; - if (0 == strcasecmp (MHD_HTTP_HEADER_LOCATION, hdr_type)) + if (0 == strcasecmp (MHD_HTTP_HEADER_LOCATION, + hdr_type)) { char *leho_host; @@ -1251,7 +1280,9 @@ create_mhd_response_from_s5r (struct Socks5Request *s5r) s5r->domain, s5r->url); s5r->response_code = resp_code; - s5r->response = MHD_create_response_from_callback ((-1 == content_length) ? MHD_SIZE_UNKNOWN : content_length, + s5r->response = MHD_create_response_from_callback ((-1 == content_length) + ? MHD_SIZE_UNKNOWN + : content_length, IO_BUFFERSIZE, &mhd_content_cb, s5r, @@ -1480,20 +1511,28 @@ curl_download_prepare () return; } to = -1; - GNUNET_break (CURLM_OK == curl_multi_timeout (curl_multi, &to)); + GNUNET_break (CURLM_OK == + curl_multi_timeout (curl_multi, + &to)); if (-1 == to) rtime = GNUNET_TIME_UNIT_FOREVER_REL; else - rtime = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, to); + rtime = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, + to); if (-1 != max) { grs = GNUNET_NETWORK_fdset_create (); gws = GNUNET_NETWORK_fdset_create (); - GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1); - GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1); + GNUNET_NETWORK_fdset_copy_native (grs, + &rs, + max + 1); + GNUNET_NETWORK_fdset_copy_native (gws, + &ws, + max + 1); curl_download_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, rtime, - grs, gws, + grs, + gws, &curl_task_download, curl_multi); GNUNET_NETWORK_fdset_destroy (gws); @@ -1648,12 +1687,15 @@ con_val_iter (void *cls, struct Socks5Request *s5r = cls; char *hdr; - if ( (0 == strcasecmp (MHD_HTTP_HEADER_HOST, key)) && + if ( (0 == strcasecmp (MHD_HTTP_HEADER_HOST, + key)) && (NULL != s5r->leho) ) value = s5r->leho; - if (0 == strcasecmp (MHD_HTTP_HEADER_CONTENT_LENGTH, key)) + if (0 == strcasecmp (MHD_HTTP_HEADER_CONTENT_LENGTH, + key)) return MHD_YES; - if (0 == strcasecmp (MHD_HTTP_HEADER_ACCEPT_ENCODING, key)) + if (0 == strcasecmp (MHD_HTTP_HEADER_ACCEPT_ENCODING, + key)) return MHD_YES; GNUNET_asprintf (&hdr, "%s: %s", @@ -1774,21 +1816,40 @@ create_response (void *cls, return MHD_queue_response (con, MHD_HTTP_INTERNAL_SERVER_ERROR, curl_failure_response); - curl_easy_setopt (s5r->curl, CURLOPT_HEADERFUNCTION, &curl_check_hdr); - curl_easy_setopt (s5r->curl, CURLOPT_HEADERDATA, s5r); - curl_easy_setopt (s5r->curl, CURLOPT_FOLLOWLOCATION, 0); + curl_easy_setopt (s5r->curl, + CURLOPT_HEADERFUNCTION, + &curl_check_hdr); + curl_easy_setopt (s5r->curl, + CURLOPT_HEADERDATA, + s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_FOLLOWLOCATION, + 0); if (s5r->is_gns) curl_easy_setopt (s5r->curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); - curl_easy_setopt (s5r->curl, CURLOPT_CONNECTTIMEOUT, 600L); - curl_easy_setopt (s5r->curl, CURLOPT_TIMEOUT, 600L); - curl_easy_setopt (s5r->curl, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt (s5r->curl, CURLOPT_HTTP_CONTENT_DECODING, 0); - // curl_easy_setopt (s5r->curl, CURLOPT_HTTP_TRANSFER_DECODING, 0); - curl_easy_setopt (s5r->curl, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt (s5r->curl, CURLOPT_PRIVATE, s5r); - curl_easy_setopt (s5r->curl, CURLOPT_VERBOSE, 0L); + curl_easy_setopt (s5r->curl, + CURLOPT_CONNECTTIMEOUT, + 600L); + curl_easy_setopt (s5r->curl, + CURLOPT_TIMEOUT, + 600L); + curl_easy_setopt (s5r->curl, + CURLOPT_NOSIGNAL, + 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_HTTP_CONTENT_DECODING, + 0); + curl_easy_setopt (s5r->curl, + CURLOPT_NOSIGNAL, + 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_PRIVATE, + s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_VERBOSE, + 0L); /** * Pre-populate cache to resolve Hostname. * This is necessary as the DNS name in the CURLOPT_URL is used @@ -1844,11 +1905,21 @@ create_response (void *cls, MHD_HTTP_METHOD_PUT)) { s5r->state = SOCKS5_SOCKET_UPLOAD_STARTED; - curl_easy_setopt (s5r->curl, CURLOPT_UPLOAD, 1L); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEFUNCTION, &curl_download_cb); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEDATA, s5r); - curl_easy_setopt (s5r->curl, CURLOPT_READFUNCTION, &curl_upload_cb); - curl_easy_setopt (s5r->curl, CURLOPT_READDATA, s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_UPLOAD, + 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEFUNCTION, + &curl_download_cb); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEDATA, + s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_READFUNCTION, + &curl_upload_cb); + curl_easy_setopt (s5r->curl, + CURLOPT_READDATA, + s5r); { const char *us; long upload_size; @@ -1870,11 +1941,21 @@ create_response (void *cls, else if (0 == strcasecmp (meth, MHD_HTTP_METHOD_POST)) { s5r->state = SOCKS5_SOCKET_UPLOAD_STARTED; - curl_easy_setopt (s5r->curl, CURLOPT_POST, 1L); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEFUNCTION, &curl_download_cb); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEDATA, s5r); - curl_easy_setopt (s5r->curl, CURLOPT_READFUNCTION, &curl_upload_cb); - curl_easy_setopt (s5r->curl, CURLOPT_READDATA, s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_POST, + 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEFUNCTION, + &curl_download_cb); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEDATA, + s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_READFUNCTION, + &curl_upload_cb); + curl_easy_setopt (s5r->curl, + CURLOPT_READDATA, + s5r); { const char *us; long upload_size; @@ -1893,22 +1974,35 @@ create_response (void *cls, } } } - else if (0 == strcasecmp (meth, MHD_HTTP_METHOD_HEAD)) + else if (0 == strcasecmp (meth, + MHD_HTTP_METHOD_HEAD)) { s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; - curl_easy_setopt (s5r->curl, CURLOPT_NOBODY, 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_NOBODY, + 1L); } - else if (0 == strcasecmp (meth, MHD_HTTP_METHOD_OPTIONS)) + else if (0 == strcasecmp (meth, + MHD_HTTP_METHOD_OPTIONS)) { s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; - curl_easy_setopt (s5r->curl, CURLOPT_CUSTOMREQUEST, "OPTIONS"); + curl_easy_setopt (s5r->curl, + CURLOPT_CUSTOMREQUEST, + "OPTIONS"); } - else if (0 == strcasecmp (meth, MHD_HTTP_METHOD_GET)) + else if (0 == strcasecmp (meth, + MHD_HTTP_METHOD_GET)) { s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; - curl_easy_setopt (s5r->curl, CURLOPT_HTTPGET, 1L); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEFUNCTION, &curl_download_cb); - curl_easy_setopt (s5r->curl, CURLOPT_WRITEDATA, s5r); + curl_easy_setopt (s5r->curl, + CURLOPT_HTTPGET, + 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEFUNCTION, + &curl_download_cb); + curl_easy_setopt (s5r->curl, + CURLOPT_WRITEDATA, + s5r); } else { @@ -1922,31 +2016,47 @@ create_response (void *cls, if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_0)) { - curl_easy_setopt (s5r->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0); + curl_easy_setopt (s5r->curl, + CURLOPT_HTTP_VERSION, + CURL_HTTP_VERSION_1_0); } else if (0 == strcasecmp (ver, MHD_HTTP_VERSION_1_1)) { - curl_easy_setopt (s5r->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1); + curl_easy_setopt (s5r->curl, + CURLOPT_HTTP_VERSION, + CURL_HTTP_VERSION_1_1); } else { - curl_easy_setopt (s5r->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE); + curl_easy_setopt (s5r->curl, + CURLOPT_HTTP_VERSION, + CURL_HTTP_VERSION_NONE); } if (HTTPS_PORT == s5r->port) { - curl_easy_setopt (s5r->curl, CURLOPT_USE_SSL, CURLUSESSL_ALL); + curl_easy_setopt (s5r->curl, + CURLOPT_USE_SSL, + CURLUSESSL_ALL); if (NULL != s5r->dane_data) - curl_easy_setopt (s5r->curl, CURLOPT_SSL_VERIFYPEER, 0L); + curl_easy_setopt (s5r->curl, + CURLOPT_SSL_VERIFYPEER, + 0L); else - curl_easy_setopt (s5r->curl, CURLOPT_SSL_VERIFYPEER, 1L); + curl_easy_setopt (s5r->curl, + CURLOPT_SSL_VERIFYPEER, + 1L); /* Disable cURL checking the hostname, as we will check ourselves as only we have the domain name or the LEHO or the DANE record */ - curl_easy_setopt (s5r->curl, CURLOPT_SSL_VERIFYHOST, 0L); + curl_easy_setopt (s5r->curl, + CURLOPT_SSL_VERIFYHOST, + 0L); } else { - curl_easy_setopt (s5r->curl, CURLOPT_USE_SSL, CURLUSESSL_NONE); + curl_easy_setopt (s5r->curl, + CURLOPT_USE_SSL, + CURLUSESSL_NONE); } if (CURLM_OK != @@ -1979,7 +2089,9 @@ create_response (void *cls, /* FIXME: This must be set or a header with Transfer-Encoding: chunked. Else * upload callback is not called! */ - curl_easy_setopt (s5r->curl, CURLOPT_POSTFIELDSIZE, *upload_data_size); + curl_easy_setopt (s5r->curl, + CURLOPT_POSTFIELDSIZE, + *upload_data_size); left = GNUNET_MIN (*upload_data_size, sizeof (s5r->io_buf) - s5r->io_len); @@ -2372,8 +2484,10 @@ load_file (const char* filename, uint64_t fsize; if (GNUNET_OK != - GNUNET_DISK_file_size (filename, &fsize, - GNUNET_YES, GNUNET_YES)) + GNUNET_DISK_file_size (filename, + &fsize, + GNUNET_YES, + GNUNET_YES)) return NULL; if (fsize > MAX_PEM_SIZE) return NULL; @@ -2405,7 +2519,8 @@ load_key_from_file (gnutls_x509_privkey_t key, gnutls_datum_t key_data; int ret; - key_data.data = load_file (keyfile, &key_data.size); + key_data.data = load_file (keyfile, + &key_data.size); if (NULL == key_data.data) return GNUNET_SYSERR; ret = gnutls_x509_privkey_import (key, &key_data, @@ -2435,15 +2550,18 @@ load_cert_from_file (gnutls_x509_crt_t crt, gnutls_datum_t cert_data; int ret; - cert_data.data = load_file (certfile, &cert_data.size); + cert_data.data = load_file (certfile, + &cert_data.size); if (NULL == cert_data.data) return GNUNET_SYSERR; - ret = gnutls_x509_crt_import (crt, &cert_data, + ret = gnutls_x509_crt_import (crt, + &cert_data, GNUTLS_X509_FMT_PEM); if (GNUTLS_E_SUCCESS != ret) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Unable to import certificate %s\n"), certfile); + _("Unable to import certificate from `%s'\n"), + certfile); } GNUNET_free_non_null (cert_data.data); return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK; @@ -2473,14 +2591,27 @@ generate_gns_certificate (const char *name) GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_init (&request)); GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_key (request, proxy_ca.key)); pgc = GNUNET_new (struct ProxyGNSCertificate); - gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_COUNTRY_NAME, - 0, "ZZ", 2); - gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_ORGANIZATION_NAME, - 0, "GNU Name System", 4); - gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_COMMON_NAME, - 0, name, strlen (name)); - GNUNET_break (GNUTLS_E_SUCCESS == gnutls_x509_crt_set_version (request, 3)); - gnutls_rnd (GNUTLS_RND_NONCE, &serial, sizeof (serial)); + gnutls_x509_crt_set_dn_by_oid (request, + GNUTLS_OID_X520_COUNTRY_NAME, + 0, + "ZZ", + strlen ("ZZ")); + gnutls_x509_crt_set_dn_by_oid (request, + GNUTLS_OID_X520_ORGANIZATION_NAME, + 0, + "GNU Name System", + strlen ("GNU Name System")); + gnutls_x509_crt_set_dn_by_oid (request, + GNUTLS_OID_X520_COMMON_NAME, + 0, + name, + strlen (name)); + GNUNET_break (GNUTLS_E_SUCCESS == + gnutls_x509_crt_set_version (request, + 3)); + gnutls_rnd (GNUTLS_RND_NONCE, + &serial, + sizeof (serial)); gnutls_x509_crt_set_serial (request, &serial, sizeof (serial)); @@ -2501,10 +2632,14 @@ generate_gns_certificate (const char *name) 0); key_buf_size = sizeof (pgc->key); cert_buf_size = sizeof (pgc->cert); - gnutls_x509_crt_export (request, GNUTLS_X509_FMT_PEM, - pgc->cert, &cert_buf_size); - gnutls_x509_privkey_export (proxy_ca.key, GNUTLS_X509_FMT_PEM, - pgc->key, &key_buf_size); + gnutls_x509_crt_export (request, + GNUTLS_X509_FMT_PEM, + pgc->cert, + &cert_buf_size); + gnutls_x509_privkey_export (proxy_ca.key, + GNUTLS_X509_FMT_PEM, + pgc->key, + &key_buf_size); gnutls_x509_crt_deinit (request); return pgc; } @@ -2945,7 +3080,8 @@ do_s5r_read (void *cls) s5r->rtask = NULL; tc = GNUNET_SCHEDULER_get_task_context (); if ( (NULL != tc->read_ready) && - (GNUNET_NETWORK_fdset_isset (tc->read_ready, s5r->sock)) ) + (GNUNET_NETWORK_fdset_isset (tc->read_ready, + s5r->sock)) ) { rlen = GNUNET_NETWORK_socket_recv (s5r->sock, &s5r->rbuf[s5r->rbuf_len], @@ -3142,17 +3278,22 @@ do_accept (void *cls) if (lsock == lsock4) ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, lsock, - &do_accept, lsock); + &do_accept, + lsock); else if (lsock == lsock6) ltask6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, lsock, - &do_accept, lsock); + &do_accept, + lsock); else GNUNET_assert (0); - s = GNUNET_NETWORK_socket_accept (lsock, NULL, NULL); + s = GNUNET_NETWORK_socket_accept (lsock, + NULL, + NULL); if (NULL == s) { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "accept"); + GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, + "accept"); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -3165,7 +3306,8 @@ do_accept (void *cls) s5r->state = SOCKS5_INIT; s5r->rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, s5r->sock, - &do_s5r_read, s5r); + &do_s5r_read, + s5r); } @@ -3262,7 +3404,8 @@ bind_v4 () if (NULL == ls) return NULL; if (GNUNET_OK != - GNUNET_NETWORK_socket_bind (ls, (const struct sockaddr *) &sa4, + GNUNET_NETWORK_socket_bind (ls, + (const struct sockaddr *) &sa4, sizeof (sa4))) { eno = errno; @@ -3298,7 +3441,8 @@ bind_v6 () if (NULL == ls) return NULL; if (GNUNET_OK != - GNUNET_NETWORK_socket_bind (ls, (const struct sockaddr *) &sa6, + GNUNET_NETWORK_socket_bind (ls, + (const struct sockaddr *) &sa6, sizeof (sa6))) { eno = errno; @@ -3353,7 +3497,8 @@ run (void *cls, cafile = cafile_cfg; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Using %s as CA\n", cafile); + "Using `%s' as CA\n", + cafile); gnutls_global_init (); gnutls_x509_crt_init (&proxy_ca.cert); @@ -3488,7 +3633,8 @@ run (void *cls, * @return 0 ok, 1 on error */ int -main (int argc, char *const *argv) +main (int argc, + char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_option_uint16 ('p', @@ -3509,8 +3655,9 @@ main (int argc, char *const *argv) "cURL fail"; int ret; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, - &argc, &argv)) + if (GNUNET_OK != + GNUNET_STRINGS_get_utf8_args (argc, argv, + &argc, &argv)) return 2; GNUNET_log_setup ("gnunet-gns-proxy", "WARNING", -- cgit v1.2.3-18-g5258 From 360fa41773651f9592c440d8fefe7748e6f1a1ce Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 10:13:13 +0200 Subject: follow twister change e01669953d7a8e82a505fca2308e57e971d43c67: check return value on upload_cb registration with curl --- src/gns/gnunet-gns-proxy.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index e4fa5cc109..918c1d110e 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -1914,9 +1914,10 @@ create_response (void *cls, curl_easy_setopt (s5r->curl, CURLOPT_WRITEDATA, s5r); - curl_easy_setopt (s5r->curl, - CURLOPT_READFUNCTION, - &curl_upload_cb); + GNUNET_assert (CURLE_OK == + curl_easy_setopt (s5r->curl, + CURLOPT_READFUNCTION, + &curl_upload_cb)); curl_easy_setopt (s5r->curl, CURLOPT_READDATA, s5r); -- cgit v1.2.3-18-g5258 From fe4f50298fe81bdf8b7664701c241f46ce80c3fd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 10:25:26 +0200 Subject: resume curl download if we paused it before --- src/gns/gnunet-gns-proxy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 918c1d110e..84b8da04ab 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -1431,6 +1431,12 @@ curl_upload_cb (void *buf, (SOCKS5_SOCKET_UPLOAD_DONE == s5r->state) ) { s5r->state = SOCKS5_SOCKET_DOWNLOAD_STARTED; + if (GNUNET_YES == s5r->curl_paused) + { + s5r->curl_paused = GNUNET_NO; + curl_easy_pause (s5r->curl, + CURLPAUSE_CONT); + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Completed CURL UPLOAD %s%s\n", s5r->domain, -- cgit v1.2.3-18-g5258 From 371e38e9f5062c1474ec21232f60ce9ef3a7b764 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 16:05:55 +0200 Subject: fix KX in Cadet for revocation-style sequencing --- src/cadet/gnunet-service-cadet_tunnels.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index dbd84a8185..5c52eb6164 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -2048,6 +2048,13 @@ GCT_handle_kx_auth (struct CadetTConnection *ct, Nothing to do here. */ break; } + if (0 != (GNUNET_CADET_KX_FLAG_FORCE_REPLY & ntohl (msg->kx.flags))) + { + send_kx_auth (t, + NULL, + &t->ax, + GNUNET_NO); + } } @@ -2422,8 +2429,6 @@ connection_ready_cb (void *cls, { case CADET_TUNNEL_KEY_UNINITIALIZED: /* Do not begin KX if WE have no channels waiting! */ - if (0 == GCT_count_channels (t)) - return; if (0 != GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us) return; /* wait for timeout before retrying */ /* We are uninitialized, just transmit immediately, @@ -2436,6 +2441,15 @@ connection_ready_cb (void *cls, send_kx (t, ct, &t->ax); + if ( (0 == + GCT_count_channels (t)) && + (NULL == t->destroy_task) ) + { + t->destroy_task + = GNUNET_SCHEDULER_add_delayed (IDLE_DESTROY_DELAY, + &destroy_tunnel, + t); + } break; case CADET_TUNNEL_KEY_AX_RECV: case CADET_TUNNEL_KEY_AX_SENT: -- cgit v1.2.3-18-g5258 From e13828526819ba1b37877950b8cef75a4c7787b4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jun 2018 00:38:33 +0200 Subject: style fix --- src/revocation/test_revocation.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index 8d55936941..c3eefa8b1e 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c @@ -59,9 +59,7 @@ static int ok; static void do_shutdown (void *cls) { - unsigned int c; - - for (c = 0; c < NUM_TEST_PEERS; c++) + for (unsigned int c = 0; c < NUM_TEST_PEERS; c++) { if (NULL != testpeers[c].create_id_op) { -- cgit v1.2.3-18-g5258 From 90e29258a5339d232ea1b22f3f83d61701b52358 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 00:32:36 +0200 Subject: changes for AGPL handling --- README | 16 ++++++---------- src/include/gnunet_mq_lib.h | 18 ++++++++++++++++++ src/include/gnunet_protocols.h | 17 ++++++++++++++++- src/include/gnunet_util_lib.h | 8 ++++++++ src/util/mq.c | 37 +++++++++++++++++++++++++++++++++++++ src/util/service.c | 40 ++++++++++++++++++++++++++++++++++++---- 6 files changed, 121 insertions(+), 15 deletions(-) diff --git a/README b/README index 80a87d2741..61c54b4f42 100644 --- a/README +++ b/README @@ -15,8 +15,11 @@ GNU package (http://www.gnu.org/). This is an ALPHA release. There are known and significant bugs as well as many missing features in this release. -GNUnet is free software released under the GNU General Public License -(v3 or later). For details see the COPYING file in this directory. +GNUnet is free software released under the GNU Affero General Public +License (v3 or later). For details see the COPYING file in this +directory. If you fork this software, you MUST adjust GNUNET_AGPL_URL +in src/include/gnunet_util_lib.h to point to the source code of your +fork! Additional documentation about GNUnet can be found at https://gnunet.org/ and in the doc/ folder. @@ -25,16 +28,9 @@ https://gnunet.org/ and in the doc/ folder. Dependencies: ============= -Please note that for many of its dependencies GNUnet requires very -recent versions of the libraries which are often NOT to be found in -stable distributions in 2014. While using older packages may in some -cases on some operating systems may seem to work in some limited -fashion, we are in many cases aware of serious problems with older -packages. Hence please make sure to use the versions listed below. - These are the direct dependencies for running GNUnet: -- libmicrohttpd >= 0.9.42 +- libmicrohttpd >= 0.9.52 - libgcrypt >= 1.6 - libgnurl >= 7.35.0 (available from https://gnunet.org/gnurl) - libunistring >= 0.9.2 diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index fe699c48f0..daf1869fb5 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h @@ -339,6 +339,24 @@ struct GNUNET_MQ_MessageHandler * GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers); +/** + * Copy an array of handlers, appending AGPL handler. + * + * Useful if the array has been delared in local memory and needs to be + * persisted for future use. + * + * @param handlers Array of handlers to be copied. Can be NULL (nothing done). + * @param agpl_handler function to call for AGPL handling + * @param agpl_cls closure for @a agpl_handler + * @return A newly allocated array of handlers. + * Needs to be freed with #GNUNET_free. + */ +struct GNUNET_MQ_MessageHandler * +GNUNET_MQ_copy_handlers2 (const struct GNUNET_MQ_MessageHandler *handlers, + GNUNET_MQ_MessageCallback agpl_handler, + void *agpl_cls); + + /** * Count the handlers in a handler array. * diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 7040f2cbf5..60dbeeb789 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2001--2015 GNUnet e.V. + Copyright (C) 2001--2018 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -85,6 +85,21 @@ extern "C" */ #define GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE 5 +/******************************************************************************* + * AGPL source code download + * *****************************************************************************/ + +/** + * Message to request source code link. + */ +#define GNUNET_MESSAGE_TYPE_REQUEST_AGPL 6 + +/** + * Source code link. + */ +#define GNUNET_MESSAGE_TYPE_RESPONSE_AGPL 7 + + /******************************************************************************* * ARM message types ******************************************************************************/ diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index a9bd6c33fe..e82e6caee9 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h @@ -52,6 +52,14 @@ extern "C" */ #define GNUNET_MIN_MESSAGE_SIZE sizeof (struct GNUNET_MessageHeader) +/** + * NOTE: You MUST adjust this URL to point to the location of a + * publicly accessible repository (or TGZ) containing the sources of + * THIS release. Otherwise, you are violating the Affero GPL if you make + * this service available to anyone but yourself. + */ +#define GNUNET_AGPL_URL "https://gnunet.org/git/gnunet.git#" PACKAGE_VERSION; + #include "gnunet_crypto_lib.h" #include "gnunet_bandwidth_lib.h" diff --git a/src/util/mq.c b/src/util/mq.c index 81a42e0c68..bf8f957906 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -1215,6 +1215,43 @@ GNUNET_MQ_copy_handlers (const struct GNUNET_MQ_MessageHandler *handlers) } +/** + * Copy an array of handlers, appending AGPL handler. + * + * Useful if the array has been delared in local memory and needs to be + * persisted for future use. + * + * @param handlers Array of handlers to be copied. Can be NULL (nothing done). + * @param agpl_handler function to call for AGPL handling + * @param agpl_cls closure for @a agpl_handler + * @return A newly allocated array of handlers. + * Needs to be freed with #GNUNET_free. + */ +struct GNUNET_MQ_MessageHandler * +GNUNET_MQ_copy_handlers2 (const struct GNUNET_MQ_MessageHandler *handlers, + GNUNET_MQ_MessageCallback agpl_handler, + void *agpl_cls) +{ + struct GNUNET_MQ_MessageHandler *copy; + unsigned int count; + + if (NULL == handlers) + return NULL; + count = GNUNET_MQ_count_handlers (handlers); + copy = GNUNET_new_array (count + 2, + struct GNUNET_MQ_MessageHandler); + GNUNET_memcpy (copy, + handlers, + count * sizeof (struct GNUNET_MQ_MessageHandler)); + copy[count].mv = NULL; + copy[count].cb = agpl_handler; + copy[count].cls = agpl_cls; + copy[count].type = GNUNET_MESSAGE_TYPE_REQUEST_AGPL; + copy[count].expected_size = sizeof (struct GNUNET_MessageHeader); + return copy; +} + + /** * Count the handlers in a handler array. * diff --git a/src/util/service.c b/src/util/service.c index 1156093f4c..ae18099508 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -1571,6 +1571,36 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh) } +/** + * Function to return link to AGPL source upon request. + * + * @param cls closure with the identification of the client + * @param msg AGPL request + */ +static void +return_agpl (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + struct GNUNET_SERVICE_Client *client = cls; + struct GNUNET_MQ_Handle *mq; + struct GNUNET_MQ_Envelope *env; + struct GNUNET_MessageHeader *res; + size_t slen; + + slen = strlen (GNUNET_AGPL_URL) + 1; + env = GNUNET_MQ_msg_extra (res, + GNUNET_MESSAGE_TYPE_RESPONSE_AGPL, + slen); + memcpy (&res[1], + GNUNET_AGPL_URL, + slen); + mq = GNUNET_SERVICE_client_get_mq (client); + GNUNET_MQ_send (mq, + env); + GNUNET_SERVICE_client_continue (client); +} + + /** * Low-level function to start a service if the scheduler * is already running. Should only be used directly in @@ -1623,7 +1653,9 @@ GNUNET_SERVICE_start (const char *service_name, sh->connect_cb = connect_cb; sh->disconnect_cb = disconnect_cb; sh->cb_cls = cls; - sh->handlers = GNUNET_MQ_copy_handlers (handlers); + sh->handlers = GNUNET_MQ_copy_handlers2 (handlers, + &return_agpl, + NULL); if (GNUNET_OK != setup_service (sh)) { GNUNET_free_non_null (sh->handlers); @@ -1723,9 +1755,9 @@ GNUNET_SERVICE_run_ (int argc, struct GNUNET_GETOPT_CommandLineOption service_options[] = { GNUNET_GETOPT_option_cfgfile (&opt_cfg_filename), GNUNET_GETOPT_option_flag ('d', - "daemonize", - gettext_noop ("do daemonize (detach from terminal)"), - &do_daemonize), + "daemonize", + gettext_noop ("do daemonize (detach from terminal)"), + &do_daemonize), GNUNET_GETOPT_option_help (NULL), GNUNET_GETOPT_option_loglevel (&loglev), GNUNET_GETOPT_option_logfile (&logfile), -- cgit v1.2.3-18-g5258 From 6ab858be606ee40db66e349c165a6862a79c65a4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 00:32:51 +0200 Subject: whitespace --- po/de.po | 1175 ++++++++++++++++++---------------- po/es.po | 1211 +++++++++++++++++++----------------- po/fr.po | 1166 ++++++++++++++++++---------------- po/sv.po | 1168 ++++++++++++++++++---------------- po/vi.po | 1178 +++++++++++++++++++---------------- po/zh_CN.po | 1168 ++++++++++++++++++---------------- src/my/Makefile.am | 3 + src/util/gnunet-service-resolver.c | 6 +- 8 files changed, 3820 insertions(+), 3255 deletions(-) diff --git a/po/de.po b/po/de.po index 05e56b0d4a..b3eff360dd 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2015-03-08 16:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -226,6 +226,7 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -236,6 +237,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -244,6 +248,7 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -251,6 +256,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format @@ -258,6 +264,7 @@ msgid "Using `%s' instead\n" msgstr "" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -266,6 +273,7 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -274,6 +282,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -282,6 +291,7 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -353,14 +363,131 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "Protokollierung stoppen\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +msgid "solver to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +msgid "print logging" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 #, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Collection `%s' begonnen.\n" +msgid "Failed to initialize solver `%s'!\n" +msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Konfiguration konnte nicht aus %s geladen werden\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr " gconfig\tGTK Konfiguration\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -372,6 +499,15 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "Protokollierung stoppen\n" + +#: src/ats-tests/ats-testing-log.c:892 +#, fuzzy, c-format +msgid "Start logging `%s'\n" +msgstr "Collection `%s' begonnen.\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -379,15 +515,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -msgid "solver to use" -msgstr "" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -505,123 +632,6 @@ msgstr "" msgid "Print information about ATS state" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -msgid "print logging" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Konfiguration konnte nicht aus %s geladen werden\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr " gconfig\tGTK Konfiguration\n" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -767,28 +777,6 @@ msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)" msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - #: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" @@ -1038,16 +1026,38 @@ msgstr "Fehler beim Starten der Collection.\n" msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 -msgid "sets the LINE to use for the phone" +#: src/conversation/gnunet-conversation.c:1300 +msgid "sets the LINE to use for the phone" +msgstr "" + +#: src/conversation/gnunet-conversation.c:1329 +msgid "Enables having a conversation with other GNUnet users." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." msgstr "" -#: src/conversation/gnunet-conversation.c:1329 -msgid "Enables having a conversation with other GNUnet users." +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "Fehler beim Lesen aus STDIN: %d %s\n" @@ -1582,15 +1592,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "GNUnet Netzwerk Topologie tracen." -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, fuzzy, c-format msgid "Failed to connect to namestore\n" @@ -2109,6 +2119,53 @@ msgstr "" msgid "Prints all packets that go through the DHT." msgstr "" +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "Anzahl an Durchläufen" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +msgid "Measure quality and performance of the DHT service." +msgstr "" + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" @@ -2363,53 +2420,6 @@ msgstr "" msgid "# DHT requests combined" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:949 -#, fuzzy -msgid "number of peers to start" -msgstr "Anzahl an Durchläufen" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -msgid "Measure quality and performance of the DHT service." -msgstr "" - #: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" @@ -3389,6 +3399,15 @@ msgid "" "chk/...)" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Alle Optionen anzeigen" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3405,15 +3424,6 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Alle Optionen anzeigen" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -4108,6 +4118,29 @@ msgstr "" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "Die Priorität des Inhalts angeben" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "GNUnet Netzwerk Topologie tracen." + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -4127,7 +4160,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -4142,126 +4175,103 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/gnunet-gns-proxy.c:2394 +#: src/gns/gnunet-gns-proxy.c:2570 #, fuzzy, c-format -msgid "Unable to import certificate %s\n" +msgid "Unable to import certificate from `%s'\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:238 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "Die Priorität des Inhalts angeben" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:258 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "GNUnet Netzwerk Topologie tracen." - #: src/gns/gnunet-service-gns.c:513 #, fuzzy msgid "Properly base32-encoded public key required" @@ -4273,8 +4283,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" @@ -4777,85 +4787,20 @@ msgstr "" msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 -#, fuzzy, c-format -msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" -msgstr "»%s« ist keine gültige IP-Adresse.\n" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 -#, fuzzy, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" -msgstr "»%s« ist keine gültige IP-Adresse.\n" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, fuzzy, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" - -#: src/identity-provider/gnunet-idp.c:424 -#, fuzzy -msgid "Ego is required\n" -msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -#, fuzzy -msgid "Requesting party key is required!\n" -msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#, fuzzy, c-format +msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" +msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -#, fuzzy -msgid "Identity Provider REST API initialized\n" -msgstr " Verbindung fehlgeschlagen\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#, fuzzy, c-format +msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +msgstr "»%s« ist keine gültige IP-Adresse.\n" + +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, fuzzy, c-format +msgid "Could not start hostlist HTTP server on port %u\n" +msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format @@ -4948,6 +4893,71 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" msgid "Identity REST API initialized\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr " Verbindung fehlgeschlagen\n" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -5049,66 +5059,6 @@ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" msgid "flat plugin running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -msgid "GNU Name System First Come First Serve name registration service" -msgstr "" - #: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" @@ -5276,6 +5226,66 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "" +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + #: src/namestore/gnunet-service-namestore.c:750 #, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5594,6 +5604,10 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n" msgid "`upnpc' command not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." +msgstr "" + #: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" @@ -5610,23 +5624,76 @@ msgstr "" msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 -msgid "delay between rounds" -msgstr "" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:893 +msgid "Measure quality and performance of the NSE service." +msgstr "" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Verfügbare(r) Transport(e): %s\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Datei wurde als `%s' gespeichert.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Datei wurde als `%s' gespeichert.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. " +"Die Datei wurde entfernt.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "==> Verzeichnis `%s':\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, fuzzy, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" -#: src/nse/gnunet-nse-profiler.c:893 -msgid "Measure quality and performance of the NSE service." -msgstr "" +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "==> Verzeichnis `%s':\n" -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" msgstr "" +#: src/peerinfo/peerinfo_api.c:220 +#, fuzzy +msgid "Failed to receive response from `PEERINFO' service." +msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" + #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format msgid "%sPeer `%s'\n" @@ -5717,63 +5784,6 @@ msgstr "Teste Transport(e) %s\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Verfügbare(r) Transport(e): %s\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Datei wurde als `%s' gespeichert.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Datei wurde als `%s' gespeichert.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. " -"Die Datei wurde entfernt.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "==> Verzeichnis `%s':\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, fuzzy, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "==> Verzeichnis `%s':\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -#, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6286,10 +6296,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Verbindung fehlgeschlagen\n" @@ -6743,17 +6753,6 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:289 -msgid "tolerate COUNT number of continious timeout failures" -msgstr "" - -#: src/testbed/gnunet-testbed-profiler.c:294 -msgid "" -"run profiler in non-interactive mode where upon testbed setup the profiler " -"does not wait for a keystroke but continues to run until a termination " -"signal is received" -msgstr "" - #: src/testbed/gnunet_testbed_mpi_spawn.c:118 #, fuzzy msgid "Waiting for child to exit.\n" @@ -6766,6 +6765,17 @@ msgstr "" msgid "Spawning process `%s'\n" msgstr "Ungültige Antwort auf `%s'.\n" +#: src/testbed/gnunet-testbed-profiler.c:289 +msgid "tolerate COUNT number of continious timeout failures" +msgstr "" + +#: src/testbed/gnunet-testbed-profiler.c:294 +msgid "" +"run profiler in non-interactive mode where upon testbed setup the profiler " +"does not wait for a keystroke but continues to run until a termination " +"signal is received" +msgstr "" + #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -7058,6 +7068,10 @@ msgstr "# HELLO-Meldungen empfangen" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -7102,10 +7116,6 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" @@ -7431,43 +7441,6 @@ msgstr "" msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# Bytes des Typs %d empfangen" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "Anzahl an Durchläufen" - -#: src/transport/gnunet-transport-profiler.c:636 -msgid "message size to use" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -msgid "Direct access to transport service." -msgstr "Direkter Zugriff auf den Transportdienst" - #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7600,6 +7573,11 @@ msgstr "" msgid "do not resolve hostnames" msgstr "Keine Rechnernamen auflösen" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "" + #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7608,11 +7586,45 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +msgid "Direct access to transport service." +msgstr "Direkter Zugriff auf den Transportdienst" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# Bytes des Typs %d empfangen" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "Anzahl an Durchläufen" + +#: src/transport/gnunet-transport-profiler.c:636 +msgid "message size to use" +msgstr "" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7682,6 +7694,7 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7786,6 +7799,8 @@ msgstr "# Bytes verworfen von SMTP (ausgehend)" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7794,6 +7809,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# aktive TCP-Sitzungen" @@ -7803,66 +7821,87 @@ msgstr "# aktive TCP-Sitzungen" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "# Bytes derzeit in TCP-Puffern" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "# Bytes verworfen von TCP (unterbrochen)" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "# Bytes über TCP übertragen" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# Bytes empfangen über TCP" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr " Verbindung fehlgeschlagen\n" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# verbundener Knoten" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "Fehler beim Starten des Dienstes.\n" @@ -7880,6 +7919,21 @@ msgstr "" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# Bytes empfangen über TCP" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, fuzzy, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -7900,6 +7954,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7909,15 +7964,19 @@ msgstr "UDP-Sockets können nicht geöffnet werden\n" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" @@ -7927,21 +7986,6 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n" msgid "Failed to create UDP network sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# Bytes empfangen über TCP" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, fuzzy, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" - #: src/transport/plugin_transport_unix.c:1403 #, c-format msgid "Cannot create path to `%s'\n" @@ -8023,6 +8067,55 @@ msgstr "" msgid "# sessions allocated" msgstr "# Sitzungsschlüssel akzeptiert" +#: src/transport/plugin_transport_xt.c:4010 +#, fuzzy, c-format +msgid "XT transport listening on port %llu\n" +msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#: src/transport/plugin_transport_xt.c:4014 +#, fuzzy +msgid "XT transport not listening on any port (client only)\n" +msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#: src/transport/plugin_transport_xt.c:4018 +#, fuzzy, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "TCP-Transportdienst wartet auf Port %llu\n" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "# aktive TCP-Sitzungen" + +#: src/transport/plugin_transport_xu.c:1237 +#, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:1251 +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "UDP-Sockets können nicht geöffnet werden\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "UDP-Sockets können nicht geöffnet werden\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "UDP-Sockets können nicht geöffnet werden\n" + #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -9114,8 +9207,8 @@ msgstr "Dienst wird über UDP angeboten" msgid "Setup tunnels via VPN." msgstr "Tunnel über VPN einrichten." -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" diff --git a/po/es.po b/po/es.po index b6fee17131..2bd5655fbb 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.9.5a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2013-02-23 17:50+0100\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" @@ -233,6 +233,7 @@ msgstr "" "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -245,6 +246,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -255,6 +259,7 @@ msgstr "" "configuración!\n" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -263,6 +268,7 @@ msgstr "" "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format @@ -270,6 +276,7 @@ msgid "Using `%s' instead\n" msgstr "Usando «%s» en su defecto\n" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -280,6 +287,7 @@ msgstr "" "«%s», no se pudo crear un «socket» UNIX: %s\n" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -290,6 +298,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -298,6 +307,7 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -376,15 +386,151 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms msgid "Initiating shutdown as requested by client.\n" msgstr "Iniciando apagado bajo petición del cliente.\n" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" msgstr "" +"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " +"de banda predeterminado %llu\n" -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#, fuzzy +msgid "solver to use" +msgstr "valor a establecer" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" msgstr "Iniciando descarga «%s».\n" +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, fuzzy, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" +"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +# Miguel: "Inbound" lo he traducido como entrada en todo el texto. +#: src/ats/gnunet-service-ats_plugins.c:314 +#, fuzzy, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "La cuota de entrada configurada para la red «%s» es %llu\n" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, fuzzy, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "¡No se puede inicializar el resolvedor!\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Se produjo un fallo al cargar la configuración de %s\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, fuzzy, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" +"No hay configurada una cuota de salida para la red «%s», asignando el ancho " +"de banda predeterminado %llu\n" + +#: src/ats/plugin_ats_mlp.c:2679 +#, fuzzy, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" +"No hay configuración de cuota de entrada para la red '%s', asignando el " +"ancho de banda predeterminado (%llu)\n" + +# Miguel: "Outbound" lo he traducido como salida en todo el texto. +#: src/ats/plugin_ats_mlp.c:2689 +#, fuzzy, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "La cuota de salida configurada para la red «%s» es %llu\n" + +# Miguel: "Outbound" lo he traducido como salida en todo el texto. +#: src/ats/plugin_ats_mlp.c:2698 +#, fuzzy, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "La cuota de salida configurada para la red «%s» es %llu\n" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Se produjo un fallo al cargar la configuración de %s\n" + #: src/ats-tests/ats-testing.c:422 #, c-format msgid "Connected master [%u] with slave [%u]\n" @@ -395,6 +541,15 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Fallo al conectar a gnunetd.\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "" + +#: src/ats-tests/ats-testing-log.c:892 +#, fuzzy, c-format +msgid "Start logging `%s'\n" +msgstr "Iniciando descarga «%s».\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -402,16 +557,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -#, fuzzy -msgid "solver to use" -msgstr "valor a establecer" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - # Miguel: ¿Como podría traducir "resolutions" y "resolve"? # Son difíciles de no calcar, puesto que no conozco como expresar # el concepto de obtener una dirección a partir de un nombre @@ -546,141 +691,6 @@ msgstr "salida prolija (incluye las propiedades de direcciones del ATS)" msgid "Print information about ATS state" msgstr "Imprime información acerca del estado del ATS" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "Iniciando descarga «%s».\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, fuzzy, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" -"No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -# Miguel: "Inbound" lo he traducido como entrada en todo el texto. -#: src/ats/gnunet-service-ats_plugins.c:314 -#, fuzzy, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "La cuota de entrada configurada para la red «%s» es %llu\n" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, fuzzy, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "¡No se puede inicializar el resolvedor!\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Se produjo un fallo al cargar la configuración de %s\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, fuzzy, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" -"No hay configurada una cuota de salida para la red «%s», asignando el ancho " -"de banda predeterminado %llu\n" - -#: src/ats/plugin_ats_mlp.c:2679 -#, fuzzy, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" -"No hay configuración de cuota de entrada para la red '%s', asignando el " -"ancho de banda predeterminado (%llu)\n" - -# Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2689 -#, fuzzy, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "La cuota de salida configurada para la red «%s» es %llu\n" - -# Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2698 -#, fuzzy, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "La cuota de salida configurada para la red «%s» es %llu\n" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Se produjo un fallo al cargar la configuración de %s\n" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -832,28 +842,6 @@ msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" "El cliente se desconectó del servicio principal, tratando de reconectar.\n" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - #: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" @@ -1104,16 +1092,38 @@ msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n" msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 -msgid "sets the LINE to use for the phone" +#: src/conversation/gnunet-conversation.c:1300 +msgid "sets the LINE to use for the phone" +msgstr "" + +#: src/conversation/gnunet-conversation.c:1329 +msgid "Enables having a conversation with other GNUnet users." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." msgstr "" -#: src/conversation/gnunet-conversation.c:1329 -msgid "Enables having a conversation with other GNUnet users." +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1655,15 +1665,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "Herramienta de acceso GNUnet GNS" -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, c-format msgid "Failed to connect to GNS\n" msgstr "Se produjo un fallo al conectar con GNS\n" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, c-format msgid "Failed to connect to namestore\n" @@ -2200,6 +2210,55 @@ msgstr "ser prolijo (imprime información de progreso)" msgid "Prints all packets that go through the DHT." msgstr "Imprime todos los paquetes que pasan por la DHT." +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "El número máximo de conexiones es %u\n" + +#: src/dht/gnunet_dht_profiler.c:949 +msgid "number of peers to start" +msgstr "número de pares para empezar" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" +"nombre del fichero con la información de acceso usada para la batería de " +"pruebas" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Medir la calidad y rendimiento del servicio NSE." + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n" @@ -2454,55 +2513,6 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento" msgid "# DHT requests combined" msgstr "# Peticiones a la DHT combinadas" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "El número máximo de conexiones es %u\n" - -#: src/dht/gnunet_dht_profiler.c:949 -msgid "number of peers to start" -msgstr "número de pares para empezar" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" -"nombre del fichero con la información de acceso usada para la batería de " -"pruebas" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Medir la calidad y rendimiento del servicio NSE." - #: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" @@ -3520,6 +3530,14 @@ msgstr "" "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/" "chk/...)" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "imprimir una lista de todos los ficheros indexados" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" +msgstr "Operaciones especiales de compartición de ficheros" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "ejecuta el experimento con «COUNT» pares" @@ -3540,14 +3558,6 @@ msgstr "" "ejecuta una batería de pruebas para medir el rendimiento de la compartición " "de ficheros" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "imprimir una lista de todos los ficheros indexados" - -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" -msgstr "Operaciones especiales de compartición de ficheros" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -4239,6 +4249,28 @@ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "Buscar el registro para el nombre dado" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "Especificar el tipo del registro a buscar" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "Sin salida innecesaria" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Herramienta de acceso GNUnet GNS" + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -4258,7 +4290,7 @@ msgstr "Fallo al conectar a gnunetd.\n" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -4273,125 +4305,103 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "%s falló en %s:%d: «%s».\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "¡No se puede inicializar el resolvedor!\n" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Tipo no soportado «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "No se pudo importar la clave privada del fichero «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2394 -#, c-format -msgid "Unable to import certificate %s\n" +#: src/gns/gnunet-gns-proxy.c:2570 +#, fuzzy, c-format +msgid "Unable to import certificate from `%s'\n" msgstr "No se pudo importar el certificado %s\n" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "escuchar en el puerto especificado (predeterminado: 7777)" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "fichero pem para usar como autoridad de certificación (CA)" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "Proxy GNUnet GNS" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "Buscar el registro para el nombre dado" - -#: src/gns/gnunet-gns.c:238 -msgid "Specify the type of the record to lookup" -msgstr "Especificar el tipo del registro a buscar" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "Sin salida innecesaria" - -#: src/gns/gnunet-gns.c:258 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Herramienta de acceso GNUnet GNS" - #: src/gns/gnunet-service-gns.c:513 #, fuzzy msgid "Properly base32-encoded public key required" @@ -4403,8 +4413,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 msgid "Could not connect to DHT!\n" msgstr "¡No se pudo conectar a la DHT!\n" @@ -4945,79 +4955,14 @@ msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" #: src/hostlist/gnunet-daemon-hostlist_server.c:789 #, fuzzy, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" -msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "" -"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n" - -#: src/identity-provider/gnunet-idp.c:424 -#, fuzzy -msgid "Ego is required\n" -msgstr "Las opción «%s» o «%s» es necesaria.\n" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -#, fuzzy -msgid "Requesting party key is required!\n" -msgstr "el parámetro --section es necesario\n" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "El almacén de nombres no pudo añadir el registro\n" +msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -#, fuzzy -msgid "Identity Provider REST API initialized\n" -msgstr "Conexión fallida\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, c-format +msgid "Could not start hostlist HTTP server on port %u\n" +msgstr "" +"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n" #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format @@ -5118,6 +5063,71 @@ msgstr "Se produjo un fallo al leer el directorio «%s»\n" msgid "Identity REST API initialized\n" msgstr "Conexión fallida\n" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Las opción «%s» o «%s» es necesaria.\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "el parámetro --section es necesario\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "El almacén de nombres no pudo añadir el registro\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr "Conexión fallida\n" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -5220,67 +5230,6 @@ msgstr "Se produjo un fallo al crear los índices\n" msgid "flat plugin running\n" msgstr "Base de datos sqlite ejecutándose\n" -# form?? -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Forma de valor no soportada «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "Encontrado nombre «%s» para la clave dada\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "Encontrados %u registros para el dominio «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Se produjo un fallo al crear la página para «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "El nombre de dominio no puede contener «.»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "El nombre de dominio no puede contener «+»\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -msgid "Failed to start HTTP server\n" -msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Se produjo un fallo al conectar con GNS\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -#, fuzzy -msgid "GNU Name System First Come First Serve name registration service" -msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse" - #: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" @@ -5454,6 +5403,67 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "nombre de la sección a la que acceder" +# form?? +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Forma de valor no soportada «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "Encontrado nombre «%s» para la clave dada\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "Encontrados %u registros para el dominio «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Se produjo un fallo al crear la página para «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "El nombre de dominio no puede contener «.»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "El nombre de dominio no puede contener «+»\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +msgid "Failed to start HTTP server\n" +msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Se produjo un fallo al conectar con GNS\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#, fuzzy +msgid "GNU Name System First Come First Serve name registration service" +msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse" + #: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5783,6 +5793,11 @@ msgstr "comando «external-ip» no encontrado\n" msgid "`upnpc' command not found\n" msgstr "comando «upnpc» no encontrado\n" +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# Estimaciones del tamaño de red recibidas" + #: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas" @@ -5808,15 +5823,69 @@ msgstr "retraso entre rondas" msgid "Measure quality and performance of the NSE service." msgstr "Medir la calidad y rendimiento del servicio NSE." -#: src/nse/gnunet-nse.c:122 -#, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# Estimaciones del tamaño de red recibidas" +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Eliminando dirección de transporte «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "# pares conocidos" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. " +"Eliminado.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Escaneando directorio «%s».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "¡Aún no se han encontrado pares en «%s»!\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Escaneando directorio «%s».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "Importando HELLO de «%s»\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" +# Miguel: "Failed to receive" también aquí está traducido como +# "no se obtuvo respuesta" por claridad. +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." msgstr "" +"No se obtuvo respuesta del servicio de información de pares (PEERINFO)." #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5907,65 +5976,6 @@ msgstr "Cargando el módulo de transporte «%s»\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Eliminando dirección de transporte «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "# pares conocidos" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. " -"Eliminado.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Escaneando directorio «%s».\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "¡Aún no se han encontrado pares en «%s»!\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Escaneando directorio «%s».\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "Importando HELLO de «%s»\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -# Miguel: "Failed to receive" también aquí está traducido como -# "no se obtuvo respuesta" por claridad. -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" -"No se obtuvo respuesta del servicio de información de pares (PEERINFO)." - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6491,10 +6501,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #, fuzzy msgid "Connect to CADET failed\n" msgstr "Conexión fallida (¿bug?)\n" @@ -6956,6 +6966,16 @@ msgstr "Petición ignorada porque el ARM se está apagando.\n" msgid "%.s Unknown result code." msgstr "Código de respuesta del ARM desconocido.\n" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n" + #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo" @@ -6967,16 +6987,6 @@ msgid "" "signal is received" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n" - #: src/testbed/testbed_api.c:410 #, c-format msgid "Adding host %u failed with error: %s\n" @@ -7297,6 +7307,10 @@ msgstr "# mensajes «HELLO» recibidos" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "# mensajes omitidos debido a un cliente lento" @@ -7345,10 +7359,6 @@ msgstr "" "El servicio de transporte carece de opciones de configuración de clave. " "Saliendo.\n" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "# refrescos de mi «HELLO»" @@ -7690,45 +7700,6 @@ msgstr "# revalidaciones de direcciones iniciadas" msgid "# HELLOs given to peerinfo" msgstr "# «HELLO» obtenidos de «peerinfo»" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# respuestas recibidas de otros pares" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Otras configuraciones" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "número de mensajes a usar por iteración" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "tamaño del mensaje" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "identidad del par" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -msgid "Direct access to transport service." -msgstr "Acceso directo al servicio de transporte." - #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7872,6 +7843,11 @@ msgstr "" msgid "do not resolve hostnames" msgstr "no resolver nombres de máquinas" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "identidad del par" + #: src/transport/gnunet-transport.c:1466 #, fuzzy msgid "monitor plugin sessions" @@ -7881,11 +7857,47 @@ msgstr "# sesiones wlan pendientes" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "enviar data para prueba a otro par (hasta CTRL-C)" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +msgid "Direct access to transport service." +msgstr "Acceso directo al servicio de transporte." + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# respuestas recibidas de otros pares" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Otras configuraciones" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "número de mensajes a usar por iteración" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "tamaño del mensaje" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7965,6 +7977,7 @@ msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" @@ -8072,6 +8085,8 @@ msgstr "# bytes omitidos por SMTP (salientes)" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Longitud de dirección inesperada: %u bytes\n" @@ -8080,6 +8095,9 @@ msgstr "Longitud de dirección inesperada: %u bytes\n" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# Sesiones TCP activas" @@ -8089,65 +8107,86 @@ msgstr "# Sesiones TCP activas" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "# bytes actualmente en los buffer TCP" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "# bytes descartados por TCP (desconectado)" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "# bytes omitidos por TCP (expirados)" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "# bytes recibidos vía TCP" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "# peticiones de desconexión del servicio de transporte por TCP" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "# Mensajes «WELCOME» TCP recibidos" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# bytes recibidos vía TCP" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# conexiones «stream» activas" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# Pares conectados" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "# eventos de desconexión TCP a nivel de red" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "Se produjo un fallo al iniciar el servicio.\n" @@ -8165,6 +8204,23 @@ msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "El transporte TCP anuncia que está en el puerto %llu\n" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" +"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el " +"«socket» en el puerto %d\n" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -8191,6 +8247,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 #, fuzzy msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" @@ -8201,15 +8258,19 @@ msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "«%s» no es una dirección IP válida.\n" #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "«%s» no es una dirección IP válida.\n" @@ -8219,23 +8280,6 @@ msgstr "«%s» no es una dirección IP válida.\n" msgid "Failed to create UDP network sockets\n" msgstr "Se produjo un fallo al crear una nueva firma" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" -"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el " -"«socket» en el puerto %d\n" - #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8321,6 +8365,61 @@ msgstr "" msgid "# sessions allocated" msgstr "# sesiones WLAN alojadas" +#: src/transport/plugin_transport_xt.c:4010 +#, fuzzy, c-format +msgid "XT transport listening on port %llu\n" +msgstr "Transporte TCP escuchando en el puerto %llu\n" + +#: src/transport/plugin_transport_xt.c:4014 +#, fuzzy +msgid "XT transport not listening on any port (client only)\n" +msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" + +#: src/transport/plugin_transport_xt.c:4018 +#, fuzzy, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "El transporte TCP anuncia que está en el puerto %llu\n" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "# Sesiones TCP activas" + +#: src/transport/plugin_transport_xu.c:1237 +#, fuzzy, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" +"UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " +"compruebe su configuración de red\n" + +#: src/transport/plugin_transport_xu.c:1251 +#, fuzzy +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" +"UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su " +"configuración de red y deshabilite IPv6 si su conexión carece de una " +"dirección IPv6 global\n" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "Se produjo un fallo al crear una nueva firma" + #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -9444,8 +9543,8 @@ msgstr "el servicio es ofrecido vía UDP" msgid "Setup tunnels via VPN." msgstr "Configurar túneles vía VPN." -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 msgid "Failed to connect to the namestore!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" diff --git a/po/fr.po b/po/fr.po index 9789dc3141..a18337c11e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2015-12-24 01:20+0100\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -221,6 +221,7 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -231,6 +232,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -239,6 +243,7 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -246,6 +251,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, c-format @@ -253,6 +259,7 @@ msgid "Using `%s' instead\n" msgstr "" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -261,6 +268,7 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -269,6 +277,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, c-format msgid "Failed to resolve `%s': %s\n" @@ -277,6 +286,7 @@ msgstr "Résolution de « %s » échouée : %s\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -348,14 +358,131 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" -msgstr "Arrêter la journalisation\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats/gnunet-ats-solver-eval.c:2799 #, c-format -msgid "Start logging `%s'\n" -msgstr "Démarrer la journalisation « %s »\n" +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +msgid "solver to use" +msgstr "solveur utilisé" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +msgid "print logging" +msgstr "afficher le journal" + +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1913 +#, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "fornat invalide : « %s »\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "fornat invalide : « %s »\n" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -367,6 +494,15 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "Arrêter la journalisation\n" + +#: src/ats-tests/ats-testing-log.c:892 +#, c-format +msgid "Start logging `%s'\n" +msgstr "Démarrer la journalisation « %s »\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -374,15 +510,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -msgid "solver to use" -msgstr "solveur utilisé" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -498,123 +625,6 @@ msgstr "" msgid "Print information about ATS state" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -msgid "print logging" -msgstr "afficher le journal" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1913 -#, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "fornat invalide : « %s »\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "fornat invalide : « %s »\n" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -744,35 +754,13 @@ msgstr "" msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 -msgid "be more verbose (print received values)" -msgstr "" - -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 -msgid "Connection to conversation service lost, trying to reconnect\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." +#: src/consensus/gnunet-consensus-profiler.c:564 +msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." +#: src/conversation/conversation_api.c:515 +#: src/conversation/conversation_api_call.c:494 +msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" #: src/conversation/gnunet-conversation.c:270 @@ -1028,8 +1016,30 @@ msgstr "" msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1533,15 +1543,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "" -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, c-format msgid "Failed to connect to GNS\n" msgstr "" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, c-format msgid "Failed to connect to namestore\n" @@ -2045,6 +2055,53 @@ msgstr "" msgid "Prints all packets that go through the DHT." msgstr "" +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "nombre de valeurs" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +msgid "Measure quality and performance of the DHT service." +msgstr "" + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" @@ -2282,53 +2339,6 @@ msgstr "" msgid "# DHT requests combined" msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:949 -#, fuzzy -msgid "number of peers to start" -msgstr "nombre de valeurs" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -msgid "Measure quality and performance of the DHT service." -msgstr "" - #: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" @@ -3257,6 +3267,14 @@ msgid "" "chk/...)" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" +msgstr "" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3273,14 +3291,6 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" -msgstr "" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3922,6 +3932,27 @@ msgstr "" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +msgid "GNUnet GNS resolver tool" +msgstr "" + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -3941,7 +3972,7 @@ msgstr "" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -3956,123 +3987,102 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, c-format msgid "Failed to initialize DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, c-format msgid "Failed to parse DANE record: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2394 +#: src/gns/gnunet-gns-proxy.c:2570 #, c-format -msgid "Unable to import certificate %s\n" +msgid "Unable to import certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 msgid "Failed to pass client to MHD\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, c-format msgid "Unsupported socks command %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:238 -msgid "Specify the type of the record to lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:258 -msgid "GNUnet GNS resolver tool" -msgstr "" - #: src/gns/gnunet-service-gns.c:513 msgid "Properly base32-encoded public key required" msgstr "" @@ -4082,8 +4092,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "" #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 msgid "Could not connect to DHT!\n" msgstr "" @@ -4557,94 +4567,32 @@ msgstr "" msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 -#, c-format -msgid "Address to obtain hostlist: `%s'\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 -msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 -msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 -#, c-format -msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 -#, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" -msgstr "" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:424 -msgid "Ego is required\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -msgid "Requesting party key is required!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" +#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#, c-format +msgid "Address to obtain hostlist: `%s'\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" +#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" +#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" +#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#, c-format +msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "Échec du démarrage de %s\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#, c-format +msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +msgstr "" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -msgid "Identity Provider REST API initialized\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, c-format +msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" #: src/identity/gnunet-identity.c:179 @@ -4738,6 +4686,68 @@ msgstr "" msgid "Identity REST API initialized\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +msgid "Ego is required\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +msgid "Requesting party key is required!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Échec du démarrage de %s\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +msgid "Identity Provider REST API initialized\n" +msgstr "" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4835,64 +4845,6 @@ msgstr "Résolution de « %s » échouée\n" msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, c-format -msgid "Unsupported form value `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, c-format -msgid "Failed to create page for `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -msgid "Failed to start HTTP server\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -msgid "Failed to connect to identity\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -msgid "GNU Name System First Come First Serve name registration service" -msgstr "" - #: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" @@ -5060,6 +5012,64 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "" +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, c-format +msgid "Unsupported form value `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, c-format +msgid "Failed to create page for `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +msgid "Failed to start HTTP server\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +msgid "Failed to connect to identity\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + #: src/namestore/gnunet-service-namestore.c:750 #, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5362,37 +5372,91 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:849 -msgid "limit to the number of connections to NSE services, 0 for none" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:849 +msgid "limit to the number of connections to NSE services, 0 for none" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:854 +msgid "name of the file for writing connection information and statistics" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:866 +msgid "name of the file for writing the main results" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:873 +msgid "Number of peers to run in each round, separated by commas" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:893 +msgid "Measure quality and performance of the NSE service." +msgstr "" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 -msgid "name of the file for writing connection information and statistics" +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 -msgid "name of the file for writing the main results" +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, c-format +msgid "Scanning directory `%s'\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 -msgid "Number of peers to run in each round, separated by commas" +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 -msgid "delay between rounds" +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, c-format +msgid "Cleaning up directory `%s'\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 -msgid "Measure quality and performance of the NSE service." +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." msgstr "" #: src/peerinfo-tool/gnunet-peerinfo.c:239 @@ -5484,60 +5548,6 @@ msgstr "" msgid "Failed to load transport plugin for `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, c-format -msgid "Scanning directory `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6022,10 +6032,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 msgid "Connect to CADET failed\n" msgstr "" @@ -6471,6 +6481,15 @@ msgstr "" msgid "%.s Unknown result code." msgstr "%.s Code d'erreur inconnu" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +msgid "Waiting for child to exit.\n" +msgstr "" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, c-format +msgid "Spawning process `%s'\n" +msgstr "" + #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6482,15 +6501,6 @@ msgid "" "signal is received" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -msgid "Waiting for child to exit.\n" -msgstr "" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, c-format -msgid "Spawning process `%s'\n" -msgstr "" - #: src/testbed/testbed_api.c:410 #, c-format msgid "Adding host %u failed with error: %s\n" @@ -6778,6 +6788,10 @@ msgstr "" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -6822,10 +6836,6 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" @@ -7131,42 +7141,6 @@ msgstr "" msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -msgid "receive data from peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "nombre de valeurs" - -#: src/transport/gnunet-transport-profiler.c:636 -msgid "message size to use" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -msgid "Direct access to transport service." -msgstr "" - #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7295,6 +7269,11 @@ msgstr "" msgid "do not resolve hostnames" msgstr "" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "" + #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7303,11 +7282,44 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +msgid "Direct access to transport service." +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +msgid "receive data from peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "nombre de valeurs" + +#: src/transport/gnunet-transport-profiler.c:636 +msgid "message size to use" +msgstr "" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7377,6 +7389,7 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7476,6 +7489,8 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7484,6 +7499,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "# Session TCP active" @@ -7493,64 +7511,85 @@ msgstr "# Session TCP active" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# Session TCP active" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 msgid "# TCP server connect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 msgid "Failed to start service.\n" msgstr "" @@ -7568,6 +7607,20 @@ msgstr "" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +msgid "# Multicast HELLO beacons received via UDP" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -7588,6 +7641,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7597,15 +7651,19 @@ msgstr "" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "adresse invalide" #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "adresse invalide" @@ -7614,20 +7672,6 @@ msgstr "adresse invalide" msgid "Failed to create UDP network sockets\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -msgid "# Multicast HELLO beacons received via UDP" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - #: src/transport/plugin_transport_unix.c:1403 #, c-format msgid "Cannot create path to `%s'\n" @@ -7700,6 +7744,54 @@ msgstr "" msgid "# sessions allocated" msgstr "# Session TCP active" +#: src/transport/plugin_transport_xt.c:4010 +#, c-format +msgid "XT transport listening on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4014 +msgid "XT transport not listening on any port (client only)\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4018 +#, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "# Session TCP active" + +#: src/transport/plugin_transport_xu.c:1237 +#, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:1251 +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "Résolution de « %s » échouée : %s\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "Résolution de « %s » échouée : %s\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "Résolution de « %s » échouée : %s\n" + #: src/transport/tcp_connection_legacy.c:452 #, c-format msgid "Access denied to `%s'\n" @@ -8762,8 +8854,8 @@ msgstr "" msgid "Setup tunnels via VPN." msgstr "Configurer des tunnels via VPN." -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 msgid "Failed to connect to the namestore!\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index e7f91eb35a..d6f9dfe28f 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0b\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -227,6 +227,7 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -237,6 +238,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -245,6 +249,7 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -252,6 +257,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format @@ -259,6 +265,7 @@ msgid "Using `%s' instead\n" msgstr "%s: flagga \"%s\" är tvetydig\n" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -267,6 +274,7 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -275,6 +283,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -283,6 +292,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -355,15 +365,133 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +msgid "solver to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" msgstr "Startade samling \"%s\".\n" +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "Kunde inte initiera SQLite.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Kunde inte spara konfigurationsfil \"%s\":" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Kunde inte spara konfigurationsfil \"%s\":" + #: src/ats-tests/ats-testing.c:422 #, c-format msgid "Connected master [%u] with slave [%u]\n" @@ -374,6 +502,15 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Misslyckades att ansluta till gnunetd.\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "" + +#: src/ats-tests/ats-testing-log.c:892 +#, fuzzy, c-format +msgid "Start logging `%s'\n" +msgstr "Startade samling \"%s\".\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -381,15 +518,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -msgid "solver to use" -msgstr "" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -511,124 +639,6 @@ msgstr "" msgid "Print information about ATS state" msgstr "Skriv ut information om GNUnets motparter." -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "Startade samling \"%s\".\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "Kunde inte initiera SQLite.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Kunde inte spara konfigurationsfil \"%s\":" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Kunde inte spara konfigurationsfil \"%s\":" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -773,30 +783,8 @@ msgid "be more verbose (print received values)" msgstr "" #: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 -msgid "Connection to conversation service lost, trying to reconnect\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." +#: src/conversation/conversation_api_call.c:494 +msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" #: src/conversation/gnunet-conversation.c:270 @@ -1056,8 +1044,30 @@ msgstr "" msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1611,15 +1621,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "Spåra GNUnets nätverkstopologi." -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Misslyckades att ansluta till gnunetd.\n" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, fuzzy, c-format msgid "Failed to connect to namestore\n" @@ -2144,6 +2154,54 @@ msgstr "" msgid "Prints all packets that go through the DHT." msgstr "" +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "Maximalt antal chattklienter uppnått.\n" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "antal iterationer" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Kan inte tillgå tjänsten" + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" @@ -2406,54 +2464,6 @@ msgstr "" msgid "# DHT requests combined" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "Maximalt antal chattklienter uppnått.\n" - -#: src/dht/gnunet_dht_profiler.c:949 -#, fuzzy -msgid "number of peers to start" -msgstr "antal iterationer" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Kan inte tillgå tjänsten" - #: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" @@ -3435,6 +3445,15 @@ msgid "" "chk/...)" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Visa alla alternativ" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3451,15 +3470,6 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Visa alla alternativ" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -4142,6 +4152,29 @@ msgstr "" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "ange prioritet för innehållet" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Spåra GNUnets nätverkstopologi." + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -4161,7 +4194,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -4176,126 +4209,103 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Kunde inte skapa användarkonto:" -#: src/gns/gnunet-gns-proxy.c:2394 +#: src/gns/gnunet-gns-proxy.c:2570 #, fuzzy, c-format -msgid "Unable to import certificate %s\n" +msgid "Unable to import certificate from `%s'\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:238 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "ange prioritet för innehållet" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:258 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Spåra GNUnets nätverkstopologi." - #: src/gns/gnunet-service-gns.c:513 #, fuzzy msgid "Properly base32-encoded public key required" @@ -4307,8 +4317,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Kunde inte ansluta till gnunetd.\n" @@ -4814,80 +4824,15 @@ msgstr "\"%s\" är inte tillgänglig." msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 -#, fuzzy, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" -msgstr "\"%s\" är inte tillgänglig." - -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:424 -#, fuzzy -msgid "Ego is required\n" -msgstr "%s: flagga \"%s\" är tvetydig\n" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -#, fuzzy -msgid "Requesting party key is required!\n" -msgstr "%s: flagga \"%s\" är tvetydig\n" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "Misslyckades att starta samling.\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#, fuzzy, c-format +msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +msgstr "\"%s\" är inte tillgänglig." -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -#, fuzzy -msgid "Identity Provider REST API initialized\n" -msgstr " Anslutning misslyckades\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, c-format +msgid "Could not start hostlist HTTP server on port %u\n" +msgstr "" #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format @@ -4981,6 +4926,71 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n" msgid "Identity REST API initialized\n" msgstr " Anslutning misslyckades\n" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "%s: flagga \"%s\" är tvetydig\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "%s: flagga \"%s\" är tvetydig\n" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Misslyckades att starta samling.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr " Anslutning misslyckades\n" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -5081,66 +5091,6 @@ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Misslyckades att starta samling.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Misslyckades att ansluta till gnunetd.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -msgid "GNU Name System First Come First Serve name registration service" -msgstr "" - #: src/namestore/gnunet-namestore.c:313 #, fuzzy, c-format msgid "Adding record failed: %s\n" @@ -5318,6 +5268,66 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "Visa värde av alternativet" +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Misslyckades att starta samling.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + #: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5636,6 +5646,11 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# byte mottogs via TCP" + #: src/nse/gnunet-nse-profiler.c:849 #, fuzzy msgid "limit to the number of connections to NSE services, 0 for none" @@ -5653,24 +5668,74 @@ msgstr "" msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 -msgid "delay between rounds" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:893 +#, fuzzy +msgid "Measure quality and performance of the NSE service." +msgstr "Kan inte tillgå tjänsten" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +msgid "Value is too large.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Tillgängliga transport(er): %s\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Misslyckades att läsa kompislista från \"%s\"\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 -#, fuzzy -msgid "Measure quality and performance of the NSE service." -msgstr "Kan inte tillgå tjänsten" +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" +msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/peerinfo/peerinfo_api.c:220 #, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# byte mottogs via TCP" - -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 -msgid "Value is too large.\n" -msgstr "" +msgid "Failed to receive response from `PEERINFO' service." +msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5762,61 +5827,6 @@ msgstr "Testar transport(er) %s\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Tillgängliga transport(er): %s\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Misslyckades att läsa kompislista från \"%s\"\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -#, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6340,10 +6350,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Anslutning misslyckades (fel?)\n" @@ -6800,6 +6810,16 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Startade samling \"%s\".\n" + #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6811,16 +6831,6 @@ msgid "" "signal is received" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Startade samling \"%s\".\n" - #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -7117,6 +7127,10 @@ msgstr "# krypterade PONG-meddelanden mottagna" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -7165,10 +7179,6 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" @@ -7505,46 +7515,6 @@ msgstr "" msgid "# HELLOs given to peerinfo" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "# byte mottagna av typen %d" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Visa alla alternativ" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "antal meddelanden att använda per iteration" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "meddelandestorlek" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -#, fuzzy -msgid "Direct access to transport service." -msgstr "Misslyckades att ansluta till gnunetd.\n" - #: src/transport/gnunet-transport.c:413 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7684,6 +7654,11 @@ msgstr "Skriv ut information om GNUnets motparter." msgid "do not resolve hostnames" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "" + #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7692,11 +7667,48 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +#, fuzzy +msgid "Direct access to transport service." +msgstr "Misslyckades att ansluta till gnunetd.\n" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "# byte mottagna av typen %d" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Visa alla alternativ" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "antal meddelanden att använda per iteration" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "meddelandestorlek" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7768,6 +7780,7 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7879,6 +7892,8 @@ msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7887,6 +7902,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 #, fuzzy msgid "# TCP sessions active" msgstr "# sessionsnycklar accepterade" @@ -7897,70 +7915,91 @@ msgstr "# sessionsnycklar accepterade" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# byte skickades via TCP" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# byte kastade via TCP (utgående)" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# byte skickade av typen %d" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# krypterade PONG-meddelanden mottagna" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# byte mottogs via TCP" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "Nätverksanslutning" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# av anslutna parter" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "Misslyckades att starta samling.\n" @@ -7979,6 +8018,21 @@ msgstr "" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# krypterade PONG-meddelanden mottagna" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -7999,6 +8053,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -8009,15 +8064,19 @@ msgstr "Misslyckades att binda till UDP6-port %d.\n" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "\"%s\" är inte tillgänglig." #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "\"%s\" är inte tillgänglig." @@ -8027,21 +8086,6 @@ msgstr "\"%s\" är inte tillgänglig." msgid "Failed to create UDP network sockets\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# krypterade PONG-meddelanden mottagna" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8124,6 +8168,54 @@ msgstr "" msgid "# sessions allocated" msgstr "# sessionsnycklar accepterade" +#: src/transport/plugin_transport_xt.c:4010 +#, c-format +msgid "XT transport listening on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4014 +msgid "XT transport not listening on any port (client only)\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4018 +#, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "# sessionsnycklar accepterade" + +#: src/transport/plugin_transport_xu.c:1237 +#, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:1251 +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "Misslyckades att binda till UDP6-port %d.\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "Misslyckades att binda till UDP6-port %d.\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" + #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -9216,8 +9308,8 @@ msgstr "# byte mottagna via UDP" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" diff --git a/po/vi.po b/po/vi.po index 8dc1904395..7303a51765 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.8.0a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -234,6 +234,7 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -244,6 +245,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -252,6 +256,7 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -259,6 +264,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format @@ -266,6 +272,7 @@ msgid "Using `%s' instead\n" msgstr "%s: tùy chọn « %s » là mơ hồ\n" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -274,6 +281,7 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -282,6 +290,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -290,6 +299,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -362,15 +372,132 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +msgid "solver to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 #, fuzzy -msgid "Stop logging\n" +msgid "print logging" msgstr "Theo dõi" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 #, fuzzy, c-format -msgid "Start logging `%s'\n" -msgstr "Đang bắt đầu tài về « %s »\n" +msgid "Failed to initialize solver `%s'!\n" +msgstr "Không thể sơ khởi SQLite: %s.\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, fuzzy, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" + +#: src/ats/plugin_ats_mlp.c:1913 +#, fuzzy, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "Không thể lưu tập tin cấu hình « %s »:" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "Không thể lưu tập tin cấu hình « %s »:" #: src/ats-tests/ats-testing.c:422 #, c-format @@ -382,6 +509,16 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Lỗi kết nối đến gnunetd.\n" +#: src/ats-tests/ats-testing-log.c:837 +#, fuzzy +msgid "Stop logging\n" +msgstr "Theo dõi" + +#: src/ats-tests/ats-testing-log.c:892 +#, fuzzy, c-format +msgid "Start logging `%s'\n" +msgstr "Đang bắt đầu tài về « %s »\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -389,15 +526,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -msgid "solver to use" -msgstr "" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -520,124 +648,6 @@ msgstr "" msgid "Print information about ATS state" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "Theo dõi" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "Không thể sơ khởi SQLite: %s.\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, fuzzy, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" - -#: src/ats/plugin_ats_mlp.c:1913 -#, fuzzy, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "Không thể lưu tập tin cấu hình « %s »:" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "Không thể lưu tập tin cấu hình « %s »:" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -786,28 +796,6 @@ msgstr "" msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." -msgstr "" - #: src/conversation/gnunet-conversation.c:270 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" @@ -1057,16 +1045,38 @@ msgstr "Lỗi bắt đầu thu thập.\n" msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 -msgid "sets the LINE to use for the phone" +#: src/conversation/gnunet-conversation.c:1300 +msgid "sets the LINE to use for the phone" +msgstr "" + +#: src/conversation/gnunet-conversation.c:1329 +msgid "Enables having a conversation with other GNUnet users." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." msgstr "" -#: src/conversation/gnunet-conversation.c:1329 -msgid "Enables having a conversation with other GNUnet users." +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1620,15 +1630,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "Bản ghi lỗi GNUnet" -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Lỗi kết nối đến gnunetd.\n" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, fuzzy, c-format msgid "Failed to connect to namestore\n" @@ -2166,6 +2176,54 @@ msgstr "" msgid "Prints all packets that go through the DHT." msgstr "" +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "tăng sổ tối đa các kết nối TCP/IP" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "số lần lặp lại" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "Không thể truy cập đến dịch vụ" + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" @@ -2429,54 +2487,6 @@ msgstr "" msgid "# DHT requests combined" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "tăng sổ tối đa các kết nối TCP/IP" - -#: src/dht/gnunet_dht_profiler.c:949 -#, fuzzy -msgid "number of peers to start" -msgstr "số lần lặp lại" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "Không thể truy cập đến dịch vụ" - #: src/dht/plugin_block_dht.c:189 #, fuzzy, c-format msgid "Block not of type %u\n" @@ -3458,6 +3468,15 @@ msgid "" "chk/...)" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +#, fuzzy +msgid "Special file-sharing operations" +msgstr "Tùy chọn chia sẻ tập tin" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3474,15 +3493,6 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -#, fuzzy -msgid "Special file-sharing operations" -msgstr "Tùy chọn chia sẻ tập tin" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -4188,6 +4198,29 @@ msgstr "" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +#, fuzzy +msgid "Specify the type of the record to lookup" +msgstr "xác định mức ưu tiên của nội dung" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "Bản ghi lỗi GNUnet" + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -4207,7 +4240,7 @@ msgstr "Lỗi kết nối đến gnunetd.\n" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -4222,126 +4255,103 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Không thể tạo tài khoản người dùng:" -#: src/gns/gnunet-gns-proxy.c:2394 +#: src/gns/gnunet-gns-proxy.c:2570 #, fuzzy, c-format -msgid "Unable to import certificate %s\n" +msgid "Unable to import certificate from `%s'\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:238 -#, fuzzy -msgid "Specify the type of the record to lookup" -msgstr "xác định mức ưu tiên của nội dung" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:258 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "Bản ghi lỗi GNUnet" - #: src/gns/gnunet-service-gns.c:513 #, fuzzy msgid "Properly base32-encoded public key required" @@ -4353,8 +4363,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "Không kết nối được đến trình nền gnunetd." #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" @@ -4878,76 +4888,11 @@ msgstr "« %s » không sẵn sàng.\n" msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, fuzzy, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" - -#: src/identity-provider/gnunet-idp.c:424 -#, fuzzy -msgid "Ego is required\n" -msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -#, fuzzy -msgid "Requesting party key is required!\n" -msgstr "đặt tên hiệu cần dùng (cần thiết)" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "Lỗi bắt đầu thu thập.\n" - -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -#, fuzzy -msgid "Identity Provider REST API initialized\n" -msgstr "Lỗi sơ khởi lõi.\n" - +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, fuzzy, c-format +msgid "Could not start hostlist HTTP server on port %u\n" +msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" + #: src/identity/gnunet-identity.c:179 #, fuzzy, c-format msgid "Failed to create ego: %s\n" @@ -5040,6 +4985,71 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" msgid "Identity REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "đặt tên hiệu cần dùng (cần thiết)" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "Lỗi bắt đầu thu thập.\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#, fuzzy +msgid "Identity Provider REST API initialized\n" +msgstr "Lỗi sơ khởi lõi.\n" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -5141,66 +5151,6 @@ msgstr "Không thể tạo miền tên.\n" msgid "flat plugin running\n" msgstr "kho dữ liệu sqlite" -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "Không thể tạo miền tên.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "Lỗi bắt đầu thu thập.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "Lỗi kết nối đến gnunetd.\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -msgid "GNU Name System First Come First Serve name registration service" -msgstr "" - #: src/namestore/gnunet-namestore.c:313 #, fuzzy, c-format msgid "Adding record failed: %s\n" @@ -5371,6 +5321,66 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "" +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "Không thể tạo miền tên.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "Lỗi bắt đầu thu thập.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "Lỗi kết nối đến gnunetd.\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + #: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5686,6 +5696,11 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" +#: src/nse/gnunet-nse.c:122 +#, fuzzy +msgid "Show network size estimates from NSE service." +msgstr "# các yêu cầu get (lấy) dht được nhận" + #: src/nse/gnunet-nse-profiler.c:849 #, fuzzy msgid "limit to the number of connections to NSE services, 0 for none" @@ -5703,25 +5718,79 @@ msgstr "" msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 -msgid "delay between rounds" +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:893 +#, fuzzy +msgid "Measure quality and performance of the NSE service." +msgstr "Không thể truy cập đến dịch vụ" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#, fuzzy +msgid "Value is too large.\n" +msgstr "Giá trị không nằm trong phạm vi được phép." + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, fuzzy, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "Đã nạp truyền tải « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" +"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ " +"bỏ.\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" +msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 -#, fuzzy -msgid "Measure quality and performance of the NSE service." -msgstr "Không thể truy cập đến dịch vụ" - -#: src/nse/gnunet-nse.c:122 -#, fuzzy -msgid "Show network size estimates from NSE service." -msgstr "# các yêu cầu get (lấy) dht được nhận" - -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/peerinfo/peerinfo_api.c:220 #, fuzzy -msgid "Value is too large.\n" -msgstr "Giá trị không nằm trong phạm vi được phép." +msgid "Failed to receive response from `PEERINFO' service." +msgstr "" +"\n" +"Không nhận được đáp ứng từ gnunetd.\n" #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format @@ -5814,65 +5883,6 @@ msgstr "Đang nạp các truyền tải « %s »\n" msgid "Failed to load transport plugin for `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, fuzzy, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "Đã nạp truyền tải « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" -"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ " -"bỏ.\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -#, fuzzy -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" -"\n" -"Không nhận được đáp ứng từ gnunetd.\n" - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6395,10 +6405,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Không kết nối được (lỗi ?)\n" @@ -6853,6 +6863,16 @@ msgstr "« %s » đang tắt.\n" msgid "%.s Unknown result code." msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +#, fuzzy +msgid "Waiting for child to exit.\n" +msgstr "Đang đợi các đồng đẳng kết nối" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "Đang bắt đầu tài về « %s »\n" + #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6864,16 +6884,6 @@ msgid "" "signal is received" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -#, fuzzy -msgid "Waiting for child to exit.\n" -msgstr "Đang đợi các đồng đẳng kết nối" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "Đang bắt đầu tài về « %s »\n" - #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -7176,6 +7186,10 @@ msgstr "# các thông báo PONG đã mật mã được nhận" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 #, fuzzy msgid "# messages dropped due to slow client" @@ -7225,10 +7239,6 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" @@ -7568,46 +7578,6 @@ msgstr "" msgid "# HELLOs given to peerinfo" msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -#, fuzzy -msgid "receive data from peer" -msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n" - -#: src/transport/gnunet-transport-profiler.c:626 -#, fuzzy -msgid "iterations" -msgstr "Tùy chọn chung" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "số tin nhắn cần dùng mỗi lần lặp" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "kích cỡ tin nhắn" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -#, fuzzy -msgid "Direct access to transport service." -msgstr "Lỗi kết nối đến gnunetd.\n" - #: src/transport/gnunet-transport.c:413 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7747,6 +7717,11 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet." msgid "do not resolve hostnames" msgstr "không quyết định các tên máy" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "" + #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7755,11 +7730,48 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +#, fuzzy +msgid "Direct access to transport service." +msgstr "Lỗi kết nối đến gnunetd.\n" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +#, fuzzy +msgid "receive data from peer" +msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n" + +#: src/transport/gnunet-transport-profiler.c:626 +#, fuzzy +msgid "iterations" +msgstr "Tùy chọn chung" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "số tin nhắn cần dùng mỗi lần lặp" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "kích cỡ tin nhắn" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7830,6 +7842,7 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7933,6 +7946,8 @@ msgstr "# các byte loại đi bởi SMTP (đi ra)" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, fuzzy, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Gặp sự kiện bất thường: %d\n" @@ -7941,6 +7956,9 @@ msgstr "Gặp sự kiện bất thường: %d\n" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 #, fuzzy msgid "# TCP sessions active" msgstr "# các khoá phiên chạy được chấp nhận" @@ -7951,70 +7969,91 @@ msgstr "# các khoá phiên chạy được chấp nhận" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# các byte đã gừi qua TCP" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# các byte loại đi bởi TCP (đi ra)" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# các byte loại đi bởi TCP (đi ra)" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# các byte được gửi" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# các thông báo PONG đã mật mã được nhận" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "# các byte đã nhận qua TCP" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "# các kết nối dht" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "# của các đồng đẳng đã kết nối" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "Lỗi bắt đầu thu thập.\n" @@ -8033,6 +8072,21 @@ msgstr "" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +#, fuzzy +msgid "# Multicast HELLO beacons received via UDP" +msgstr "# các thông báo PONG đã mật mã được nhận" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -8053,6 +8107,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -8063,15 +8118,19 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "« %s » không sẵn sàng.\n" #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "« %s » không sẵn sàng.\n" @@ -8081,21 +8140,6 @@ msgstr "« %s » không sẵn sàng.\n" msgid "Failed to create UDP network sockets\n" msgstr "Không thể tạo miền tên.\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -#, fuzzy -msgid "# Multicast HELLO beacons received via UDP" -msgstr "# các thông báo PONG đã mật mã được nhận" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -8178,6 +8222,54 @@ msgstr "" msgid "# sessions allocated" msgstr "# các khoá phiên chạy được chấp nhận" +#: src/transport/plugin_transport_xt.c:4010 +#, c-format +msgid "XT transport listening on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4014 +msgid "XT transport not listening on any port (client only)\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4018 +#, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "# các khoá phiên chạy được chấp nhận" + +#: src/transport/plugin_transport_xu.c:1237 +#, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:1251 +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "Không thể tạo miền tên.\n" + #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -9271,8 +9363,8 @@ msgstr "# các byte đã nhận qua UDP" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Không kết nối được đến trình nền gnunetd." diff --git a/po/zh_CN.po b/po/zh_CN.po index c3248d9cab..cc98cc49e7 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet-0.8.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-04 23:27+0200\n" +"POT-Creation-Date: 2018-06-05 22:13+0200\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -221,6 +221,7 @@ msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" #: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 +#: src/transport/plugin_transport_xt.c:1120 #: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 #, c-format msgid "" @@ -231,6 +232,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1139 #: src/transport/plugin_transport_tcp.c:1145 #: src/transport/plugin_transport_tcp.c:3825 +#: src/transport/plugin_transport_xt.c:1139 +#: src/transport/plugin_transport_xt.c:1145 +#: src/transport/plugin_transport_xt.c:3833 #: src/transport/tcp_service_legacy.c:576 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 #: src/util/service.c:643 @@ -239,6 +243,7 @@ msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 +#: src/transport/plugin_transport_xt.c:1176 #: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 #: src/util/service.c:682 #, c-format @@ -246,6 +251,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 +#: src/transport/plugin_transport_xt.c:1180 #: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 #: src/util/service.c:687 #, fuzzy, c-format @@ -253,6 +259,7 @@ msgid "Using `%s' instead\n" msgstr "%s：选项“%s”有歧义\n" #: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 +#: src/transport/plugin_transport_xt.c:1211 #: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 #, c-format msgid "" @@ -261,6 +268,7 @@ msgid "" msgstr "" #: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 +#: src/transport/plugin_transport_xt.c:1228 #: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" @@ -269,6 +277,7 @@ msgstr "" #: src/arm/gnunet-service-arm.c:513 #: src/transport/plugin_transport_http_server.c:2684 #: src/transport/plugin_transport_tcp.c:1259 +#: src/transport/plugin_transport_xt.c:1259 #: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" @@ -277,6 +286,7 @@ msgstr "打开日志文件“%s”失败：%s\n" #: src/arm/gnunet-service-arm.c:532 #: src/transport/plugin_transport_http_server.c:2702 #: src/transport/plugin_transport_tcp.c:1278 +#: src/transport/plugin_transport_xt.c:1278 #: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" @@ -349,15 +359,133 @@ msgstr "" msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 -msgid "Stop logging\n" +#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#, c-format +msgid "" +"Could not load quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 -#, fuzzy, c-format -msgid "Start logging `%s'\n" +#: src/ats/gnunet-ats-solver-eval.c:2799 +#, c-format +msgid "" +"No outbound quota configured for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:2840 +#, c-format +msgid "" +"No outbound quota configure for network `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +msgid "solver to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 +#: src/ats-tests/gnunet-solver-eval.c:950 +msgid "experiment to use" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3306 +#, fuzzy +msgid "print logging" msgstr "未知的命令“%s”。\n" +#: src/ats/gnunet-ats-solver-eval.c:3311 +msgid "save logging to disk" +msgstr "" + +#: src/ats/gnunet-ats-solver-eval.c:3316 +msgid "disable normalization" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:304 +#, c-format +msgid "" +"Could not load %s quota for network `%s': `%s', assigning default bandwidth " +"%llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:314 +#, c-format +msgid "%s quota configured for network `%s' is %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:359 +#, c-format +msgid "" +"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" +msgstr "" + +#: src/ats/gnunet-service-ats_plugins.c:451 +#, fuzzy, c-format +msgid "Failed to initialize solver `%s'!\n" +msgstr "无法初始化 SQLite：%s。\n" + +#: src/ats/plugin_ats_mlp.c:1274 +msgid "Problem size too large, cannot allocate memory!\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1869 +#, c-format +msgid "Adding address for peer `%s' multiple times\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:1913 +#, c-format +msgid "Updating address property for peer `%s' %p not added before\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2475 +msgid "" +"MLP solver is not optimizing for anything, changing to feasibility check\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 +#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 +#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 +#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 +#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 +#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 +#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#, fuzzy, c-format +msgid "Invalid %s configuration %f \n" +msgstr "解析配置文件“%s”失败\n" + +#: src/ats/plugin_ats_mlp.c:2670 +#, c-format +msgid "" +"Adjusting inconsistent outbound quota configuration for network `%s', is " +"%llu must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2679 +#, c-format +msgid "" +"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " +"must be at least %llu\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2689 +#, c-format +msgid "" +"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_mlp.c:2698 +#, c-format +msgid "" +"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" +msgstr "" + +#: src/ats/plugin_ats_proportional.c:1164 +#, fuzzy, c-format +msgid "Invalid %s configuration %f\n" +msgstr "解析配置文件“%s”失败\n" + #: src/ats-tests/ats-testing.c:422 #, c-format msgid "Connected master [%u] with slave [%u]\n" @@ -368,6 +496,15 @@ msgstr "" msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "初始化“%s”服务失败。\n" +#: src/ats-tests/ats-testing-log.c:837 +msgid "Stop logging\n" +msgstr "" + +#: src/ats-tests/ats-testing-log.c:892 +#, fuzzy, c-format +msgid "Start logging `%s'\n" +msgstr "未知的命令“%s”。\n" + #: src/ats-tests/gnunet-ats-sim.c:90 #, c-format msgid "" @@ -375,15 +512,6 @@ msgid "" "= %u KiB/s\n" msgstr "" -#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294 -msgid "solver to use" -msgstr "" - -#: src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299 -msgid "experiment to use" -msgstr "" - #: src/ats-tool/gnunet-ats.c:307 #, c-format msgid "%u address resolutions had a timeout\n" @@ -505,124 +633,6 @@ msgstr "" msgid "Print information about ATS state" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 -#, c-format -msgid "" -"Could not load quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2799 -#, c-format -msgid "" -"No outbound quota configured for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:2840 -#, c-format -msgid "" -"No outbound quota configure for network `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3306 -#, fuzzy -msgid "print logging" -msgstr "未知的命令“%s”。\n" - -#: src/ats/gnunet-ats-solver-eval.c:3311 -msgid "save logging to disk" -msgstr "" - -#: src/ats/gnunet-ats-solver-eval.c:3316 -msgid "disable normalization" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:304 -#, c-format -msgid "" -"Could not load %s quota for network `%s': `%s', assigning default bandwidth " -"%llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:314 -#, c-format -msgid "%s quota configured for network `%s' is %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:359 -#, c-format -msgid "" -"No %s-quota configured for network `%s', assigning default bandwidth %llu\n" -msgstr "" - -#: src/ats/gnunet-service-ats_plugins.c:451 -#, fuzzy, c-format -msgid "Failed to initialize solver `%s'!\n" -msgstr "无法初始化 SQLite：%s。\n" - -#: src/ats/plugin_ats_mlp.c:1274 -msgid "Problem size too large, cannot allocate memory!\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1869 -#, c-format -msgid "Adding address for peer `%s' multiple times\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:1913 -#, c-format -msgid "Updating address property for peer `%s' %p not added before\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2475 -msgid "" -"MLP solver is not optimizing for anything, changing to feasibility check\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 -#, fuzzy, c-format -msgid "Invalid %s configuration %f \n" -msgstr "解析配置文件“%s”失败\n" - -#: src/ats/plugin_ats_mlp.c:2670 -#, c-format -msgid "" -"Adjusting inconsistent outbound quota configuration for network `%s', is " -"%llu must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2679 -#, c-format -msgid "" -"Adjusting inconsistent inbound quota configuration for network `%s', is %llu " -"must be at least %llu\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2689 -#, c-format -msgid "" -"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_mlp.c:2698 -#, c-format -msgid "" -"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" -msgstr "" - -#: src/ats/plugin_ats_proportional.c:1164 -#, fuzzy, c-format -msgid "Invalid %s configuration %f\n" -msgstr "解析配置文件“%s”失败\n" - #: src/auction/gnunet-auction-create.c:163 msgid "description of the item to be sold" msgstr "" @@ -764,30 +774,8 @@ msgid "be more verbose (print received values)" msgstr "" #: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 -msgid "Connection to conversation service lost, trying to reconnect\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:119 -#, c-format -msgid "" -"\n" -"End of transmission. Have a GNU day.\n" -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:145 -#, c-format -msgid "" -"\n" -"We are now playing your recording back. If you can hear it, your audio " -"settings are working..." -msgstr "" - -#: src/conversation/gnunet-conversation-test.c:210 -#, c-format -msgid "" -"We will now be recording you for %s. After that time, the recording will be " -"played back to you..." +#: src/conversation/conversation_api_call.c:494 +msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" #: src/conversation/gnunet-conversation.c:270 @@ -1046,8 +1034,30 @@ msgstr "" msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet-conversation-test.c:119 +#, c-format +msgid "" +"\n" +"End of transmission. Have a GNU day.\n" +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:145 +#, c-format +msgid "" +"\n" +"We are now playing your recording back. If you can hear it, your audio " +"settings are working..." +msgstr "" + +#: src/conversation/gnunet-conversation-test.c:210 +#, c-format +msgid "" +"We will now be recording you for %s. After that time, the recording will be " +"played back to you..." +msgstr "" + #: src/conversation/gnunet_gst.c:622 +#: src/conversation/gnunet-helper-audio-playback-gst.c:361 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1566,15 +1576,15 @@ msgstr "" msgid "GNUnet credential resolver tool" msgstr "GNUnet 错误日志" -#: src/credential/gnunet-service-credential.c:1138 -#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184 +#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 +#: src/gns/gnunet-gns-helper-service-w32.c:727 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "初始化“%s”服务失败。\n" #: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/gnunet-namestore.c:914 +#: src/namestore/gnunet-namestore-fcfsd.c:1084 #: src/namestore/plugin_rest_namestore.c:1035 #, fuzzy, c-format msgid "Failed to connect to namestore\n" @@ -2086,6 +2096,54 @@ msgstr "" msgid "Prints all packets that go through the DHT." msgstr "" +#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#, fuzzy, c-format +msgid "Exiting as the number of peers is %u\n" +msgstr "增加 TCP/IP 的最大连接数" + +#: src/dht/gnunet_dht_profiler.c:949 +#, fuzzy +msgid "number of peers to start" +msgstr "迭代次数" + +#: src/dht/gnunet_dht_profiler.c:954 +msgid "number of PUTs to perform per peer" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 +#: src/testbed/gnunet-testbed-profiler.c:304 +msgid "name of the file with the login information for the testbed" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:964 +msgid "delay between rounds for collecting statistics (default: 30 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:969 +msgid "delay to start doing PUTs (default: 1 sec)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:974 +msgid "delay to start doing GETs (default: 5 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:979 +msgid "replication degree for DHT PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:984 +msgid "chance that a peer is selected at random for PUTs" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:989 +msgid "timeout for DHT PUT and GET requests (default: 1 min)" +msgstr "" + +#: src/dht/gnunet_dht_profiler.c:1009 +#, fuzzy +msgid "Measure quality and performance of the DHT service." +msgstr "无法访问该服务" + #: src/dht/gnunet-dht-put.c:134 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" @@ -2323,54 +2381,6 @@ msgstr "" msgid "# DHT requests combined" msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 -#, fuzzy, c-format -msgid "Exiting as the number of peers is %u\n" -msgstr "增加 TCP/IP 的最大连接数" - -#: src/dht/gnunet_dht_profiler.c:949 -#, fuzzy -msgid "number of peers to start" -msgstr "迭代次数" - -#: src/dht/gnunet_dht_profiler.c:954 -msgid "number of PUTs to perform per peer" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 -msgid "name of the file with the login information for the testbed" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:964 -msgid "delay between rounds for collecting statistics (default: 30 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:969 -msgid "delay to start doing PUTs (default: 1 sec)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:974 -msgid "delay to start doing GETs (default: 5 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:979 -msgid "replication degree for DHT PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:984 -msgid "chance that a peer is selected at random for PUTs" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:989 -msgid "timeout for DHT PUT and GET requests (default: 1 min)" -msgstr "" - -#: src/dht/gnunet_dht_profiler.c:1009 -#, fuzzy -msgid "Measure quality and performance of the DHT service." -msgstr "无法访问该服务" - #: src/dht/plugin_block_dht.c:189 #, c-format msgid "Block not of type %u\n" @@ -3320,6 +3330,14 @@ msgid "" "chk/...)" msgstr "" +#: src/fs/gnunet-fs.c:119 +msgid "print a list of all indexed files" +msgstr "" + +#: src/fs/gnunet-fs.c:130 +msgid "Special file-sharing operations" +msgstr "" + #: src/fs/gnunet-fs-profiler.c:211 msgid "run the experiment with COUNT peers" msgstr "" @@ -3336,14 +3354,6 @@ msgstr "" msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-fs.c:119 -msgid "print a list of all indexed files" -msgstr "" - -#: src/fs/gnunet-fs.c:130 -msgid "Special file-sharing operations" -msgstr "" - #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" @@ -3994,6 +4004,28 @@ msgstr "" msgid "look for GNS2DNS records instead of ANY" msgstr "" +#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#, c-format +msgid "Invalid typename specified, assuming `ANY'\n" +msgstr "" + +#: src/gns/gnunet-gns.c:233 +msgid "Lookup a record for the given name" +msgstr "" + +#: src/gns/gnunet-gns.c:238 +msgid "Specify the type of the record to lookup" +msgstr "" + +#: src/gns/gnunet-gns.c:242 +msgid "No unneeded output" +msgstr "" + +#: src/gns/gnunet-gns.c:258 +#, fuzzy +msgid "GNUnet GNS resolver tool" +msgstr "GNUnet 错误日志" + #: src/gns/gnunet-gns-helper-service-w32.c:602 msgid "Not ready to process requests, lacking ego data\n" msgstr "" @@ -4013,7 +4045,7 @@ msgstr "初始化“%s”服务失败。\n" msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:109 +#: src/gns/gnunet-gns-proxy.c:111 #: src/hostlist/gnunet-daemon-hostlist_client.c:535 #: src/hostlist/gnunet-daemon-hostlist_client.c:753 #: src/hostlist/gnunet-daemon-hostlist_client.c:759 @@ -4028,125 +4060,103 @@ msgstr "" msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:910 +#: src/gns/gnunet-gns-proxy.c:956 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:933 +#: src/gns/gnunet-gns-proxy.c:979 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:1002 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/gns/gnunet-gns-proxy.c:969 +#: src/gns/gnunet-gns-proxy.c:1015 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:984 +#: src/gns/gnunet-gns-proxy.c:1030 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:994 +#: src/gns/gnunet-gns-proxy.c:1040 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1018 +#: src/gns/gnunet-gns-proxy.c:1064 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1132 +#: src/gns/gnunet-gns-proxy.c:1182 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1868 +#: src/gns/gnunet-gns-proxy.c:2017 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2364 +#: src/gns/gnunet-gns-proxy.c:2538 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "无法创建用户账户：" -#: src/gns/gnunet-gns-proxy.c:2394 +#: src/gns/gnunet-gns-proxy.c:2570 #, fuzzy, c-format -msgid "Unable to import certificate %s\n" +msgid "Unable to import certificate from `%s'\n" msgstr "无法保存配置文件“%s”：" -#: src/gns/gnunet-gns-proxy.c:2573 +#: src/gns/gnunet-gns-proxy.c:2769 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:2925 +#: src/gns/gnunet-gns-proxy.c:3122 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2954 +#: src/gns/gnunet-gns-proxy.c:3151 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3035 +#: src/gns/gnunet-gns-proxy.c:3232 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3316 +#: src/gns/gnunet-gns-proxy.c:3522 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:3443 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3448 +#: src/gns/gnunet-gns-proxy.c:3655 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3473 +#: src/gns/gnunet-gns-proxy.c:3681 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 -#, c-format -msgid "Invalid typename specified, assuming `ANY'\n" -msgstr "" - -#: src/gns/gnunet-gns.c:233 -msgid "Lookup a record for the given name" -msgstr "" - -#: src/gns/gnunet-gns.c:238 -msgid "Specify the type of the record to lookup" -msgstr "" - -#: src/gns/gnunet-gns.c:242 -msgid "No unneeded output" -msgstr "" - -#: src/gns/gnunet-gns.c:258 -#, fuzzy -msgid "GNUnet GNS resolver tool" -msgstr "GNUnet 错误日志" - #: src/gns/gnunet-service-gns.c:513 #, fuzzy msgid "Properly base32-encoded public key required" @@ -4158,8 +4168,8 @@ msgid "Failed to connect to the namecache!\n" msgstr "初始化“%s”服务失败。\n" #: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #: src/zonemaster/gnunet-service-zonemaster.c:875 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "无法连接到 %s:%u：%s\n" @@ -4659,78 +4669,14 @@ msgstr "“%s”不可用。\n" msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "“%s”不可用。\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 -#, fuzzy, c-format -msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" -msgstr "“%s”不可用。\n" - -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 -#, c-format -msgid "Could not start hostlist HTTP server on port %u\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:424 -#, fuzzy -msgid "Ego is required\n" -msgstr "%s：选项“%s”有歧义\n" - -#: src/identity-provider/gnunet-idp.c:432 -msgid "Attribute value missing!\n" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:440 -#, fuzzy -msgid "Requesting party key is required!\n" -msgstr "设置要使用的昵称(必须)" - -#: src/identity-provider/gnunet-idp.c:463 -msgid "Add attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:469 -msgid "Attribute value" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:474 -msgid "Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:479 -msgid "Audience (relying party)" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:483 -msgid "List attributes for Ego" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:488 -msgid "Issue a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:493 -msgid "Consume a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:498 -msgid "Revoke a ticket" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:503 -msgid "Type of attribute" -msgstr "" - -#: src/identity-provider/gnunet-idp.c:508 -msgid "Expiration interval of the attribute" -msgstr "" - -#: src/identity-provider/identity_provider_api.c:436 -#, fuzzy -msgid "failed to store record\n" -msgstr "运行 %s失败：%s %d\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#, fuzzy, c-format +msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" +msgstr "“%s”不可用。\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 -msgid "Identity Provider REST API initialized\n" +#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#, c-format +msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" #: src/identity/gnunet-identity.c:179 @@ -4824,6 +4770,70 @@ msgstr "解析配置文件“%s”失败\n" msgid "Identity REST API initialized\n" msgstr "" +#: src/identity-provider/gnunet-idp.c:424 +#, fuzzy +msgid "Ego is required\n" +msgstr "%s：选项“%s”有歧义\n" + +#: src/identity-provider/gnunet-idp.c:432 +msgid "Attribute value missing!\n" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:440 +#, fuzzy +msgid "Requesting party key is required!\n" +msgstr "设置要使用的昵称(必须)" + +#: src/identity-provider/gnunet-idp.c:463 +msgid "Add attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:469 +msgid "Attribute value" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:474 +msgid "Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:479 +msgid "Audience (relying party)" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:483 +msgid "List attributes for Ego" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:488 +msgid "Issue a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:493 +msgid "Consume a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:498 +msgid "Revoke a ticket" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:503 +msgid "Type of attribute" +msgstr "" + +#: src/identity-provider/gnunet-idp.c:508 +msgid "Expiration interval of the attribute" +msgstr "" + +#: src/identity-provider/identity_provider_api.c:436 +#, fuzzy +msgid "failed to store record\n" +msgstr "运行 %s失败：%s %d\n" + +#: src/identity-provider/plugin_rest_identity_provider.c:1230 +#: src/identity-provider/plugin_rest_openid_connect.c:2147 +msgid "Identity Provider REST API initialized\n" +msgstr "" + #: src/json/json.c:119 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" @@ -4924,66 +4934,6 @@ msgstr "发送消息失败。\n" msgid "flat plugin running\n" msgstr "sqlite 数据仓库" -#: src/namestore/gnunet-namestore-fcfsd.c:520 -#, fuzzy, c-format -msgid "Unsupported form value `%s'\n" -msgstr "未知的命令“%s”。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:547 -#, fuzzy, c-format -msgid "Failed to create record for domain `%s': %s\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:567 -msgid "Error when mapping zone to name\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:598 -#, c-format -msgid "Found existing name `%s' for the given key\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:678 -#, c-format -msgid "Found %u existing records for domain `%s'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:736 -#, fuzzy, c-format -msgid "Failed to create page for `%s'\n" -msgstr "发送消息失败。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:754 -#, fuzzy, c-format -msgid "Failed to setup post processor for `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:790 -msgid "Domain name must not contain `.'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:799 -msgid "Domain name must not contain `+'\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1019 -msgid "No ego configured for `fcfsd` subsystem\n" -msgstr "" - -#: src/namestore/gnunet-namestore-fcfsd.c:1045 -#, fuzzy -msgid "Failed to start HTTP server\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1092 -#, fuzzy -msgid "Failed to connect to identity\n" -msgstr "初始化“%s”服务失败。\n" - -#: src/namestore/gnunet-namestore-fcfsd.c:1130 -msgid "GNU Name System First Come First Serve name registration service" -msgstr "" - #: src/namestore/gnunet-namestore.c:313 #, c-format msgid "Adding record failed: %s\n" @@ -5154,6 +5104,66 @@ msgstr "" msgid "name of the ego controlling the zone" msgstr "" +#: src/namestore/gnunet-namestore-fcfsd.c:520 +#, fuzzy, c-format +msgid "Unsupported form value `%s'\n" +msgstr "未知的命令“%s”。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:547 +#, fuzzy, c-format +msgid "Failed to create record for domain `%s': %s\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:567 +msgid "Error when mapping zone to name\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:598 +#, c-format +msgid "Found existing name `%s' for the given key\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:678 +#, c-format +msgid "Found %u existing records for domain `%s'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:736 +#, fuzzy, c-format +msgid "Failed to create page for `%s'\n" +msgstr "发送消息失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:754 +#, fuzzy, c-format +msgid "Failed to setup post processor for `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:790 +msgid "Domain name must not contain `.'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:799 +msgid "Domain name must not contain `+'\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1019 +msgid "No ego configured for `fcfsd` subsystem\n" +msgstr "" + +#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#, fuzzy +msgid "Failed to start HTTP server\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#, fuzzy +msgid "Failed to connect to identity\n" +msgstr "初始化“%s”服务失败。\n" + +#: src/namestore/gnunet-namestore-fcfsd.c:1130 +msgid "GNU Name System First Come First Serve name registration service" +msgstr "" + #: src/namestore/gnunet-service-namestore.c:750 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" @@ -5465,41 +5475,95 @@ msgstr "" msgid "`upnpc' command not found\n" msgstr "" +#: src/nse/gnunet-nse.c:122 +msgid "Show network size estimates from NSE service." +msgstr "" + #: src/nse/gnunet-nse-profiler.c:849 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 -msgid "name of the file for writing connection information and statistics" +#: src/nse/gnunet-nse-profiler.c:854 +msgid "name of the file for writing connection information and statistics" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:866 +msgid "name of the file for writing the main results" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:873 +msgid "Number of peers to run in each round, separated by commas" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:884 +msgid "delay between rounds" +msgstr "" + +#: src/nse/gnunet-nse-profiler.c:893 +#, fuzzy +msgid "Measure quality and performance of the NSE service." +msgstr "无法访问该服务" + +#: src/nse/gnunet-service-nse.c:1534 +#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#, fuzzy +msgid "Value is too large.\n" +msgstr "值不在合法范围内。" + +#: src/peerinfo/gnunet-service-peerinfo.c:178 +#, c-format +msgid "Removing expired address of transport `%s'\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:313 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s': %s\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:334 +#: src/peerinfo/gnunet-service-peerinfo.c:365 +#, fuzzy, c-format +msgid "Failed to parse HELLO in file `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:449 +msgid "# peers known" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:492 +#, c-format +msgid "" +"File `%s' in directory `%s' does not match naming convention. Removed.\n" +msgstr "" + +#: src/peerinfo/gnunet-service-peerinfo.c:659 +#, fuzzy, c-format +msgid "Scanning directory `%s'\n" +msgstr "解析配置文件“%s”失败\n" + +#: src/peerinfo/gnunet-service-peerinfo.c:667 +#, c-format +msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 -msgid "name of the file for writing the main results" -msgstr "" +#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#, fuzzy, c-format +msgid "Cleaning up directory `%s'\n" +msgstr "解析配置文件“%s”失败\n" -#: src/nse/gnunet-nse-profiler.c:873 -msgid "Number of peers to run in each round, separated by commas" +#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#, c-format +msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 -msgid "delay between rounds" +#: src/peerinfo/gnunet-service-peerinfo.c:1451 +msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 -#, fuzzy -msgid "Measure quality and performance of the NSE service." -msgstr "无法访问该服务" - -#: src/nse/gnunet-nse.c:122 -msgid "Show network size estimates from NSE service." +#: src/peerinfo/peerinfo_api.c:220 +msgid "Failed to receive response from `PEERINFO' service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 -#, fuzzy -msgid "Value is too large.\n" -msgstr "值不在合法范围内。" - #: src/peerinfo-tool/gnunet-peerinfo.c:239 #, fuzzy, c-format msgid "%sPeer `%s'\n" @@ -5591,60 +5655,6 @@ msgstr "" msgid "Failed to load transport plugin for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo/gnunet-service-peerinfo.c:178 -#, c-format -msgid "Removing expired address of transport `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:313 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s': %s\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 -#, fuzzy, c-format -msgid "Failed to parse HELLO in file `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:449 -msgid "# peers known" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:492 -#, c-format -msgid "" -"File `%s' in directory `%s' does not match naming convention. Removed.\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:659 -#, fuzzy, c-format -msgid "Scanning directory `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:667 -#, c-format -msgid "Still no peers found in `%s'!\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1100 -#, fuzzy, c-format -msgid "Cleaning up directory `%s'\n" -msgstr "解析配置文件“%s”失败\n" - -#: src/peerinfo/gnunet-service-peerinfo.c:1438 -#, c-format -msgid "Importing HELLOs from `%s'\n" -msgstr "" - -#: src/peerinfo/gnunet-service-peerinfo.c:1451 -msgid "Skipping import of included HELLOs\n" -msgstr "" - -#: src/peerinfo/peerinfo_api.c:220 -msgid "Failed to receive response from `PEERINFO' service." -msgstr "" - #: src/peerstore/gnunet-peerstore.c:91 msgid "peerstore" msgstr "" @@ -6156,10 +6166,10 @@ msgstr "" msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 #, fuzzy msgid "Connect to CADET failed\n" msgstr "“%s”已连接到“%s”。\n" @@ -6614,6 +6624,15 @@ msgstr "" msgid "%.s Unknown result code." msgstr "" +#: src/testbed/gnunet_testbed_mpi_spawn.c:118 +msgid "Waiting for child to exit.\n" +msgstr "" + +#: src/testbed/gnunet_testbed_mpi_spawn.c:241 +#, fuzzy, c-format +msgid "Spawning process `%s'\n" +msgstr "卸载 GNUnet 服务" + #: src/testbed/gnunet-testbed-profiler.c:289 msgid "tolerate COUNT number of continious timeout failures" msgstr "" @@ -6625,15 +6644,6 @@ msgid "" "signal is received" msgstr "" -#: src/testbed/gnunet_testbed_mpi_spawn.c:118 -msgid "Waiting for child to exit.\n" -msgstr "" - -#: src/testbed/gnunet_testbed_mpi_spawn.c:241 -#, fuzzy, c-format -msgid "Spawning process `%s'\n" -msgstr "卸载 GNUnet 服务" - #: src/testbed/testbed_api.c:410 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" @@ -6930,6 +6940,10 @@ msgstr "" msgid "GNUnet topology control" msgstr "" +#: src/transport/gnunet-service-transport_ats.c:141 +msgid "# Addresses given to ATS" +msgstr "" + #: src/transport/gnunet-service-transport.c:448 msgid "# messages dropped due to slow client" msgstr "" @@ -6975,10 +6989,6 @@ msgstr "" msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "立即保存配置？" -#: src/transport/gnunet-service-transport_ats.c:141 -msgid "# Addresses given to ATS" -msgstr "" - #: src/transport/gnunet-service-transport_hello.c:195 msgid "# refreshed my HELLO" msgstr "" @@ -7287,44 +7297,6 @@ msgstr "" msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport-profiler.c:219 -#, c-format -msgid "%llu B in %llu ms == %.2f KB/s!\n" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:617 -msgid "send data to peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:621 -msgid "receive data from peer" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:626 -msgid "iterations" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:631 -#, fuzzy -msgid "number of messages to send" -msgstr "每次迭代所使用的消息数量" - -#: src/transport/gnunet-transport-profiler.c:636 -#, fuzzy -msgid "message size to use" -msgstr "消息尺寸" - -#: src/transport/gnunet-transport-profiler.c:641 -#: src/transport/gnunet-transport.c:1462 -msgid "peer identity" -msgstr "" - -#: src/transport/gnunet-transport-profiler.c:652 -#: src/transport/gnunet-transport.c:1482 -#, fuzzy -msgid "Direct access to transport service." -msgstr "初始化“%s”服务失败。\n" - #: src/transport/gnunet-transport.c:413 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" @@ -7461,6 +7433,11 @@ msgstr "" msgid "do not resolve hostnames" msgstr "" +#: src/transport/gnunet-transport.c:1462 +#: src/transport/gnunet-transport-profiler.c:641 +msgid "peer identity" +msgstr "" + #: src/transport/gnunet-transport.c:1466 msgid "monitor plugin sessions" msgstr "" @@ -7469,11 +7446,46 @@ msgstr "" msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" +#: src/transport/gnunet-transport.c:1482 +#: src/transport/gnunet-transport-profiler.c:652 +#, fuzzy +msgid "Direct access to transport service." +msgstr "初始化“%s”服务失败。\n" + +#: src/transport/gnunet-transport-profiler.c:219 +#, c-format +msgid "%llu B in %llu ms == %.2f KB/s!\n" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:617 +msgid "send data to peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:621 +msgid "receive data from peer" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:626 +msgid "iterations" +msgstr "" + +#: src/transport/gnunet-transport-profiler.c:631 +#, fuzzy +msgid "number of messages to send" +msgstr "每次迭代所使用的消息数量" + +#: src/transport/gnunet-transport-profiler.c:636 +#, fuzzy +msgid "message size to use" +msgstr "消息尺寸" + #: src/transport/plugin_transport_http_client.c:1474 #: src/transport/plugin_transport_http_server.c:2312 #: src/transport/plugin_transport_http_server.c:3526 #: src/transport/plugin_transport_tcp.c:3891 #: src/transport/plugin_transport_tcp.c:3898 +#: src/transport/plugin_transport_xt.c:3899 +#: src/transport/plugin_transport_xt.c:3906 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" @@ -7544,6 +7556,7 @@ msgstr "" #: src/transport/plugin_transport_http_server.c:2901 #: src/transport/plugin_transport_udp.c:3623 +#: src/transport/plugin_transport_xu.c:2049 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" @@ -7647,6 +7660,8 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1547 #: src/transport/plugin_transport_tcp.c:2873 +#: src/transport/plugin_transport_xt.c:1553 +#: src/transport/plugin_transport_xt.c:2879 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" @@ -7655,6 +7670,9 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:1954 #: src/transport/plugin_transport_tcp.c:3137 #: src/transport/plugin_transport_tcp.c:4014 +#: src/transport/plugin_transport_xt.c:1736 +#: src/transport/plugin_transport_xt.c:1960 +#: src/transport/plugin_transport_xt.c:3143 msgid "# TCP sessions active" msgstr "" @@ -7664,39 +7682,54 @@ msgstr "" #: src/transport/plugin_transport_tcp.c:2133 #: src/transport/plugin_transport_tcp.c:2233 #: src/transport/plugin_transport_tcp.c:2258 +#: src/transport/plugin_transport_xt.c:1778 +#: src/transport/plugin_transport_xt.c:1942 +#: src/transport/plugin_transport_xt.c:2066 +#: src/transport/plugin_transport_xt.c:2139 +#: src/transport/plugin_transport_xt.c:2239 +#: src/transport/plugin_transport_xt.c:2264 msgid "# bytes currently in TCP buffers" msgstr "" #: src/transport/plugin_transport_tcp.c:1775 +#: src/transport/plugin_transport_xt.c:1781 msgid "# bytes discarded by TCP (disconnect)" msgstr "" #: src/transport/plugin_transport_tcp.c:2063 +#: src/transport/plugin_transport_xt.c:2069 msgid "# bytes discarded by TCP (timeout)" msgstr "" #: src/transport/plugin_transport_tcp.c:2137 +#: src/transport/plugin_transport_xt.c:2143 msgid "# bytes transmitted via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:2535 +#: src/transport/plugin_transport_xt.c:2541 msgid "# requests to create session with invalid address" msgstr "" #: src/transport/plugin_transport_tcp.c:2711 +#: src/transport/plugin_transport_xt.c:2717 msgid "# transport-service disconnect requests for TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3203 +#: src/transport/plugin_transport_xt.c:3209 msgid "# TCP WELCOME messages received" msgstr "" #: src/transport/plugin_transport_tcp.c:3409 +#: src/transport/plugin_transport_xt.c:3415 msgid "# bytes received via TCP" msgstr "" #: src/transport/plugin_transport_tcp.c:3460 #: src/transport/plugin_transport_tcp.c:3518 +#: src/transport/plugin_transport_xt.c:3466 +#: src/transport/plugin_transport_xt.c:3524 #, fuzzy msgid "# TCP server connections active" msgstr "" @@ -7704,6 +7737,7 @@ msgstr "" "按任意键继续\n" #: src/transport/plugin_transport_tcp.c:3464 +#: src/transport/plugin_transport_xt.c:3470 #, fuzzy msgid "# TCP server connect events" msgstr "" @@ -7711,22 +7745,27 @@ msgstr "" "按任意键继续\n" #: src/transport/plugin_transport_tcp.c:3470 +#: src/transport/plugin_transport_xt.c:3476 msgid "TCP connection limit reached, suspending server\n" msgstr "" #: src/transport/plugin_transport_tcp.c:3472 +#: src/transport/plugin_transport_xt.c:3478 msgid "# TCP service suspended" msgstr "" #: src/transport/plugin_transport_tcp.c:3512 +#: src/transport/plugin_transport_xt.c:3518 msgid "# TCP service resumed" msgstr "" #: src/transport/plugin_transport_tcp.c:3522 +#: src/transport/plugin_transport_xt.c:3528 msgid "# network-level TCP disconnect events" msgstr "" #: src/transport/plugin_transport_tcp.c:3841 +#: src/transport/plugin_transport_xt.c:3849 #, fuzzy msgid "Failed to start service.\n" msgstr "初始化“%s”服务失败。\n" @@ -7745,6 +7784,20 @@ msgstr "" msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" +#: src/transport/plugin_transport_udp_broadcasting.c:168 +msgid "# Multicast HELLO beacons received via UDP" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:548 +msgid "" +"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" +msgstr "" + +#: src/transport/plugin_transport_udp_broadcasting.c:565 +#, c-format +msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" +msgstr "" + #: src/transport/plugin_transport_udp.c:3367 #, c-format msgid "" @@ -7765,6 +7818,7 @@ msgid "Failed to bind UDP socket to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" #: src/transport/plugin_transport_udp.c:3717 +#: src/transport/plugin_transport_xu.c:2143 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" @@ -7775,15 +7829,19 @@ msgstr "打开日志文件“%s”失败：%s\n" #: src/transport/plugin_transport_udp.c:3879 #: src/transport/plugin_transport_udp.c:3893 +#: src/transport/plugin_transport_xu.c:2301 +#: src/transport/plugin_transport_xu.c:2315 msgid "must be in [0,65535]" msgstr "" #: src/transport/plugin_transport_udp.c:3925 +#: src/transport/plugin_transport_xu.c:2347 #, fuzzy msgid "must be valid IPv4 address" msgstr "“%s”不可用。\n" #: src/transport/plugin_transport_udp.c:3952 +#: src/transport/plugin_transport_xu.c:2374 #, fuzzy msgid "must be valid IPv6 address" msgstr "“%s”不可用。\n" @@ -7793,20 +7851,6 @@ msgstr "“%s”不可用。\n" msgid "Failed to create UDP network sockets\n" msgstr "发送消息失败。\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 -msgid "# Multicast HELLO beacons received via UDP" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:548 -msgid "" -"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" -msgstr "" - -#: src/transport/plugin_transport_udp_broadcasting.c:565 -#, c-format -msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" -msgstr "" - #: src/transport/plugin_transport_unix.c:1403 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" @@ -7879,6 +7923,56 @@ msgstr "" msgid "# sessions allocated" msgstr "" +#: src/transport/plugin_transport_xt.c:4010 +#, c-format +msgid "XT transport listening on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4014 +msgid "XT transport not listening on any port (client only)\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4018 +#, c-format +msgid "XT transport advertises itself as being on port %llu\n" +msgstr "" + +#: src/transport/plugin_transport_xt.c:4022 +#, fuzzy +msgid "# XT sessions active" +msgstr "" +"\n" +"按任意键继续\n" + +#: src/transport/plugin_transport_xu.c:1237 +#, c-format +msgid "" +"XU could not transmit message to `%s': Network seems down, please check your " +"network configuration\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:1251 +msgid "" +"XU could not transmit IPv6 message! Please check your network configuration " +"and disable IPv6 if your connection does not have a global IPv6 address\n" +msgstr "" + +#: src/transport/plugin_transport_xu.c:2125 +#: src/transport/plugin_transport_xu.c:2224 +#, fuzzy, c-format +msgid "Failed to bind XU socket to %s: %s\n" +msgstr "打开日志文件“%s”失败：%s\n" + +#: src/transport/plugin_transport_xu.c:2234 +#, fuzzy +msgid "Failed to open XU sockets\n" +msgstr "打开日志文件“%s”失败：%s\n" + +#: src/transport/plugin_transport_xu.c:2398 +#, fuzzy +msgid "Failed to create XU network sockets\n" +msgstr "发送消息失败。\n" + #: src/transport/tcp_connection_legacy.c:452 #, fuzzy, c-format msgid "Access denied to `%s'\n" @@ -8955,8 +9049,8 @@ msgstr "" msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #: src/zonemaster/gnunet-service-zonemaster.c:838 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "初始化“%s”服务失败。\n" diff --git a/src/my/Makefile.am b/src/my/Makefile.am index 959085c5fd..cead9a8b41 100644 --- a/src/my/Makefile.am +++ b/src/my/Makefile.am @@ -30,6 +30,9 @@ TESTS = \ test_my endif +EXTRA_DIST = \ + test_my.conf + check_PROGRAMS= \ test_my diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index ccb5923496..cc949873c8 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c @@ -633,7 +633,7 @@ check_get (void *cls, } return GNUNET_OK; } - + /** * Handle GET-message. @@ -667,7 +667,7 @@ handle_get (void *cls, return; } ip = &msg[1]; - + #if !defined(GNUNET_CULL_LOGGING) { char buf[INET6_ADDRSTRLEN]; @@ -719,7 +719,7 @@ disconnect_cb (void *cls, void *internal_cls) { (void) cls; - + GNUNET_assert (c == internal_cls); } -- cgit v1.2.3-18-g5258 From d15b9286cbaa6f56299f9064d269d3a1aa1ddee4 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Wed, 6 Jun 2018 00:33:56 +0200 Subject: rps: split tests and profiler, proper shutdown --- src/rps/Makefile.am | 16 +- src/rps/gnunet-rps-profiler.c | 2697 +++++++++++++++++++++++++++++++++++++++++ src/rps/test_rps.c | 108 +- src/rps/test_rps.conf | 2 +- 4 files changed, 2792 insertions(+), 31 deletions(-) create mode 100644 src/rps/gnunet-rps-profiler.c diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index b5f7122683..aa354dff77 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -83,17 +83,17 @@ check_PROGRAMS = \ test_rps_churn endif +rps_test_src = \ + test_rps.c \ + rps-test_util.h rps-test_util.c \ + gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c + ld_rps_test_lib = \ libgnunetrps.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ -lm -rps_test_src = \ - test_rps.c \ - rps-test_util.h rps-test_util.c \ - gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c - if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; TESTS = $(check_PROGRAMS) @@ -143,7 +143,11 @@ test_rps_churn_LDADD = $(ld_rps_test_lib) gnunet_rps_profiler_SOURCES = $(rps_test_src) gnunet_rps_profiler_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(ld_rps_test_lib) + libgnunetrps.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testbed/libgnunettestbed.la \ + -lm + EXTRA_DIST = \ test_rps.conf diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c new file mode 100644 index 0000000000..1ad9deabb2 --- /dev/null +++ b/src/rps/gnunet-rps-profiler.c @@ -0,0 +1,2697 @@ +/* + This file is part of GNUnet. + Copyright (C) 2009, 2012 GNUnet e.V. + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ +/** + * @file rps/test_rps.c + * @brief Testcase for the random peer sampling service. Starts + * a peergroup with a given number of peers, then waits to + * receive size pushes/pulls from each peer. Expects to wait + * for one message from each peer. + */ +#include "platform.h" +//#include "rps_test_lib.h" +#include "gnunet_util_lib.h" +#include "gnunet_testbed_service.h" + +#include "gnunet_rps_service.h" +#include "rps-test_util.h" +#include "gnunet-service-rps_sampler_elem.h" + +#include + + +/** + * How many peers do we start? + */ +static uint32_t num_peers; + +/** + * How long do we run the test? + * In seconds. + */ +static uint32_t timeout_s; + +/** + * How long do we run the test? + */ +//#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) +static struct GNUNET_TIME_Relative timeout; + + +/** + * Portion of malicious peers + */ +static double portion = .1; + +/** + * Type of malicious peer to test + */ +static unsigned int mal_type = 0; + +/** + * Handles to all of the running peers + */ +static struct GNUNET_TESTBED_Peer **testbed_peers; + +/** + * @brief Indicates whether peer should go off- or online + */ +enum PEER_ONLINE_DELTA { + /** + * @brief Indicates peer going online + */ + PEER_GO_ONLINE = 1, + /** + * @brief Indicates peer going offline + */ + PEER_GO_OFFLINE = -1, +}; + +/** + * Operation map entry + */ +struct OpListEntry +{ + /** + * DLL next ptr + */ + struct OpListEntry *next; + + /** + * DLL prev ptr + */ + struct OpListEntry *prev; + + /** + * The testbed operation + */ + struct GNUNET_TESTBED_Operation *op; + + /** + * Depending on whether we start or stop RPS service at the peer, set this to + * #PEER_GO_ONLINE (1) or #PEER_GO_OFFLINE (-1) + */ + enum PEER_ONLINE_DELTA delta; + + /** + * Index of the regarding peer + */ + unsigned int index; +}; + +/** + * OpList DLL head + */ +static struct OpListEntry *oplist_head; + +/** + * OpList DLL tail + */ +static struct OpListEntry *oplist_tail; + + +/** + * A pending reply: A request was sent and the reply is pending. + */ +struct PendingReply +{ + /** + * DLL next,prev ptr + */ + struct PendingReply *next; + struct PendingReply *prev; + + /** + * Handle to the request we are waiting for + */ + struct GNUNET_RPS_Request_Handle *req_handle; + + /** + * The peer that requested + */ + struct RPSPeer *rps_peer; +}; + + +/** + * A pending request: A request was not made yet but is scheduled for later. + */ +struct PendingRequest +{ + /** + * DLL next,prev ptr + */ + struct PendingRequest *next; + struct PendingRequest *prev; + + /** + * Handle to the request we are waiting for + */ + struct GNUNET_SCHEDULER_Task *request_task; + + /** + * The peer that requested + */ + struct RPSPeer *rps_peer; +}; + + +/** + * Information we track for each peer. + */ +struct RPSPeer +{ + /** + * Index of the peer. + */ + unsigned int index; + + /** + * Handle for RPS connect operation. + */ + struct GNUNET_TESTBED_Operation *op; + + /** + * Handle to RPS service. + */ + struct GNUNET_RPS_Handle *rps_handle; + + /** + * ID of the peer. + */ + struct GNUNET_PeerIdentity *peer_id; + + /** + * A request handle to check for an request + */ + //struct GNUNET_RPS_Request_Handle *req_handle; + + /** + * Peer on- or offline? + */ + int online; + + /** + * Number of Peer IDs to request during the whole test + */ + unsigned int num_ids_to_request; + + /** + * Pending requests DLL + */ + struct PendingRequest *pending_req_head; + struct PendingRequest *pending_req_tail; + + /** + * Number of pending requests + */ + unsigned int num_pending_reqs; + + /** + * Pending replies DLL + */ + struct PendingReply *pending_rep_head; + struct PendingReply *pending_rep_tail; + + /** + * Number of pending replies + */ + unsigned int num_pending_reps; + + /** + * Number of received PeerIDs + */ + unsigned int num_recv_ids; + + /** + * Pending operation on that peer + */ + const struct OpListEntry *entry_op_manage; + + /** + * Testbed operation to connect to statistics service + */ + struct GNUNET_TESTBED_Operation *stat_op; + + /** + * Handle to the statistics service + */ + struct GNUNET_STATISTICS_Handle *stats_h; + + /** + * @brief flags to indicate which statistics values have been already + * collected from the statistics service. + * Used to check whether we are able to shutdown. + */ + uint32_t stat_collected_flags; + + /** + * @brief File name of the file the stats are finally written to + */ + const char *file_name_stats; + + /** + * @brief File name of the file the stats are finally written to + */ + const char *file_name_probs; + + /** + * @brief The current view + */ + struct GNUNET_PeerIdentity *cur_view; + + /** + * @brief Number of peers in the #cur_view. + */ + uint32_t cur_view_count; + + /** + * @brief Number of occurrences in other peer's view + */ + uint32_t count_in_views; + + /** + * @brief statistics values + */ + uint64_t num_rounds; + uint64_t num_blocks; + uint64_t num_blocks_many_push; + uint64_t num_blocks_no_push; + uint64_t num_blocks_no_pull; + uint64_t num_blocks_many_push_no_pull; + uint64_t num_blocks_no_push_no_pull; + uint64_t num_issued_push; + uint64_t num_issued_pull_req; + uint64_t num_issued_pull_rep; + uint64_t num_sent_push; + uint64_t num_sent_pull_req; + uint64_t num_sent_pull_rep; + uint64_t num_recv_push; + uint64_t num_recv_pull_req; + uint64_t num_recv_pull_rep; +}; + +enum STAT_TYPE +{ + STAT_TYPE_ROUNDS = 0x1, /* 1 */ + STAT_TYPE_BLOCKS = 0x2, /* 2 */ + STAT_TYPE_BLOCKS_MANY_PUSH = 0x4, /* 3 */ + STAT_TYPE_BLOCKS_NO_PUSH = 0x8, /* 4 */ + STAT_TYPE_BLOCKS_NO_PULL = 0x10, /* 5 */ + STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL = 0x20, /* 6 */ + STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL = 0x40, /* 7 */ + STAT_TYPE_ISSUED_PUSH_SEND = 0x80, /* 8 */ + STAT_TYPE_ISSUED_PULL_REQ = 0x100, /* 9 */ + STAT_TYPE_ISSUED_PULL_REP = 0x200, /* 10 */ + STAT_TYPE_SENT_PUSH_SEND = 0x400, /* 11 */ + STAT_TYPE_SENT_PULL_REQ = 0x800, /* 12 */ + STAT_TYPE_SENT_PULL_REP = 0x1000, /* 13 */ + STAT_TYPE_RECV_PUSH_SEND = 0x2000, /* 14 */ + STAT_TYPE_RECV_PULL_REQ = 0x4000, /* 15 */ + STAT_TYPE_RECV_PULL_REP = 0x8000, /* 16 */ + STAT_TYPE_MAX = 0x80000000, /* 32 */ +}; + +struct STATcls +{ + struct RPSPeer *rps_peer; + enum STAT_TYPE stat_type; +}; + + +/** + * Information for all the peers. + */ +static struct RPSPeer *rps_peers; + +/** + * Peermap to get the index of a given peer ID quick. + */ +static struct GNUNET_CONTAINER_MultiPeerMap *peer_map; + +/** + * IDs of the peers. + */ +static struct GNUNET_PeerIdentity *rps_peer_ids; + +/** + * ID of the targeted peer. + */ +static struct GNUNET_PeerIdentity *target_peer; + +/** + * ID of the peer that requests for the evaluation. + */ +static struct RPSPeer *eval_peer; + +/** + * Number of online peers. + */ +static unsigned int num_peers_online; + +/** + * @brief The added sizes of the peer's views + */ +static unsigned int view_sizes; + +/** + * Return value from 'main'. + */ +static int ok; + +/** + * Identifier for the churn task that runs periodically + */ +static struct GNUNET_SCHEDULER_Task *post_test_task; + +/** + * Identifier for the churn task that runs periodically + */ +static struct GNUNET_SCHEDULER_Task *shutdown_task; + +/** + * Identifier for the churn task that runs periodically + */ +static struct GNUNET_SCHEDULER_Task *churn_task; + +/** + * Called to initialise the given RPSPeer + */ +typedef void (*InitPeer) (struct RPSPeer *rps_peer); + +/** + * @brief Called directly after connecting to the service + * + * @param rps_peer Specific peer the function is called on + * @param h the handle to the rps service + */ +typedef void (*PreTest) (struct RPSPeer *rps_peer, struct GNUNET_RPS_Handle *h); + +/** + * @brief Executes functions to test the api/service for a given peer + * + * Called from within #rps_connect_complete_cb () + * Implemented by #churn_test_cb, #profiler_cb, #mal_cb, #single_req_cb, + * #delay_req_cb, #seed_big_cb, #single_peer_seed_cb, #seed_cb, #req_cancel_cb + * + * @param rps_peer the peer the task runs on + */ +typedef void (*MainTest) (struct RPSPeer *rps_peer); + +/** + * Callback called once the requested random peers are available + */ +typedef void (*ReplyHandle) (void *cls, + uint64_t n, + const struct GNUNET_PeerIdentity *recv_peers); + +/** + * Called directly before disconnecting from the service + */ +typedef void (*PostTest) (struct RPSPeer *peer); + +/** + * Function called after disconnect to evaluate test success + */ +typedef int (*EvaluationCallback) (void); + +/** + * @brief Do we have Churn? + */ +enum OPTION_CHURN { + /** + * @brief If we have churn this is set + */ + HAVE_CHURN, + /** + * @brief If we have no churn this is set + */ + HAVE_NO_CHURN, +}; + +/** + * @brief Is it ok to quit the test before the timeout? + */ +enum OPTION_QUICK_QUIT { + /** + * @brief It is ok for the test to quit before the timeout triggers + */ + HAVE_QUICK_QUIT, + + /** + * @brief It is NOT ok for the test to quit before the timeout triggers + */ + HAVE_NO_QUICK_QUIT, +}; + +/** + * @brief Do we collect statistics at the end? + */ +enum OPTION_COLLECT_STATISTICS { + /** + * @brief We collect statistics at the end + */ + COLLECT_STATISTICS, + + /** + * @brief We do not collect statistics at the end + */ + NO_COLLECT_STATISTICS, +}; + +/** + * @brief Do we collect views during run? + */ +enum OPTION_COLLECT_VIEW { + /** + * @brief We collect view during run + */ + COLLECT_VIEW, + + /** + * @brief We do not collect the view during run + */ + NO_COLLECT_VIEW, +}; + +/** + * Structure to define a single test + */ +struct SingleTestRun +{ + /** + * Name of the test + */ + char *name; + + /** + * Called with a single peer in order to initialise that peer + */ + InitPeer init_peer; + + /** + * Called directly after connecting to the service + */ + PreTest pre_test; + + /** + * Main function for each peer + */ + MainTest main_test; + + /** + * Callback called once the requested peers are available + */ + ReplyHandle reply_handle; + + /** + * Called directly before disconnecting from the service + */ + PostTest post_test; + + /** + * Function to evaluate the test results + */ + EvaluationCallback eval_cb; + + /** + * Request interval + */ + uint32_t request_interval; + + /** + * Number of Requests to make. + */ + uint32_t num_requests; + + /** + * Run with (-out) churn + */ + enum OPTION_CHURN have_churn; + + /** + * Quit test before timeout? + */ + enum OPTION_QUICK_QUIT have_quick_quit; + + /** + * Collect statistics at the end? + */ + enum OPTION_COLLECT_STATISTICS have_collect_statistics; + + /** + * Collect view during run? + */ + enum OPTION_COLLECT_VIEW have_collect_view; + + /** + * @brief Mark which values from the statistics service to collect at the end + * of the run + */ + uint32_t stat_collect_flags; +} cur_test_run; + +/** + * Did we finish the test? + */ +static int post_test; + +/** + * Are we shutting down? + */ +static int in_shutdown; + +/** + * Append arguments to file + */ +static void +tofile_ (const char *file_name, const char *line) +{ + struct GNUNET_DISK_FileHandle *f; + /* char output_buffer[512]; */ + size_t size; + /* int size; */ + size_t size2; + + if (NULL == (f = GNUNET_DISK_file_open (file_name, + GNUNET_DISK_OPEN_APPEND | + GNUNET_DISK_OPEN_WRITE | + GNUNET_DISK_OPEN_CREATE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ))) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Not able to open file %s\n", + file_name); + return; + } + /* size = GNUNET_snprintf (output_buffer, + sizeof (output_buffer), + "%llu %s\n", + GNUNET_TIME_absolute_get ().abs_value_us, + line); + if (0 > size) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Failed to write string to buffer (size: %i)\n", + size); + return; + } */ + + size = strlen (line) * sizeof (char); + + size2 = GNUNET_DISK_file_write (f, line, size); + if (size != size2) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unable to write to file! (Size: %lu, size2: %lu)\n", + size, + size2); + if (GNUNET_YES != GNUNET_DISK_file_close (f)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unable to close file\n"); + } + return; + } + + if (GNUNET_YES != GNUNET_DISK_file_close (f)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unable to close file\n"); + } +} + +/** + * This function is used to facilitate writing important information to disk + */ +#define tofile(file_name, ...) do {\ + char tmp_buf[512];\ + int size;\ + size = GNUNET_snprintf(tmp_buf,sizeof(tmp_buf),__VA_ARGS__);\ + if (0 > size)\ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING,\ + "Failed to create tmp_buf\n");\ + else\ + tofile_(file_name,tmp_buf);\ + } while (0); + + +/** + * Write the ids and their according index in the given array to a file + * Unused + */ +/* static void +ids_to_file (char *file_name, + struct GNUNET_PeerIdentity *peer_ids, + unsigned int num_peer_ids) +{ + unsigned int i; + + for (i=0 ; i < num_peer_ids ; i++) + { + to_file (file_name, + "%u\t%s", + i, + GNUNET_i2s_full (&peer_ids[i])); + } +} */ + +/** + * Test the success of a single test + */ +static int +evaluate (void) +{ + unsigned int i; + int tmp_ok; + + tmp_ok = 1; + + for (i = 0; i < num_peers; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u. peer [%s] received %u of %u expected peer_ids: %i\n", + i, + GNUNET_i2s (rps_peers[i].peer_id), + rps_peers[i].num_recv_ids, + rps_peers[i].num_ids_to_request, + (rps_peers[i].num_ids_to_request == rps_peers[i].num_recv_ids)); + tmp_ok &= (rps_peers[i].num_ids_to_request == rps_peers[i].num_recv_ids); + } + return tmp_ok? 0 : 1; +} + + +/** + * Creates an oplist entry and adds it to the oplist DLL + */ +static struct OpListEntry * +make_oplist_entry () +{ + struct OpListEntry *entry; + + entry = GNUNET_new (struct OpListEntry); + GNUNET_CONTAINER_DLL_insert_tail (oplist_head, oplist_tail, entry); + return entry; +} + + +/** + * @brief Checks if given peer already received its statistics value from the + * statistics service. + * + * @param rps_peer the peer to check for + * + * @return #GNUNET_YES if so + * #GNUNET_NO otherwise + */ +static int check_statistics_collect_completed_single_peer ( + const struct RPSPeer *rps_peer) +{ + if (cur_test_run.stat_collect_flags != + (cur_test_run.stat_collect_flags & + rps_peer->stat_collected_flags)) + { + return GNUNET_NO; + } + return GNUNET_YES; +} +/** + * @brief Checks if all peers already received their statistics value from the + * statistics service. + * + * @return #GNUNET_YES if so + * #GNUNET_NO otherwise + */ +static int check_statistics_collect_completed () +{ + uint32_t i; + + for (i = 0; i < num_peers; i++) + { + if (GNUNET_NO == check_statistics_collect_completed_single_peer (&rps_peers[i])) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "At least Peer %" PRIu32 " did not yet receive all statistics values\n", + i); + return GNUNET_NO; + } + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "All peers received their statistics values\n"); + return GNUNET_YES; +} + +/** + * Task run on timeout to shut everything down. + */ +static void +shutdown_op (void *cls) +{ + unsigned int i; + + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Shutdown task scheduled, going down.\n"); + in_shutdown = GNUNET_YES; + if (NULL != post_test_task) + { + GNUNET_SCHEDULER_cancel (post_test_task); + } + if (NULL != churn_task) + { + GNUNET_SCHEDULER_cancel (churn_task); + churn_task = NULL; + } + for (i = 0; i < num_peers; i++) + { + if (NULL != rps_peers[i].rps_handle) + { + GNUNET_RPS_disconnect (rps_peers[i].rps_handle); + } + if (NULL != rps_peers[i].op) + { + GNUNET_TESTBED_operation_done (rps_peers[i].op); + } + } +} + + +/** + * Task run on timeout to collect statistics and potentially shut down. + */ +static void +post_test_op (void *cls) +{ + unsigned int i; + + post_test_task = NULL; + post_test = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Post test task scheduled, going down.\n"); + if (NULL != churn_task) + { + GNUNET_SCHEDULER_cancel (churn_task); + churn_task = NULL; + } + for (i = 0; i < num_peers; i++) + { + if (NULL != rps_peers[i].op) + { + GNUNET_TESTBED_operation_done (rps_peers[i].op); + rps_peers[i].op = NULL; + } + if (NULL != cur_test_run.post_test) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing post_test for peer %u\n", i); + cur_test_run.post_test (&rps_peers[i]); + } + } + /* If we do not collect statistics, shut down directly */ + if (NO_COLLECT_STATISTICS == cur_test_run.have_collect_statistics || + GNUNET_YES == check_statistics_collect_completed()) + { + GNUNET_SCHEDULER_shutdown (); + } +} + + +/** + * Seed peers. + */ +static void +seed_peers (void *cls) +{ + struct RPSPeer *peer = cls; + unsigned int amount; + unsigned int i; + + // TODO if malicious don't seed mal peers + amount = round (.5 * num_peers); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding peers:\n"); + for (i = 0 ; i < amount ; i++) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Seeding %u. peer: %s\n", + i, + GNUNET_i2s (&rps_peer_ids[i])); + + GNUNET_RPS_seed_ids (peer->rps_handle, amount, rps_peer_ids); +} + + +/** + * Get the id of peer i. + */ + void +info_cb (void *cb_cls, + struct GNUNET_TESTBED_Operation *op, + const struct GNUNET_TESTBED_PeerInformation *pinfo, + const char *emsg) +{ + struct OpListEntry *entry = (struct OpListEntry *) cb_cls; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + if (NULL == pinfo || NULL != emsg) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Got Error: %s\n", emsg); + GNUNET_TESTBED_operation_done (entry->op); + return; + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer %u is %s\n", + entry->index, + GNUNET_i2s (pinfo->result.id)); + + rps_peer_ids[entry->index] = *(pinfo->result.id); + rps_peers[entry->index].peer_id = &rps_peer_ids[entry->index]; + + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_put (peer_map, + &rps_peer_ids[entry->index], + &rps_peers[entry->index], + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + tofile ("/tmp/rps/peer_ids", + "%u\t%s\n", + entry->index, + GNUNET_i2s_full (&rps_peer_ids[entry->index])); + + GNUNET_CONTAINER_DLL_remove (oplist_head, oplist_tail, entry); + GNUNET_TESTBED_operation_done (entry->op); + GNUNET_free (entry); +} + + +/** + * Callback to be called when RPS service connect operation is completed + * + * @param cls the callback closure from functions generating an operation + * @param op the operation that has been finished + * @param ca_result the RPS service handle returned from rps_connect_adapter + * @param emsg error message in case the operation has failed; will be NULL if + * operation has executed successfully. + */ +static void +rps_connect_complete_cb (void *cls, + struct GNUNET_TESTBED_Operation *op, + void *ca_result, + const char *emsg) +{ + struct RPSPeer *rps_peer = cls; + struct GNUNET_RPS_Handle *rps = ca_result; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + rps_peer->rps_handle = rps; + rps_peer->online = GNUNET_YES; + num_peers_online++; + + GNUNET_assert (op == rps_peer->op); + if (NULL != emsg) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to connect to RPS service: %s\n", + emsg); + ok = 1; + GNUNET_SCHEDULER_shutdown (); + return; + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started client successfully\n"); + + cur_test_run.main_test (rps_peer); +} + + +/** + * Adapter function called to establish a connection to + * the RPS service. + * + * @param cls closure + * @param cfg configuration of the peer to connect to; will be available until + * GNUNET_TESTBED_operation_done() is called on the operation returned + * from GNUNET_TESTBED_service_connect() + * @return service handle to return in 'op_result', NULL on error + */ +static void * +rps_connect_adapter (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + struct GNUNET_RPS_Handle *h; + + h = GNUNET_RPS_connect (cfg); + + if (NULL != cur_test_run.pre_test) + cur_test_run.pre_test (cls, h); + + return h; +} + +/** + * Called to open a connection to the peer's statistics + * + * @param cls peer context + * @param cfg configuration of the peer to connect to; will be available until + * GNUNET_TESTBED_operation_done() is called on the operation returned + * from GNUNET_TESTBED_service_connect() + * @return service handle to return in 'op_result', NULL on error + */ +static void * +stat_connect_adapter (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + struct RPSPeer *peer = cls; + + peer->stats_h = GNUNET_STATISTICS_create ("rps-profiler", cfg); + return peer->stats_h; +} + +/** + * Called to disconnect from peer's statistics service + * + * @param cls peer context + * @param op_result service handle returned from the connect adapter + */ +static void +stat_disconnect_adapter (void *cls, void *op_result) +{ + struct RPSPeer *peer = cls; + + //GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch_cancel + // (peer->stats_h, "core", "# peers connected", + // stat_iterator, peer)); + //GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch_cancel + // (peer->stats_h, "nse", "# peers connected", + // stat_iterator, peer)); + GNUNET_STATISTICS_destroy (op_result, GNUNET_NO); + peer->stats_h = NULL; +} + +/** + * Called after successfully opening a connection to a peer's statistics + * service; we register statistics monitoring for CORE and NSE here. + * + * @param cls the callback closure from functions generating an operation + * @param op the operation that has been finished + * @param ca_result the service handle returned from GNUNET_TESTBED_ConnectAdapter() + * @param emsg error message in case the operation has failed; will be NULL if + * operation has executed successfully. + */ +static void +stat_complete_cb (void *cls, struct GNUNET_TESTBED_Operation *op, + void *ca_result, const char *emsg ) +{ + //struct GNUNET_STATISTICS_Handle *sh = ca_result; + //struct RPSPeer *peer = (struct RPSPeer *) cls; + + if (NULL != emsg) + { + GNUNET_break (0); + return; + } + //GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch + // (sh, "core", "# peers connected", + // stat_iterator, peer)); + //GNUNET_break (GNUNET_OK == GNUNET_STATISTICS_watch + // (sh, "nse", "# peers connected", + // stat_iterator, peer)); +} + + +/** + * Adapter function called to destroy connection to + * RPS service. + * + * @param cls closure + * @param op_result service handle returned from the connect adapter + */ +static void +rps_disconnect_adapter (void *cls, + void *op_result) +{ + struct RPSPeer *peer = cls; + struct GNUNET_RPS_Handle *h = op_result; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnect_adapter()\n"); + GNUNET_assert (NULL != peer); + GNUNET_RPS_disconnect (h); + peer->rps_handle = NULL; +} + + +/*********************************************************************** + * Definition of tests +***********************************************************************/ + +/** + * Callback to call on receipt of a reply + * + * @param cls closure + * @param n number of peers + * @param recv_peers the received peers + */ +static void +default_reply_handle (void *cls, + uint64_t n, + const struct GNUNET_PeerIdentity *recv_peers) +{ + struct RPSPeer *rps_peer; + struct PendingReply *pending_rep = (struct PendingReply *) cls; + unsigned int i; + + rps_peer = pending_rep->rps_peer; + GNUNET_CONTAINER_DLL_remove (rps_peer->pending_rep_head, + rps_peer->pending_rep_tail, + pending_rep); + rps_peer->num_pending_reps--; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "[%s] got %" PRIu64 " peers:\n", + GNUNET_i2s (rps_peer->peer_id), + n); + + for (i = 0; i < n; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u: %s\n", + i, + GNUNET_i2s (&recv_peers[i])); + + rps_peer->num_recv_ids++; + } + + if (0 == evaluate () && HAVE_QUICK_QUIT == cur_test_run.have_quick_quit) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test succeeded before timeout\n"); + GNUNET_assert (NULL != post_test_task); + GNUNET_SCHEDULER_cancel (post_test_task); + post_test_task = GNUNET_SCHEDULER_add_now (&post_test_op, NULL); + GNUNET_assert (NULL!= post_test_task); + } +} + +/** + * Request random peers. + */ +static void +request_peers (void *cls) +{ + struct PendingRequest *pending_req = cls; + struct RPSPeer *rps_peer; + struct PendingReply *pending_rep; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + return; + rps_peer = pending_req->rps_peer; + GNUNET_assert (1 <= rps_peer->num_pending_reqs); + GNUNET_CONTAINER_DLL_remove (rps_peer->pending_req_head, + rps_peer->pending_req_tail, + pending_req); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Requesting one peer\n"); + pending_rep = GNUNET_new (struct PendingReply); + pending_rep->rps_peer = rps_peer; + pending_rep->req_handle = GNUNET_RPS_request_peers (rps_peer->rps_handle, + 1, + cur_test_run.reply_handle, + pending_rep); + GNUNET_CONTAINER_DLL_insert_tail (rps_peer->pending_rep_head, + rps_peer->pending_rep_tail, + pending_rep); + rps_peer->num_pending_reps++; + rps_peer->num_pending_reqs--; +} + +static void +cancel_pending_req (struct PendingRequest *pending_req) +{ + struct RPSPeer *rps_peer; + + rps_peer = pending_req->rps_peer; + GNUNET_CONTAINER_DLL_remove (rps_peer->pending_req_head, + rps_peer->pending_req_tail, + pending_req); + rps_peer->num_pending_reqs--; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cancelling pending request\n"); + GNUNET_SCHEDULER_cancel (pending_req->request_task); + GNUNET_free (pending_req); +} + +static void +cancel_request (struct PendingReply *pending_rep) +{ + struct RPSPeer *rps_peer; + + rps_peer = pending_rep->rps_peer; + GNUNET_CONTAINER_DLL_remove (rps_peer->pending_rep_head, + rps_peer->pending_rep_tail, + pending_rep); + rps_peer->num_pending_reps--; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cancelling request\n"); + GNUNET_RPS_request_cancel (pending_rep->req_handle); + GNUNET_free (pending_rep); +} + + +/** + * Schedule requests for peer @a rps_peer that have neither been scheduled, nor + * issued, nor replied + */ +void +schedule_missing_requests (struct RPSPeer *rps_peer) +{ + unsigned int i; + struct PendingRequest *pending_req; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Scheduling %u - %u missing requests\n", + rps_peer->num_ids_to_request, + rps_peer->num_pending_reqs + rps_peer->num_pending_reps); + GNUNET_assert (rps_peer->num_pending_reqs + rps_peer->num_pending_reps <= + rps_peer->num_ids_to_request); + for (i = rps_peer->num_pending_reqs + rps_peer->num_pending_reps; + i < rps_peer->num_ids_to_request; i++) + { + pending_req = GNUNET_new (struct PendingRequest); + pending_req->rps_peer = rps_peer; + pending_req->request_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + cur_test_run.request_interval * i), + request_peers, + pending_req); + GNUNET_CONTAINER_DLL_insert_tail (rps_peer->pending_req_head, + rps_peer->pending_req_tail, + pending_req); + rps_peer->num_pending_reqs++; + } +} + +void +cancel_pending_req_rep (struct RPSPeer *rps_peer) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cancelling all (pending) requests.\n"); + while (NULL != rps_peer->pending_req_head) + cancel_pending_req (rps_peer->pending_req_head); + GNUNET_assert (0 == rps_peer->num_pending_reqs); + while (NULL != rps_peer->pending_rep_head) + cancel_request (rps_peer->pending_rep_head); + GNUNET_assert (0 == rps_peer->num_pending_reps); +} + +/*********************************** + * MALICIOUS +***********************************/ + +/** + * Initialise only non-mal RPSPeers + */ +static void mal_init_peer (struct RPSPeer *rps_peer) +{ + if (rps_peer->index >= round (portion * num_peers)) + rps_peer->num_ids_to_request = 1; +} + + +/** + * @brief Set peers to (non-)malicious before execution + * + * Of signature #PreTest + * + * @param rps_peer the peer to set (non-) malicious + * @param h the handle to the service + */ +static void +mal_pre (struct RPSPeer *rps_peer, struct GNUNET_RPS_Handle *h) +{ + #ifdef ENABLE_MALICIOUS + uint32_t num_mal_peers; + + GNUNET_assert ( (1 >= portion) && + (0 < portion) ); + num_mal_peers = round (portion * num_peers); + + if (rps_peer->index < num_mal_peers) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u. peer [%s] of %" PRIu32 " malicious peers turning malicious\n", + rps_peer->index, + GNUNET_i2s (rps_peer->peer_id), + num_mal_peers); + + GNUNET_RPS_act_malicious (h, mal_type, num_mal_peers, + rps_peer_ids, target_peer); + } + #endif /* ENABLE_MALICIOUS */ +} + +static void +mal_cb (struct RPSPeer *rps_peer) +{ + uint32_t num_mal_peers; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + #ifdef ENABLE_MALICIOUS + GNUNET_assert ( (1 >= portion) && + (0 < portion) ); + num_mal_peers = round (portion * num_peers); + + if (rps_peer->index >= num_mal_peers) + { /* It's useless to ask a malicious peer about a random sample - + it's not sampling */ + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2), + seed_peers, rps_peer); + schedule_missing_requests (rps_peer); + } + #endif /* ENABLE_MALICIOUS */ +} + +/*********************************** + * CHURN +***********************************/ + +static void +churn (void *cls); + +/** + * @brief Starts churn + * + * Has signature of #MainTest + * + * This is not implemented too nicely as this is called for each peer, but we + * only need to call it once. (Yes we check that we only schedule the task + * once.) + * + * @param rps_peer The peer it's called for + */ +static void +churn_test_cb (struct RPSPeer *rps_peer) +{ + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + /* Start churn */ + if (HAVE_CHURN == cur_test_run.have_churn && NULL == churn_task) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting churn task\n"); + churn_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), + churn, + NULL); + } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Not starting churn task\n"); + } + + schedule_missing_requests (rps_peer); +} + +/*********************************** + * PROFILER +***********************************/ + +/** + * Callback to be called when RPS service is started or stopped at peers + * + * @param cls NULL + * @param op the operation handle + * @param emsg NULL on success; otherwise an error description + */ +static void +churn_cb (void *cls, + struct GNUNET_TESTBED_Operation *op, + const char *emsg) +{ + // FIXME + struct OpListEntry *entry = cls; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + GNUNET_TESTBED_operation_done (entry->op); + if (NULL != emsg) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start/stop RPS at a peer\n"); + GNUNET_SCHEDULER_shutdown (); + return; + } + GNUNET_assert (0 != entry->delta); + + num_peers_online += entry->delta; + + if (PEER_GO_OFFLINE == entry->delta) + { /* Peer hopefully just went offline */ + if (GNUNET_YES != rps_peers[entry->index].online) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "peer %s was expected to go offline but is still marked as online\n", + GNUNET_i2s (rps_peers[entry->index].peer_id)); + GNUNET_break (0); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "peer %s probably went offline as expected\n", + GNUNET_i2s (rps_peers[entry->index].peer_id)); + } + rps_peers[entry->index].online = GNUNET_NO; + } + + else if (PEER_GO_ONLINE < entry->delta) + { /* Peer hopefully just went online */ + if (GNUNET_NO != rps_peers[entry->index].online) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "peer %s was expected to go online but is still marked as offline\n", + GNUNET_i2s (rps_peers[entry->index].peer_id)); + GNUNET_break (0); + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "peer %s probably went online as expected\n", + GNUNET_i2s (rps_peers[entry->index].peer_id)); + if (NULL != cur_test_run.pre_test) + { + cur_test_run.pre_test (&rps_peers[entry->index], + rps_peers[entry->index].rps_handle); + schedule_missing_requests (&rps_peers[entry->index]); + } + } + rps_peers[entry->index].online = GNUNET_YES; + } + else + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Invalid value for delta: %i\n", entry->delta); + GNUNET_break (0); + } + + GNUNET_CONTAINER_DLL_remove (oplist_head, oplist_tail, entry); + rps_peers[entry->index].entry_op_manage = NULL; + GNUNET_free (entry); + //if (num_peers_in_round[current_round] == peers_running) + // run_round (); +} + +/** + * @brief Set the rps-service up or down for a specific peer + * + * @param i index of action + * @param j index of peer + * @param delta (#PEER_ONLINE_DELTA) down (-1) or up (1) + * @param prob_go_on_off the probability of the action + */ +static void +manage_service_wrapper (unsigned int i, unsigned int j, + enum PEER_ONLINE_DELTA delta, + double prob_go_on_off) +{ + struct OpListEntry *entry = NULL; + uint32_t prob; + + /* make sure that management operation is not already scheduled */ + if (NULL != rps_peers[j].entry_op_manage) + { + return; + } + + prob = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, + UINT32_MAX); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u. selected peer (%u: %s) is %s.\n", + i, + j, + GNUNET_i2s (rps_peers[j].peer_id), + (PEER_GO_ONLINE == delta) ? "online" : "offline"); + if (prob < prob_go_on_off * UINT32_MAX) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s goes %s\n", + GNUNET_i2s (rps_peers[j].peer_id), + (PEER_GO_OFFLINE == delta) ? "offline" : "online"); + + if (PEER_GO_OFFLINE == delta) + cancel_pending_req_rep (&rps_peers[j]); + entry = make_oplist_entry (); + entry->delta = delta; + entry->index = j; + entry->op = GNUNET_TESTBED_peer_manage_service (NULL, + testbed_peers[j], + "rps", + &churn_cb, + entry, + (PEER_GO_OFFLINE == delta) ? 0 : 1); + rps_peers[j].entry_op_manage = entry; + } +} + + +static void +churn (void *cls) +{ + unsigned int i; + unsigned int j; + double portion_online; + unsigned int *permut; + double prob_go_offline; + double portion_go_online; + double portion_go_offline; + + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Churn function executing\n"); + + churn_task = NULL; /* Should be invalid by now */ + + /* Compute the probability for an online peer to go offline + * this round */ + portion_online = num_peers_online * 1.0 / num_peers; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Portion online: %f\n", + portion_online); + portion_go_online = ((1 - portion_online) * .5 * .66); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Portion that should go online: %f\n", + portion_go_online); + portion_go_offline = (portion_online + portion_go_online) - .75; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Portion that probably goes offline: %f\n", + portion_go_offline); + prob_go_offline = portion_go_offline / (portion_online * .5); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Probability of a selected online peer to go offline: %f\n", + prob_go_offline); + + permut = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK, + (unsigned int) num_peers); + + /* Go over 50% randomly chosen peers */ + for (i = 0; i < .5 * num_peers; i++) + { + j = permut[i]; + + /* If online, shut down with certain probability */ + if (GNUNET_YES == rps_peers[j].online) + { + manage_service_wrapper (i, j, -1, prob_go_offline); + } + + /* If offline, restart with certain probability */ + else if (GNUNET_NO == rps_peers[j].online) + { + manage_service_wrapper (i, j, 1, 0.66); + } + } + + GNUNET_free (permut); + + churn_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2), + churn, + NULL); +} + + +/** + * Initialise given RPSPeer + */ +static void profiler_init_peer (struct RPSPeer *rps_peer) +{ + if (num_peers - 1 == rps_peer->index) + { + rps_peer->num_ids_to_request = cur_test_run.num_requests; + } else { + rps_peer->num_ids_to_request = 0; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "peer shall request %i peers\n", + rps_peer->num_ids_to_request); +} + + +/** + * Callback to call on receipt of a reply + * + * @param cls closure + * @param n number of peers + * @param recv_peers the received peers + */ +static void +profiler_reply_handle (void *cls, + uint64_t n, + const struct GNUNET_PeerIdentity *recv_peers) +{ + struct RPSPeer *rps_peer; + struct RPSPeer *rcv_rps_peer; + char *file_name; + char *file_name_dh; + char *file_name_dhr; + unsigned int i; + struct PendingReply *pending_rep = (struct PendingReply *) cls; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "profiler_reply_handle()\n"); + rps_peer = pending_rep->rps_peer; + file_name = "/tmp/rps/received_ids"; + file_name_dh = "/tmp/rps/diehard_input"; + file_name_dhr = "/tmp/rps/diehard_input_raw"; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "[%s] got %" PRIu64 " peers:\n", + GNUNET_i2s (rps_peer->peer_id), + n); + for (i = 0; i < n; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%u: %s\n", + i, + GNUNET_i2s (&recv_peers[i])); + tofile (file_name, + "%s\n", + GNUNET_i2s_full (&recv_peers[i])); + rcv_rps_peer = GNUNET_CONTAINER_multipeermap_get (peer_map, &recv_peers[i]); + GNUNET_assert (NULL != rcv_rps_peer); + tofile (file_name_dh, + "%" PRIu32 "\n", + (uint32_t) rcv_rps_peer->index); + to_file_raw (file_name_dhr, + &rcv_rps_peer->index, + sizeof (uint32_t)); + } + default_reply_handle (cls, n, recv_peers); +} + + +static void +profiler_cb (struct RPSPeer *rps_peer) +{ + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) + { + return; + } + + /* Start churn */ + if (HAVE_CHURN == cur_test_run.have_churn && NULL == churn_task) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting churn task\n"); + churn_task = GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), + churn, + NULL); + } else { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Not starting churn task\n"); + } + + /* Only request peer ids at one peer. + * (It's the before-last because last one is target of the focussed attack.) + */ + if (eval_peer == rps_peer) + schedule_missing_requests (rps_peer); +} + +/** + * Function called from #profiler_eval with a filename. + * + * @param cls closure + * @param filename complete filename (absolute path) + * @return #GNUNET_OK to continue to iterate, + * #GNUNET_NO to stop iteration with no error, + * #GNUNET_SYSERR to abort iteration with error! + */ +int +file_name_cb (void *cls, const char *filename) +{ + if (NULL != strstr (filename, "sampler_el")) + { + struct RPS_SamplerElement *s_elem; + struct GNUNET_CRYPTO_AuthKey auth_key; + const char *key_char; + uint32_t i; + + key_char = filename + 20; /* Length of "/tmp/rps/sampler_el-" */ + tofile (filename, "--------------------------\n"); + + auth_key = string_to_auth_key (key_char); + s_elem = RPS_sampler_elem_create (); + RPS_sampler_elem_set (s_elem, auth_key); + + for (i = 0; i < num_peers; i++) + { + RPS_sampler_elem_next (s_elem, &rps_peer_ids[i]); + } + RPS_sampler_elem_destroy (s_elem); + } + return GNUNET_OK; +} + +/** + * This is run after the test finished. + * + * Compute all perfect samples. + */ +int +profiler_eval (void) +{ + /* Compute perfect sample for each sampler element */ + if (-1 == GNUNET_DISK_directory_scan ("/tmp/rps/", file_name_cb, NULL)) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Scan of directory failed\n"); + } + + return evaluate (); +} + +static uint32_t fac (uint32_t x) +{ + if (1 >= x) + { + return x; + } + return x * fac (x - 1); +} + +static uint32_t binom (uint32_t n, uint32_t k) +{ + //GNUNET_assert (n >= k); + if (k > n) return 0; + if (0 > n) return 0; + if (0 > k) return 0; + if (0 == k) return 1; + return fac (n) + / + fac(k) * fac(n - k); +} + +/** + * @brief is b in view of a? + * + * @param a + * @param b + * + * @return + */ +static int is_in_view (uint32_t a, uint32_t b) +{ + uint32_t i; + for (i = 0; i < rps_peers[a].cur_view_count; i++) + { + if (0 == memcmp (rps_peers[b].peer_id, + &rps_peers[a].cur_view[i], + sizeof (struct GNUNET_PeerIdentity))) + { + return GNUNET_YES; + } + } + return GNUNET_NO; +} + +static uint32_t get_idx_of_pid (const struct GNUNET_PeerIdentity *pid) +{ + uint32_t i; + + for (i = 0; i < num_peers; i++) + { + if (0 == memcmp (pid, + rps_peers[i].peer_id, + sizeof (struct GNUNET_PeerIdentity))) + { + return i; + } + } + //return 0; /* Should not happen - make compiler happy */ + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "No known _PeerIdentity %s!\n", + GNUNET_i2s_full (pid)); + GNUNET_assert (0); +} + +/** + * @brief Counts number of peers in view of a that have b in their view + * + * @param a + * @param uint32_tb + * + * @return + */ +static uint32_t count_containing_views (uint32_t a, uint32_t b) +{ + uint32_t i; + uint32_t peer_idx; + uint32_t count = 0; + + for (i = 0; i < rps_peers[a].cur_view_count; i++) + { + peer_idx = get_idx_of_pid (&rps_peers[a].cur_view[i]); + if (GNUNET_YES == is_in_view (peer_idx, b)) + { + count++; + } + } + return count; +} + +/** + * @brief Computes the probability for each other peer to be selected by the + * sampling process based on the views of all peers + * + * @param peer_idx index of the peer that is about to sample + */ +static void compute_probabilities (uint32_t peer_idx) +{ + //double probs[num_peers] = { 0 }; + double probs[num_peers]; + size_t probs_as_str_size = (num_peers * 10 + 1) * sizeof (char); + char *probs_as_str = GNUNET_malloc (probs_as_str_size); + char *probs_as_str_cpy; + uint32_t i; + double prob_push; + double prob_pull; + uint32_t view_size; + uint32_t cont_views; + uint32_t number_of_being_in_pull_events; + int tmp; + uint32_t count_non_zero_prob = 0; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Computing probabilities for peer %" PRIu32 "\n", peer_idx); + /* Firstly without knowledge of old views */ + for (i = 0; i < num_peers; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\tfor peer %" PRIu32 ":\n", i); + view_size = rps_peers[i].cur_view_count; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\tview_size: %" PRIu32 "\n", view_size); + /* For peer i the probability of being sampled is + * evenly distributed among all possibly observed peers. */ + /* We could have observed a peer in three cases: + * 1. peer sent a push + * 2. peer was contained in a pull reply + * 3. peer was in history (sampler) - ignored for now */ + /* 1. Probability of having received a push from peer i */ + if ((GNUNET_YES == is_in_view (i, peer_idx)) && + (1 <= (0.45 * view_size))) + { + prob_push = 1.0 * binom (0.45 * view_size, 1) + / + binom (view_size, 0.45 * view_size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\t%" PRIu32 " is in %" PRIu32 "'s view, prob: %f\n", + peer_idx, + i, + prob_push); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\tposs choices from view: %" PRIu32 ", containing i: %" PRIu32 "\n", + binom (view_size, 0.45 * view_size), + binom (0.45 * view_size, 1)); + } else { + prob_push = 0; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\t%" PRIu32 " is not in %" PRIu32 "'s view, prob: 0\n", + peer_idx, + i); + } + /* 2. Probability of peer i being contained in pulls */ + view_size = rps_peers[peer_idx].cur_view_count; + cont_views = count_containing_views (peer_idx, i); + number_of_being_in_pull_events = + (binom (view_size, 0.45 * view_size) - + binom (view_size - cont_views, 0.45 * view_size)); + if (0 != number_of_being_in_pull_events) + { + prob_pull = number_of_being_in_pull_events + / + (1.0 * binom (view_size, 0.45 * view_size)); + } else + { + prob_pull = 0; + } + probs[i] = prob_push + prob_pull - (prob_push * prob_pull); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\t%" PRIu32 " has %" PRIu32 " of %" PRIu32 + " peers in its view who know %" PRIu32 " prob: %f\n", + peer_idx, + cont_views, + view_size, + i, + prob_pull); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\tnumber of possible pull combinations: %" PRIu32 "\n", + binom (view_size, 0.45 * view_size)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\tnumber of possible pull combinations without %" PRIu32 + ": %" PRIu32 "\n", + i, + binom (view_size - cont_views, 0.45 * view_size)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t\tnumber of possible pull combinations with %" PRIu32 + ": %" PRIu32 "\n", + i, + number_of_being_in_pull_events); + + if (0 != probs[i]) count_non_zero_prob++; + } + /* normalize */ + if (0 != count_non_zero_prob) + { + for (i = 0; i < num_peers; i++) + { + probs[i] = probs[i] * (1.0 / count_non_zero_prob); + } + } else { + for (i = 0; i < num_peers; i++) + { + probs[i] = 0; + } + } + /* str repr */ + for (i = 0; i < num_peers; i++) + { + probs_as_str_cpy = GNUNET_strndup (probs_as_str, probs_as_str_size); + tmp = GNUNET_snprintf (probs_as_str, + probs_as_str_size, + "%s %7.6f", probs_as_str_cpy, probs[i]); + GNUNET_free (probs_as_str_cpy); + GNUNET_assert (0 <= tmp); + } + + to_file_w_len (rps_peers[peer_idx].file_name_probs, + probs_as_str_size, + probs_as_str); + GNUNET_free (probs_as_str); +} + +/** + * @brief This counts the number of peers in which views a given peer occurs. + * + * It also stores this value in the rps peer. + * + * @param peer_idx the index of the peer to count the representation + * + * @return the number of occurrences + */ +static uint32_t count_peer_in_views_2 (uint32_t peer_idx) +{ + uint32_t i, j; + uint32_t count = 0; + + for (i = 0; i < num_peers; i++) /* Peer in which view is counted */ + { + for (j = 0; j < rps_peers[i].cur_view_count; j++) /* entry in view */ + { + if (0 == memcmp (rps_peers[peer_idx].peer_id, + &rps_peers[i].cur_view[j], + sizeof (struct GNUNET_PeerIdentity))) + { + count++; + break; + } + } + } + rps_peers[peer_idx].count_in_views = count; + return count; +} + +static uint32_t cumulated_view_sizes () +{ + uint32_t i; + + view_sizes = 0; + for (i = 0; i < num_peers; i++) /* Peer in which view is counted */ + { + view_sizes += rps_peers[i].cur_view_count; + } + return view_sizes; +} + +static void count_peer_in_views (uint32_t *count_peers) +{ + uint32_t i, j; + + for (i = 0; i < num_peers; i++) /* Peer in which view is counted */ + { + for (j = 0; j < rps_peers[i].cur_view_count; j++) /* entry in view */ + { + if (0 == memcmp (rps_peers[i].peer_id, + &rps_peers[i].cur_view[j], + sizeof (struct GNUNET_PeerIdentity))) + { + count_peers[i]++; + } + } + } +} + +void compute_diversity () +{ + uint32_t i; + /* ith entry represents the numer of occurrences in other peer's views */ + uint32_t *count_peers = GNUNET_new_array (num_peers, uint32_t); + uint32_t views_total_size; + double expected; + /* deviation from expected number of peers */ + double *deviation = GNUNET_new_array (num_peers, double); + + views_total_size = 0; + expected = 0; + + /* For each peer count its representation in other peer's views*/ + for (i = 0; i < num_peers; i++) /* Peer to count */ + { + views_total_size += rps_peers[i].cur_view_count; + count_peer_in_views (count_peers); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Counted representation of %" PRIu32 "th peer [%s]: %" PRIu32"\n", + i, + GNUNET_i2s (rps_peers[i].peer_id), + count_peers[i]); + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "size of all views combined: %" PRIu32 "\n", + views_total_size); + expected = ((double) 1/num_peers) * views_total_size; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Expected number of occurrences of each peer in all views: %f\n", + expected); + for (i = 0; i < num_peers; i++) /* Peer to count */ + { + deviation[i] = expected - count_peers[i]; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Deviation from expectation: %f\n", deviation[i]); + } + GNUNET_free (count_peers); + GNUNET_free (deviation); +} + +void print_view_sizes() +{ + uint32_t i; + + for (i = 0; i < num_peers; i++) /* Peer to count */ + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "View size of %" PRIu32 ". [%s] is %" PRIu32 "\n", + i, + GNUNET_i2s (rps_peers[i].peer_id), + rps_peers[i].cur_view_count); + } +} + +void all_views_updated_cb() +{ + compute_diversity(); + print_view_sizes(); +} + +void view_update_cb (void *cls, + uint64_t view_size, + const struct GNUNET_PeerIdentity *peers) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "View was updated (%" PRIu64 ")\n", view_size); + struct RPSPeer *rps_peer = (struct RPSPeer *) cls; + to_file ("/tmp/rps/view_sizes.txt", + "%" PRIu64 " %" PRIu32 "", + rps_peer->index, + view_size); + for (int i = 0; i < view_size; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "\t%s\n", GNUNET_i2s (&peers[i])); + } + GNUNET_array_grow (rps_peer->cur_view, + rps_peer->cur_view_count, + view_size); + //*rps_peer->cur_view = *peers; + GNUNET_memcpy (rps_peer->cur_view, + peers, + view_size * sizeof (struct GNUNET_PeerIdentity)); + to_file ("/tmp/rps/count_in_views.txt", + "%" PRIu64 " %" PRIu32 "", + rps_peer->index, + count_peer_in_views_2 (rps_peer->index)); + cumulated_view_sizes(); + if (0 != view_size) + { + to_file ("/tmp/rps/repr.txt", + "%" PRIu64 /* index */ + " %" PRIu32 /* occurrence in views */ + " %" PRIu32 /* view sizes */ + " %f" /* fraction of repr in views */ + " %f" /* average view size */ + " %f" /* prob of occurrence in view slot */ + " %f" "", /* exp frac of repr in views */ + rps_peer->index, + count_peer_in_views_2 (rps_peer->index), + view_sizes, + count_peer_in_views_2 (rps_peer->index) / (view_size * 1.0), /* fraction of representation in views */ + view_sizes / (view_size * 1.0), /* average view size */ + 1.0 /view_size, /* prob of occurrence in view slot */ + (1.0/view_size) * (view_sizes/view_size) /* expected fraction of repr in views */ + ); + } + compute_probabilities (rps_peer->index); + all_views_updated_cb(); +} + +static void +pre_profiler (struct RPSPeer *rps_peer, struct GNUNET_RPS_Handle *h) +{ + rps_peer->file_name_probs = + store_prefix_file_name (rps_peer->peer_id, "probs"); + GNUNET_RPS_view_request (h, 0, view_update_cb, rps_peer); +} + +void write_final_stats (void){ + uint32_t i; + + for (i = 0; i < num_peers; i++) + { + to_file ("/tmp/rps/final_stats.dat", + "%" PRIu32 " " /* index */ + "%s %" /* id */ + PRIu64 " %" /* rounds */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" /* blocking */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" /* issued */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" /* sent */ + PRIu64 " %" PRIu64 " %" PRIu64 /* recv */, + i, + GNUNET_i2s (rps_peers[i].peer_id), + rps_peers[i].num_rounds, + rps_peers[i].num_blocks, + rps_peers[i].num_blocks_many_push, + rps_peers[i].num_blocks_no_push, + rps_peers[i].num_blocks_no_pull, + rps_peers[i].num_blocks_many_push_no_pull, + rps_peers[i].num_blocks_no_push_no_pull, + rps_peers[i].num_issued_push, + rps_peers[i].num_issued_pull_req, + rps_peers[i].num_issued_pull_rep, + rps_peers[i].num_sent_push, + rps_peers[i].num_sent_pull_req, + rps_peers[i].num_sent_pull_rep, + rps_peers[i].num_recv_push, + rps_peers[i].num_recv_pull_req, + rps_peers[i].num_recv_pull_rep); + } +} + +/** + * Continuation called by #GNUNET_STATISTICS_get() functions. + * + * Remembers that this specific statistics value was received for this peer. + * Checks whether all peers received their statistics yet. + * Issues the shutdown. + * + * @param cls closure + * @param success #GNUNET_OK if statistics were + * successfully obtained, #GNUNET_SYSERR if not. + */ +void +post_test_shutdown_ready_cb (void *cls, + int success) +{ + struct STATcls *stat_cls = (struct STATcls *) cls; + struct RPSPeer *rps_peer = stat_cls->rps_peer; + if (GNUNET_OK == success) + { + /* set flag that we we got the value */ + rps_peer->stat_collected_flags |= stat_cls->stat_type; + } else { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Peer %u did not receive statistics value\n", + rps_peer->index); + GNUNET_free (stat_cls); + GNUNET_break (0); + } + + if (NULL != rps_peer->stat_op && + GNUNET_YES == check_statistics_collect_completed_single_peer (rps_peer)) + { + GNUNET_TESTBED_operation_done (rps_peer->stat_op); + } + + write_final_stats (); + if (GNUNET_YES == check_statistics_collect_completed()) + { + //write_final_stats (); + GNUNET_free (stat_cls); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Shutting down\n"); + GNUNET_SCHEDULER_shutdown (); + } else { + GNUNET_free (stat_cls); + } +} + +/** + * @brief Converts string representation to the corresponding #STAT_TYPE enum. + * + * @param stat_str string representation of statistics specifier + * + * @return corresponding enum + */ +enum STAT_TYPE stat_str_2_type (const char *stat_str) +{ + if (0 == strncmp ("# rounds blocked - no pull replies", stat_str, strlen ("# rounds blocked - no pull replies"))) + { + return STAT_TYPE_BLOCKS_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - too many pushes, no pull replies", stat_str, strlen ("# rounds blocked - too many pushes, no pull replies"))) + { + return STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - too many pushes", stat_str, strlen ("# rounds blocked - too many pushes"))) + { + return STAT_TYPE_BLOCKS_MANY_PUSH; + } + else if (0 == strncmp ("# rounds blocked - no pushes, no pull replies", stat_str, strlen ("# rounds blocked - no pushes, no pull replies"))) + { + return STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - no pushes", stat_str, strlen ("# rounds blocked - no pushes"))) + { + return STAT_TYPE_BLOCKS_NO_PUSH; + } + else if (0 == strncmp ("# rounds blocked", stat_str, strlen ("# rounds blocked"))) + { + return STAT_TYPE_BLOCKS; + } + else if (0 == strncmp ("# rounds", stat_str, strlen ("# rounds"))) + { + return STAT_TYPE_ROUNDS; + } + else if (0 == strncmp ("# push send issued", stat_str, strlen ("# push send issued"))) + { + return STAT_TYPE_ISSUED_PUSH_SEND; + } + else if (0 == strncmp ("# pull request send issued", stat_str, strlen ("# pull request send issued"))) + { + return STAT_TYPE_ISSUED_PULL_REQ; + } + else if (0 == strncmp ("# pull reply send issued", stat_str, strlen ("# pull reply send issued"))) + { + return STAT_TYPE_ISSUED_PULL_REP; + } + else if (0 == strncmp ("# pushes sent", stat_str, strlen ("# pushes sent"))) + { + return STAT_TYPE_SENT_PUSH_SEND; + } + else if (0 == strncmp ("# pull requests sent", stat_str, strlen ("# pull requests sent"))) + { + return STAT_TYPE_SENT_PULL_REQ; + } + else if (0 == strncmp ("# pull replys sent", stat_str, strlen ("# pull replys sent"))) + { + return STAT_TYPE_SENT_PULL_REP; + } + else if (0 == strncmp ("# push message received", stat_str, strlen ("# push message received"))) + { + return STAT_TYPE_RECV_PUSH_SEND; + } + else if (0 == strncmp ("# pull request message received", stat_str, strlen ("# pull request message received"))) + { + return STAT_TYPE_RECV_PULL_REQ; + } + else if (0 == strncmp ("# pull reply messages received", stat_str, strlen ("# pull reply messages received"))) + { + return STAT_TYPE_RECV_PULL_REP; + } + return STAT_TYPE_MAX; +} + + +/** + * @brief Converts #STAT_TYPE enum to the equivalent string representation that + * is stored with the statistics service. + * + * @param stat_type #STAT_TYPE enum + * + * @return string representation that matches statistics value + */ +char* stat_type_2_str (enum STAT_TYPE stat_type) +{ + switch (stat_type) + { + case STAT_TYPE_ROUNDS: + return "# rounds"; + case STAT_TYPE_BLOCKS: + return "# rounds blocked"; + case STAT_TYPE_BLOCKS_MANY_PUSH: + return "# rounds blocked - too many pushes"; + case STAT_TYPE_BLOCKS_NO_PUSH: + return "# rounds blocked - no pushes"; + case STAT_TYPE_BLOCKS_NO_PULL: + return "# rounds blocked - no pull replies"; + case STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL: + return "# rounds blocked - too many pushes, no pull replies"; + case STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL: + return "# rounds blocked - no pushes, no pull replies"; + case STAT_TYPE_ISSUED_PUSH_SEND: + return "# push send issued"; + case STAT_TYPE_ISSUED_PULL_REQ: + return "# pull request send issued"; + case STAT_TYPE_ISSUED_PULL_REP: + return "# pull reply send issued"; + case STAT_TYPE_SENT_PUSH_SEND: + return "# pushes sent"; + case STAT_TYPE_SENT_PULL_REQ: + return "# pull requests sent"; + case STAT_TYPE_SENT_PULL_REP: + return "# pull replys sent"; + case STAT_TYPE_RECV_PUSH_SEND: + return "# push message received"; + case STAT_TYPE_RECV_PULL_REQ: + return "# pull request message received"; + case STAT_TYPE_RECV_PULL_REP: + return "# pull reply messages received"; + case STAT_TYPE_MAX: + default: + return "ERROR"; + ; + } +} + +/** + * Callback function to process statistic values. + * + * @param cls closure + * @param subsystem name of subsystem that created the statistic + * @param name the name of the datum + * @param value the current value + * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not + * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration + */ +int +stat_iterator (void *cls, + const char *subsystem, + const char *name, + uint64_t value, + int is_persistent) +{ + const struct STATcls *stat_cls = (const struct STATcls *) cls; + struct RPSPeer *rps_peer = (struct RPSPeer *) stat_cls->rps_peer; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got stat value: %s - %" PRIu64 "\n", + //stat_type_2_str (stat_cls->stat_type), + name, + value); + to_file (rps_peer->file_name_stats, + "%s: %" PRIu64 "\n", + name, + value); + switch (stat_str_2_type (name)) + { + case STAT_TYPE_ROUNDS: + rps_peer->num_rounds = value; + break; + case STAT_TYPE_BLOCKS: + rps_peer->num_blocks = value; + break; + case STAT_TYPE_BLOCKS_MANY_PUSH: + rps_peer->num_blocks_many_push = value; + break; + case STAT_TYPE_BLOCKS_NO_PUSH: + rps_peer->num_blocks_no_push = value; + break; + case STAT_TYPE_BLOCKS_NO_PULL: + rps_peer->num_blocks_no_pull = value; + break; + case STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL: + rps_peer->num_blocks_many_push_no_pull = value; + break; + case STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL: + rps_peer->num_blocks_no_push_no_pull = value; + break; + case STAT_TYPE_ISSUED_PUSH_SEND: + rps_peer->num_issued_push = value; + break; + case STAT_TYPE_ISSUED_PULL_REQ: + rps_peer->num_issued_pull_req = value; + break; + case STAT_TYPE_ISSUED_PULL_REP: + rps_peer->num_issued_pull_rep = value; + break; + case STAT_TYPE_SENT_PUSH_SEND: + rps_peer->num_sent_push = value; + break; + case STAT_TYPE_SENT_PULL_REQ: + rps_peer->num_sent_pull_req = value; + break; + case STAT_TYPE_SENT_PULL_REP: + rps_peer->num_sent_pull_rep = value; + break; + case STAT_TYPE_RECV_PUSH_SEND: + rps_peer->num_recv_push = value; + break; + case STAT_TYPE_RECV_PULL_REQ: + rps_peer->num_recv_pull_req = value; + break; + case STAT_TYPE_RECV_PULL_REP: + rps_peer->num_recv_pull_rep = value; + break; + case STAT_TYPE_MAX: + default: + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Unknown statistics string: %s\n", + name); + break; + } + return GNUNET_OK; +} + +void post_profiler (struct RPSPeer *rps_peer) +{ + if (COLLECT_STATISTICS != cur_test_run.have_collect_statistics) + { + return; + } + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Going to request statistic values with mask 0x%" PRIx32 "\n", + cur_test_run.stat_collect_flags); + + struct STATcls *stat_cls; + uint32_t stat_type; + for (stat_type = STAT_TYPE_ROUNDS; + stat_type < STAT_TYPE_MAX; + stat_type = stat_type <<1) + { + if (stat_type & cur_test_run.stat_collect_flags) + { + stat_cls = GNUNET_malloc (sizeof (struct STATcls)); + stat_cls->rps_peer = rps_peer; + stat_cls->stat_type = stat_type; + rps_peer->file_name_stats = + store_prefix_file_name (rps_peer->peer_id, "stats"); + GNUNET_STATISTICS_get (rps_peer->stats_h, + "rps", + stat_type_2_str (stat_type), + post_test_shutdown_ready_cb, + stat_iterator, + (struct STATcls *) stat_cls); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Requested statistics for %s (peer %" PRIu32 ")\n", + stat_type_2_str (stat_type), + rps_peer->index); + } + } +} + + +/*********************************************************************** + * /Definition of tests +***********************************************************************/ + + +/** + * Actual "main" function for the testcase. + * + * @param cls closure + * @param h the run handle + * @param n_peers number of peers in 'peers' + * @param peers handle to peers run in the testbed + * @param links_succeeded the number of overlay link connection attempts that + * succeeded + * @param links_failed the number of overlay link connection attempts that + * failed + */ +static void +test_run (void *cls, + struct GNUNET_TESTBED_RunHandle *h, + unsigned int n_peers, + struct GNUNET_TESTBED_Peer **peers, + unsigned int links_succeeded, + unsigned int links_failed) +{ + unsigned int i; + struct OpListEntry *entry; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "RUN was called\n"); + printf ("test 1\n"); + + /* Check whether we timed out */ + if (n_peers != num_peers || + NULL == peers || + 0 == links_succeeded) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Going down due to args (eg. timeout)\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\tn_peers: %u\n", n_peers); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\tnum_peers: %" PRIu32 "\n", num_peers); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\tpeers: %p\n", peers); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\tlinks_succeeded: %u\n", links_succeeded); + GNUNET_SCHEDULER_shutdown (); + return; + } + + + /* Initialize peers */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "going to initialise peers\n"); + testbed_peers = peers; + num_peers_online = 0; + for (i = 0; i < num_peers; i++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "initialising %u\n", i); + entry = make_oplist_entry (); + entry->index = i; + rps_peers[i].index = i; + if (NULL != cur_test_run.init_peer) + cur_test_run.init_peer (&rps_peers[i]); + if (NO_COLLECT_VIEW == cur_test_run.have_collect_view) + { + rps_peers->cur_view_count = 0; + rps_peers->cur_view = NULL; + } + entry->op = GNUNET_TESTBED_peer_get_information (peers[i], + GNUNET_TESTBED_PIT_IDENTITY, + &info_cb, + entry); + } + + /* Bring peers up */ + GNUNET_assert (num_peers == n_peers); + for (i = 0; i < n_peers; i++) + { + rps_peers[i].index = i; + rps_peers[i].op = + GNUNET_TESTBED_service_connect (&rps_peers[i], + peers[i], + "rps", + &rps_connect_complete_cb, + &rps_peers[i], + &rps_connect_adapter, + &rps_disconnect_adapter, + &rps_peers[i]); + /* Connect all peers to statistics service */ + if (COLLECT_STATISTICS == cur_test_run.have_collect_statistics) + { + rps_peers[i].stat_op = + GNUNET_TESTBED_service_connect (NULL, + peers[i], + "statistics", + stat_complete_cb, + &rps_peers[i], + &stat_connect_adapter, + &stat_disconnect_adapter, + &rps_peers[i]); + } + } + + if (NULL != churn_task) + GNUNET_SCHEDULER_cancel (churn_task); + post_test_task = GNUNET_SCHEDULER_add_delayed (timeout, &post_test_op, NULL); + timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + (timeout_s * 1.2) + 0.1 * num_peers); + shutdown_task = GNUNET_SCHEDULER_add_delayed (timeout, &shutdown_op, NULL); + shutdown_task = GNUNET_SCHEDULER_add_shutdown (shutdown_op, NULL); + +} + + +/** + * Entry point for the testcase, sets up the testbed. + * + * @param argc unused + * @param argv unused + * @return 0 on success + */ +static void +run (void *cls, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + //int ret_value; + + /* Defaults for tests */ + churn_task = NULL; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "This is the profiler\n"); + cur_test_run.name = "test-rps-profiler"; + num_peers = 10; + mal_type = 3; + cur_test_run.init_peer = profiler_init_peer; + //cur_test_run.pre_test = mal_pre; + cur_test_run.pre_test = pre_profiler; + cur_test_run.main_test = profiler_cb; + cur_test_run.reply_handle = profiler_reply_handle; + cur_test_run.eval_cb = profiler_eval; + cur_test_run.post_test = post_profiler; + cur_test_run.request_interval = 2; + cur_test_run.num_requests = 5; + //cur_test_run.have_churn = HAVE_CHURN; + cur_test_run.have_churn = HAVE_NO_CHURN; + cur_test_run.have_quick_quit = HAVE_NO_QUICK_QUIT; + cur_test_run.have_collect_statistics = COLLECT_STATISTICS; + cur_test_run.stat_collect_flags = STAT_TYPE_ROUNDS | + STAT_TYPE_BLOCKS | + STAT_TYPE_BLOCKS_MANY_PUSH | + STAT_TYPE_BLOCKS_NO_PUSH | + STAT_TYPE_BLOCKS_NO_PULL | + STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL | + STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL | + STAT_TYPE_ISSUED_PUSH_SEND | + STAT_TYPE_ISSUED_PULL_REQ | + STAT_TYPE_ISSUED_PULL_REP | + STAT_TYPE_SENT_PUSH_SEND | + STAT_TYPE_SENT_PULL_REQ | + STAT_TYPE_SENT_PULL_REP | + STAT_TYPE_RECV_PUSH_SEND | + STAT_TYPE_RECV_PULL_REQ | + STAT_TYPE_RECV_PULL_REP; + cur_test_run.have_collect_view = COLLECT_VIEW; + timeout_s = 300; + + /* 'Clean' directory */ + (void) GNUNET_DISK_directory_remove ("/tmp/rps/"); + GNUNET_DISK_directory_create ("/tmp/rps/"); + timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_s); + + rps_peers = GNUNET_new_array (num_peers, struct RPSPeer); + peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO); + rps_peer_ids = GNUNET_new_array (num_peers, struct GNUNET_PeerIdentity); + if ( (2 == mal_type) || + (3 == mal_type)) + target_peer = &rps_peer_ids[num_peers - 2]; + if (profiler_eval == cur_test_run.eval_cb) + eval_peer = &rps_peers[num_peers - 1]; /* FIXME: eval_peer could be a + malicious peer if not careful + with the malicious portion */ + + ok = 1; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "before _run()\n"); + //ret_value = GNUNET_TESTBED_test_run (cur_test_run.name, + // "test_rps.conf", + // num_peers, + // 0, NULL, NULL, + // &test_run, NULL); + GNUNET_TESTBED_run (NULL, + cfg, + num_peers, + 0, /* event mask */ + NULL, + NULL, + &test_run, + NULL); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "after _run()\n"); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "gnunet-rps-profiler returned.\n"); +} + +/** + * Entry point for the testcase, sets up the testbed. + * + * @param argc unused + * @param argv unused + * @return 0 on success + */ +int +main (int argc, char *argv[]) +{ + int ret_value; + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_option_uint ('n', + "peers", + "COUNT", + gettext_noop ("number of peers to start"), + &num_peers), + GNUNET_GETOPT_OPTION_END + }; + + //if (GNUNET_OK != + // GNUNET_STRINGS_get_utf8_args (argc, argv, + // &argc, &argv)) + // return 2; + ret_value = 0; + if (GNUNET_OK != + GNUNET_PROGRAM_run (argc, + argv, + "gnunet-rps-profiler", + gettext_noop ("Measure quality and performance of the RPS service."), + options, + &run, + NULL)) + { + ret_value = 1; + } + if (GNUNET_OK != ret_value) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Test did not run successfully!\n"); + } + + ret_value = cur_test_run.eval_cb(); + if (NO_COLLECT_VIEW == cur_test_run.have_collect_view) + { + GNUNET_array_grow (rps_peers->cur_view, + rps_peers->cur_view_count, + 0); + } + GNUNET_free (rps_peers); + GNUNET_free (rps_peer_ids); + GNUNET_CONTAINER_multipeermap_destroy (peer_map); + printf ("test -1\n"); + return ret_value; +} + +/* end of test_rps.c */ diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index bae28428f6..39aeacfebc 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c @@ -40,6 +40,12 @@ */ static uint32_t num_peers; +/** + * How long do we run the test? + * In seconds. + */ +static uint32_t timeout_s; + /** * How long do we run the test? */ @@ -368,6 +374,11 @@ static unsigned int view_sizes; */ static int ok; +/** + * Identifier for the churn task that runs periodically + */ +static struct GNUNET_SCHEDULER_Task *post_test_task; + /** * Identifier for the churn task that runs periodically */ @@ -555,6 +566,11 @@ struct SingleTestRun uint32_t stat_collect_flags; } cur_test_run; +/** + * Did we finish the test? + */ +static int post_test; + /** * Are we shutting down? */ @@ -755,6 +771,41 @@ shutdown_op (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Shutdown task scheduled, going down.\n"); in_shutdown = GNUNET_YES; + if (NULL != post_test_task) + { + GNUNET_SCHEDULER_cancel (post_test_task); + } + if (NULL != churn_task) + { + GNUNET_SCHEDULER_cancel (churn_task); + churn_task = NULL; + } + for (i = 0; i < num_peers; i++) + { + if (NULL != rps_peers[i].rps_handle) + { + GNUNET_RPS_disconnect (rps_peers[i].rps_handle); + } + if (NULL != rps_peers[i].op) + { + GNUNET_TESTBED_operation_done (rps_peers[i].op); + } + } +} + + +/** + * Task run on timeout to collect statistics and potentially shut down. + */ +static void +post_test_op (void *cls) +{ + unsigned int i; + + post_test_task = NULL; + post_test = GNUNET_YES; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Post test task scheduled, going down.\n"); if (NULL != churn_task) { GNUNET_SCHEDULER_cancel (churn_task); @@ -763,7 +814,10 @@ shutdown_op (void *cls) for (i = 0; i < num_peers; i++) { if (NULL != rps_peers[i].op) + { GNUNET_TESTBED_operation_done (rps_peers[i].op); + rps_peers[i].op = NULL; + } if (NULL != cur_test_run.post_test) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing post_test for peer %u\n", i); @@ -847,7 +901,7 @@ info_cb (void *cb_cls, { struct OpListEntry *entry = (struct OpListEntry *) cb_cls; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -901,7 +955,7 @@ rps_connect_complete_cb (void *cls, struct RPSPeer *rps_peer = cls; struct GNUNET_RPS_Handle *rps = ca_result; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1105,10 +1159,10 @@ default_reply_handle (void *cls, if (0 == evaluate () && HAVE_QUICK_QUIT == cur_test_run.have_quick_quit) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test succeeded before timeout\n"); - GNUNET_assert (NULL != shutdown_task); - GNUNET_SCHEDULER_cancel (shutdown_task); - shutdown_task = GNUNET_SCHEDULER_add_now (&shutdown_op, NULL); - GNUNET_assert (NULL!= shutdown_task); + GNUNET_assert (NULL != post_test_task); + GNUNET_SCHEDULER_cancel (post_test_task); + post_test_task = GNUNET_SCHEDULER_add_now (&post_test_op, NULL); + GNUNET_assert (NULL!= post_test_task); } } @@ -1122,7 +1176,7 @@ request_peers (void *cls) struct RPSPeer *rps_peer; struct PendingReply *pending_rep; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) return; rps_peer = pending_req->rps_peer; GNUNET_assert (1 <= rps_peer->num_pending_reqs); @@ -1185,7 +1239,7 @@ cancel_request_cb (void *cls) struct RPSPeer *rps_peer = cls; struct PendingReply *pending_rep; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) return; pending_rep = rps_peer->pending_rep_head; GNUNET_assert (1 <= rps_peer->num_pending_reps); @@ -1290,7 +1344,7 @@ mal_cb (struct RPSPeer *rps_peer) { uint32_t num_mal_peers; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1317,7 +1371,7 @@ mal_cb (struct RPSPeer *rps_peer) static void single_req_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1331,7 +1385,7 @@ single_req_cb (struct RPSPeer *rps_peer) static void delay_req_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1345,7 +1399,7 @@ delay_req_cb (struct RPSPeer *rps_peer) static void seed_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1361,7 +1415,7 @@ seed_cb (struct RPSPeer *rps_peer) static void seed_big_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1387,7 +1441,7 @@ single_peer_seed_cb (struct RPSPeer *rps_peer) static void seed_req_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1406,7 +1460,7 @@ seed_req_cb (struct RPSPeer *rps_peer) static void req_cancel_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1439,7 +1493,7 @@ churn (void *cls); static void churn_test_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1480,7 +1534,7 @@ churn_cb (void *cls, // FIXME struct OpListEntry *entry = cls; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1615,7 +1669,7 @@ churn (void *cls) double portion_go_online; double portion_go_offline; - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -1731,7 +1785,7 @@ profiler_reply_handle (void *cls, static void profiler_cb (struct RPSPeer *rps_peer) { - if (GNUNET_YES == in_shutdown) + if (GNUNET_YES == in_shutdown || GNUNET_YES == post_test) { return; } @@ -2644,7 +2698,12 @@ run (void *cls, if (NULL != churn_task) GNUNET_SCHEDULER_cancel (churn_task); + post_test_task = GNUNET_SCHEDULER_add_delayed (timeout, &post_test_op, NULL); + timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + (timeout_s * 1.2) + 0.1 * num_peers); shutdown_task = GNUNET_SCHEDULER_add_delayed (timeout, &shutdown_op, NULL); + shutdown_task = GNUNET_SCHEDULER_add_shutdown (shutdown_op, NULL); + } @@ -2673,7 +2732,7 @@ main (int argc, char *argv[]) cur_test_run.stat_collect_flags = 0; cur_test_run.have_collect_view = NO_COLLECT_VIEW; churn_task = NULL; - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30); + timeout_s = 30; if (strstr (argv[0], "malicious") != NULL) { @@ -2725,7 +2784,7 @@ main (int argc, char *argv[]) cur_test_run.main_test = seed_big_cb; cur_test_run.eval_cb = no_eval; cur_test_run.have_churn = HAVE_NO_CHURN; - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10); + timeout_s = 10; } else if (strstr (argv[0], "_single_peer_seed") != NULL) @@ -2761,7 +2820,7 @@ main (int argc, char *argv[]) cur_test_run.main_test = req_cancel_cb; cur_test_run.eval_cb = no_eval; cur_test_run.have_churn = HAVE_NO_CHURN; - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10); + timeout_s = 10; } else if (strstr (argv[0], "_churn") != NULL) @@ -2775,7 +2834,7 @@ main (int argc, char *argv[]) cur_test_run.eval_cb = default_eval_cb; cur_test_run.have_churn = HAVE_NO_CHURN; cur_test_run.have_quick_quit = HAVE_NO_QUICK_QUIT; - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10); + timeout_s = 10; } else if (strstr (argv[0], "profiler") != NULL) @@ -2814,12 +2873,13 @@ main (int argc, char *argv[]) STAT_TYPE_RECV_PULL_REQ | STAT_TYPE_RECV_PULL_REP; cur_test_run.have_collect_view = COLLECT_VIEW; - timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300); + timeout_s = 150; /* 'Clean' directory */ (void) GNUNET_DISK_directory_remove ("/tmp/rps/"); GNUNET_DISK_directory_create ("/tmp/rps/"); } + timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_s); rps_peers = GNUNET_new_array (num_peers, struct RPSPeer); peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO); diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf index cf6b3150c1..e4ed111e2a 100644 --- a/src/rps/test_rps.conf +++ b/src/rps/test_rps.conf @@ -33,7 +33,7 @@ OVERLAY_TOPOLOGY = CLIQUE # OVERLAY_RANDOM_LINKS = 25 -# SETUP_TIMEOUT = 2 m +SETUP_TIMEOUT = 2 m [nse] WORKBITS = 0 -- cgit v1.2.3-18-g5258 From 7f6b8047649d371429e55b99d31870e25e803541 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Wed, 6 Jun 2018 00:35:23 +0200 Subject: rps service: rename option in config --- src/rps/rps.conf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in index b5feb1bd25..733b726012 100644 --- a/src/rps/rps.conf.in +++ b/src/rps/rps.conf.in @@ -24,4 +24,4 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt # until we receive the first estimate from NSE. # Keep in mind, that (networksize)^(1/3) should be enough. # So, 50 is enough for a network of size 50^3 = 125000 -INITSIZE = 10 +MINSIZE = 10 -- cgit v1.2.3-18-g5258 From b93343673958f368ec4f777cb7ae6d87fd7cae07 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Wed, 6 Jun 2018 01:11:58 +0200 Subject: fix ftbfs --- src/include/gnunet_util_lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index e82e6caee9..c5d5db3748 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h @@ -58,7 +58,7 @@ extern "C" * THIS release. Otherwise, you are violating the Affero GPL if you make * this service available to anyone but yourself. */ -#define GNUNET_AGPL_URL "https://gnunet.org/git/gnunet.git#" PACKAGE_VERSION; +#define GNUNET_AGPL_URL "https://gnunet.org/git/gnunet.git#" PACKAGE_VERSION #include "gnunet_crypto_lib.h" -- cgit v1.2.3-18-g5258 From e2d0c3b009e3a52d84d484460210c16072f5d461 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Tue, 5 Jun 2018 23:11:59 +0000 Subject: less heteronormative function names (SCNR) --- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/sv.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- src/cadet/gnunet-service-cadet_tunnels.c | 12 ++++++------ src/core/gnunet-service-core_kx.c | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/de.po b/po/de.po index b3eff360dd..b436174126 100644 --- a/po/de.po +++ b/po/de.po @@ -1340,7 +1340,7 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/po/es.po b/po/es.po index 2bd5655fbb..1fdd8f54d9 100644 --- a/po/es.po +++ b/po/es.po @@ -1421,7 +1421,7 @@ msgstr "# mensajes «SET_KEY» descifrados" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index a18337c11e..3541215e8d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1313,7 +1313,7 @@ msgstr "" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index d6f9dfe28f..a512b655d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1363,7 +1363,7 @@ msgstr "# PING-meddelanden skapade" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/po/vi.po b/po/vi.po index 7303a51765..8d8b9f144c 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1371,7 +1371,7 @@ msgstr "# các thông báo được chắp liền" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index cc98cc49e7..4e77d8c08d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1341,7 +1341,7 @@ msgstr "" #: src/core/gnunet-service-core_kx.c:1054 #, c-format msgid "" -"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match " +"EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 5c52eb6164..ef6f97622a 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -459,13 +459,13 @@ struct CadetTunnel /** - * Am I Alice or Bob, or talking to myself? + * Am I Alice or Betty (some call her Bob), or talking to myself? * * @param other the other peer - * @return #GNUNET_YES for Alice, #GNUNET_NO for Bob, #GNUNET_SYSERR if talking to myself + * @return #GNUNET_YES for Alice, #GNUNET_NO for Betty, #GNUNET_SYSERR if talking to myself */ static int -alice_or_bob (const struct GNUNET_PeerIdentity *other) +alice_or_betty (const struct GNUNET_PeerIdentity *other) { if (0 > GNUNET_CRYPTO_cmp_peer_identity (&my_full_id, other)) @@ -1347,7 +1347,7 @@ send_kx (struct CadetTunnel *t, struct GNUNET_CADET_TunnelKeyExchangeMessage *msg; enum GNUNET_CADET_KX_Flags flags; - if (GNUNET_YES != alice_or_bob (GCP_get_id (t->destination))) + if (GNUNET_YES != alice_or_betty (GCP_get_id (t->destination))) return; /* only Alice may send KX */ if ( (NULL == ct) || (GNUNET_NO == ct->is_ready) ) @@ -1523,7 +1523,7 @@ update_ax_by_kx (struct CadetTunnelAxolotl *ax, const char salt[] = "CADET Axolotl salt"; int am_I_alice; - if (GNUNET_SYSERR == (am_I_alice = alice_or_bob (pid))) + if (GNUNET_SYSERR == (am_I_alice = alice_or_betty (pid))) { GNUNET_break_op (0); return GNUNET_SYSERR; @@ -1726,7 +1726,7 @@ GCT_handle_kx (struct CadetTConnection *ct, 1, GNUNET_NO); if (GNUNET_YES == - alice_or_bob (GCP_get_id (t->destination))) + alice_or_betty (GCP_get_id (t->destination))) { /* Bob is not allowed to send KX! */ GNUNET_break_op (0); diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 21f1308f78..1f1a476774 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -1051,7 +1051,7 @@ handle_ephemeral_key (void *cls, (start_t.abs_value_us > GNUNET_TIME_absolute_add (now, REKEY_TOLERANCE).abs_value_us) ) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("EPHERMAL_KEY from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), + _("EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), GNUNET_i2s (kx->peer), (unsigned long long) now.abs_value_us, (unsigned long long) start_t.abs_value_us, @@ -1490,7 +1490,7 @@ send_key (struct GSC_KeyExchangeInfo *kx) sizeof (current_ekm.ephemeral_key), &hc); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending EPHERMERAL_KEY %s to `%s' (my status: %d)\n", + "Sending EPHEMERAL_KEY %s to `%s' (my status: %d)\n", GNUNET_h2s (&hc), GNUNET_i2s (kx->peer), kx->status); -- cgit v1.2.3-18-g5258 From 6c00dd6956137073801820689a14334b25b31a9a Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Tue, 5 Jun 2018 23:12:00 +0000 Subject: afferify COPYING and the contrib folders --- COPYING | 149 ++++++++++++--------------- contrib/scripts/documentation/gnunet-doc.scm | 15 +-- contrib/scripts/gnunet-chk.py.in | 15 +-- contrib/scripts/gnunet_janitor.py.in | 15 +-- contrib/scripts/gnunet_pyexpect.py.in | 15 +-- contrib/scripts/terminate.py.in | 15 +-- contrib/test_gnunet_prefix.c | 23 ++--- contrib/timeout_watchdog.c | 15 +-- contrib/timeout_watchdog_w32.c | 15 +-- src/cadet/gnunet-service-cadet_tunnels.c | 2 +- 10 files changed, 113 insertions(+), 166 deletions(-) diff --git a/COPYING b/COPYING index 94a9ed024d..dbbe355815 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see . - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/contrib/scripts/documentation/gnunet-doc.scm b/contrib/scripts/documentation/gnunet-doc.scm index d8c16fdb35..2c0509dc38 100644 --- a/contrib/scripts/documentation/gnunet-doc.scm +++ b/contrib/scripts/documentation/gnunet-doc.scm @@ -1,20 +1,15 @@ ;;; This file is part of GNUnet. ;;; Copyright (C) 2016, 2017 GNUnet e.V. ;;; -;;; GNUnet is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published -;;; by the Free Software Foundation; either version 3, or (at your -;;; option) any later version. +;;; GNUnet is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU Affero General Public License as published +;;; by the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. ;;; ;;; GNUnet is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;; General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNUnet; see the file COPYING. If not, write to the -;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;;; Boston, MA 02110-1301, USA. +;;; Affero General Public License for more details. ;;; (use-modules diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index c976b2143d..02de2f7361 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2013, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 3, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # File: gnunet-chk.py # Brief: Computes GNUNET style Content Hash Key for a given file diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index 91d2a43778..8a891f0dc8 100644 --- a/contrib/scripts/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2011, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Finds any gnunet processes still running in the system and kills them # diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index 23f01603f5..8908ca6a88 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for gnunet-peerinfo from __future__ import print_function diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in index c6acfdba8b..f3cfb23f5b 100644 --- a/contrib/scripts/terminate.py.in +++ b/contrib/scripts/terminate.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2011, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Utility module that implements safe process termination for W32. # For other platforms it's equivalent to Popen.kill () diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c index 0e5325d5f8..5d85912360 100644 --- a/contrib/test_gnunet_prefix.c +++ b/contrib/test_gnunet_prefix.c @@ -1,21 +1,16 @@ /* - This file is part of GNUnet + This file is part of GNUnet Copyright (C) 2011, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** diff --git a/contrib/timeout_watchdog.c b/contrib/timeout_watchdog.c index fc61a7cc77..f8ec459bd9 100644 --- a/contrib/timeout_watchdog.c +++ b/contrib/timeout_watchdog.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/contrib/timeout_watchdog_w32.c b/contrib/timeout_watchdog_w32.c index fa7cd81fd9..0c27388a24 100644 --- a/contrib/timeout_watchdog_w32.c +++ b/contrib/timeout_watchdog_w32.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index ef6f97622a..ed1eaf1678 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -1728,7 +1728,7 @@ GCT_handle_kx (struct CadetTConnection *ct, if (GNUNET_YES == alice_or_betty (GCP_get_id (t->destination))) { - /* Bob is not allowed to send KX! */ + /* Betty/Bob is not allowed to send KX! */ GNUNET_break_op (0); return; } -- cgit v1.2.3-18-g5258 From cbd60b5e56aac2d6711e299086383f83357794f8 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Tue, 5 Jun 2018 23:12:01 +0000 Subject: first batch of license fixes (boring) --- src/abe/abe.c | 15 +++++---------- src/abe/test_cpabe.c | 15 +++++---------- src/arm/arm.h | 15 +++++---------- src/arm/arm_api.c | 15 +++++---------- src/arm/arm_monitor_api.c | 15 +++++---------- src/arm/gnunet-arm.c | 15 +++++---------- src/arm/gnunet-service-arm.c | 15 +++++---------- src/arm/mockup-service.c | 15 +++++---------- src/arm/test_arm_api.c | 15 +++++---------- src/arm/test_exponential_backoff.c | 15 +++++---------- src/arm/test_gnunet_service_arm.c | 15 +++++---------- src/ats-tests/ats-testing-experiment.c | 15 +++++---------- src/ats-tests/ats-testing-log.c | 15 +++++---------- src/ats-tests/ats-testing-preferences.c | 15 +++++---------- src/ats-tests/ats-testing-traffic.c | 15 +++++---------- src/ats-tests/ats-testing.c | 15 +++++---------- src/ats-tests/ats-testing.h | 15 +++++---------- src/ats-tests/gnunet-ats-sim.c | 15 +++++---------- src/ats-tests/gnunet-solver-eval.c | 15 +++++---------- src/ats-tests/perf_ats.c | 15 +++++---------- src/ats-tests/perf_ats.h | 15 +++++---------- src/ats-tests/perf_ats_logging.c | 15 +++++---------- src/ats-tool/gnunet-ats.c | 15 +++++---------- src/ats/ats.h | 15 +++++---------- src/ats/ats_api_connectivity.c | 15 +++++---------- src/ats/ats_api_performance.c | 15 +++++---------- src/ats/ats_api_scanner.c | 15 +++++---------- src/ats/ats_api_scheduling.c | 15 +++++---------- src/ats/gnunet-ats-solver-eval.c | 15 +++++---------- src/ats/gnunet-ats-solver-eval.h | 15 +++++---------- src/ats/gnunet-service-ats.c | 15 +++++---------- src/ats/gnunet-service-ats.h | 15 +++++---------- src/ats/gnunet-service-ats_addresses.c | 15 +++++---------- src/ats/gnunet-service-ats_addresses.h | 15 +++++---------- src/ats/gnunet-service-ats_connectivity.c | 15 +++++---------- src/ats/gnunet-service-ats_connectivity.h | 15 +++++---------- src/ats/gnunet-service-ats_normalization.c | 15 +++++---------- src/ats/gnunet-service-ats_normalization.h | 15 +++++---------- src/ats/gnunet-service-ats_performance.c | 15 +++++---------- src/ats/gnunet-service-ats_performance.h | 15 +++++---------- src/ats/gnunet-service-ats_plugins.c | 15 +++++---------- src/ats/gnunet-service-ats_plugins.h | 15 +++++---------- src/ats/gnunet-service-ats_preferences.c | 15 +++++---------- src/ats/gnunet-service-ats_preferences.h | 15 +++++---------- src/ats/gnunet-service-ats_reservations.c | 15 +++++---------- src/ats/gnunet-service-ats_reservations.h | 15 +++++---------- src/ats/gnunet-service-ats_scheduling.c | 15 +++++---------- src/ats/gnunet-service-ats_scheduling.h | 15 +++++---------- src/ats/perf_ats_solver.c | 15 +++++---------- src/ats/plugin_ats_mlp.c | 15 +++++---------- src/ats/plugin_ats_proportional.c | 15 +++++---------- src/ats/plugin_ats_ril.c | 15 +++++---------- src/ats/test_ats_api.c | 15 +++++---------- src/ats/test_ats_lib.c | 15 +++++---------- src/ats/test_ats_lib.h | 15 +++++---------- src/ats/test_ats_reservation_api.c | 15 +++++---------- src/auction/auction.h | 15 +++++---------- src/auction/gnunet-auction-create.c | 15 +++++---------- src/auction/gnunet-auction-info.c | 15 +++++---------- src/auction/gnunet-auction-join.c | 15 +++++---------- src/auction/gnunet-service-auction.c | 15 +++++---------- src/auction/test_auction_api.c | 15 +++++---------- src/block/bg_bf.c | 15 +++++---------- src/block/block.c | 15 +++++---------- src/block/plugin_block_template.c | 15 +++++---------- src/block/plugin_block_test.c | 15 +++++---------- src/cadet/cadet.h | 15 +++++---------- src/cadet/cadet_api.c | 15 +++++---------- src/cadet/cadet_protocol.h | 15 +++++---------- src/cadet/cadet_test_lib.c | 15 +++++---------- src/cadet/cadet_test_lib.h | 15 +++++---------- src/cadet/gnunet-cadet-profiler.c | 15 +++++---------- src/cadet/gnunet-cadet.c | 15 +++++---------- src/cadet/gnunet-service-cadet.c | 15 +++++---------- src/cadet/gnunet-service-cadet.h | 15 +++++---------- src/cadet/gnunet-service-cadet_channel.c | 15 +++++---------- src/cadet/gnunet-service-cadet_channel.h | 15 +++++---------- src/cadet/gnunet-service-cadet_connection.c | 15 +++++---------- src/cadet/gnunet-service-cadet_connection.h | 15 +++++---------- src/cadet/gnunet-service-cadet_core.c | 15 +++++---------- src/cadet/gnunet-service-cadet_core.h | 15 +++++---------- src/cadet/gnunet-service-cadet_dht.c | 15 +++++---------- src/cadet/gnunet-service-cadet_dht.h | 15 +++++---------- src/cadet/gnunet-service-cadet_hello.c | 15 +++++---------- src/cadet/gnunet-service-cadet_hello.h | 15 +++++---------- src/cadet/gnunet-service-cadet_paths.c | 15 +++++---------- src/cadet/gnunet-service-cadet_paths.h | 15 +++++---------- src/cadet/gnunet-service-cadet_peer.c | 15 +++++---------- src/cadet/gnunet-service-cadet_peer.h | 15 +++++---------- src/cadet/gnunet-service-cadet_tunnels.c | 15 +++++---------- src/cadet/gnunet-service-cadet_tunnels.h | 15 +++++---------- src/cadet/test_cadet.c | 15 +++++---------- src/cadet/test_cadet_flow.c | 15 +++++---------- src/cadet/test_cadet_local_mq.c | 15 +++++---------- src/consensus/consensus-simulation.py.in | 15 +++++---------- src/consensus/consensus.h | 15 +++++---------- src/consensus/consensus_api.c | 15 +++++---------- src/consensus/consensus_protocol.h | 15 +++++---------- src/consensus/gnunet-consensus-profiler.c | 15 +++++---------- src/consensus/gnunet-service-consensus.c | 15 +++++---------- src/consensus/plugin_block_consensus.c | 15 +++++---------- src/consensus/test_consensus_api.c | 15 +++++---------- src/conversation/conversation.h | 15 +++++---------- src/conversation/conversation_api.c | 15 +++++---------- src/conversation/conversation_api_call.c | 15 +++++---------- src/conversation/gnunet-conversation-test.c | 15 +++++---------- src/conversation/gnunet-conversation.c | 15 +++++---------- src/conversation/gnunet-helper-audio-playback-gst.c | 15 +++++---------- src/conversation/gnunet-helper-audio-playback.c | 15 +++++---------- src/conversation/gnunet-helper-audio-record-gst.c | 15 +++++---------- src/conversation/gnunet-helper-audio-record.c | 15 +++++---------- src/conversation/gnunet-service-conversation.c | 15 +++++---------- src/conversation/gnunet_gst.c | 15 +++++---------- src/conversation/gnunet_gst.h | 15 +++++---------- src/conversation/gnunet_gst_def.h | 15 +++++---------- src/conversation/gnunet_gst_test.c | 15 +++++---------- src/conversation/microphone.c | 15 +++++---------- src/conversation/plugin_gnsrecord_conversation.c | 15 +++++---------- src/conversation/speaker.c | 15 +++++---------- src/conversation/test_conversation_api.c | 15 +++++---------- src/conversation/test_conversation_api_reject.c | 15 +++++---------- src/conversation/test_conversation_api_twocalls.c | 15 +++++---------- src/core/core.h | 15 +++++---------- src/core/core_api.c | 15 +++++---------- src/core/core_api_monitor_peers.c | 15 +++++---------- src/core/gnunet-core.c | 15 +++++---------- src/core/gnunet-service-core.c | 15 +++++---------- src/core/gnunet-service-core.h | 15 +++++---------- src/core/gnunet-service-core_kx.c | 15 +++++---------- src/core/gnunet-service-core_kx.h | 15 +++++---------- src/core/gnunet-service-core_sessions.c | 15 +++++---------- src/core/gnunet-service-core_sessions.h | 15 +++++---------- src/core/gnunet-service-core_typemap.c | 15 +++++---------- src/core/gnunet-service-core_typemap.h | 15 +++++---------- src/core/test_core_api.c | 15 +++++---------- src/core/test_core_api_reliability.c | 15 +++++---------- src/core/test_core_api_send_to_self.c | 15 +++++---------- src/core/test_core_api_start_only.c | 15 +++++---------- src/core/test_core_quota_compliance.c | 15 +++++---------- src/credential/credential.h | 15 +++++---------- src/credential/credential_api.c | 15 +++++---------- src/credential/credential_misc.c | 15 +++++---------- src/credential/credential_misc.h | 15 +++++---------- src/credential/credential_serialization.c | 15 +++++---------- src/credential/credential_serialization.h | 15 +++++---------- src/credential/gnunet-credential.c | 15 +++++---------- src/credential/gnunet-service-credential.c | 15 +++++---------- src/credential/plugin_gnsrecord_credential.c | 15 +++++---------- src/credential/plugin_rest_credential.c | 15 +++++---------- src/datacache/datacache.c | 15 +++++---------- src/datacache/perf_datacache.c | 15 +++++---------- src/datacache/plugin_datacache_heap.c | 15 +++++---------- src/datacache/plugin_datacache_postgres.c | 15 +++++---------- src/datacache/plugin_datacache_sqlite.c | 15 +++++---------- src/datacache/plugin_datacache_template.c | 15 +++++---------- src/datacache/test_datacache.c | 15 +++++---------- src/datacache/test_datacache_quota.c | 15 +++++---------- src/datastore/datastore.h | 15 +++++---------- src/datastore/datastore_api.c | 15 +++++---------- src/datastore/gnunet-datastore.c | 15 +++++---------- src/datastore/gnunet-service-datastore.c | 15 +++++---------- src/datastore/perf_datastore_api.c | 15 +++++---------- src/datastore/perf_plugin_datastore.c | 15 +++++---------- src/datastore/plugin_datastore_heap.c | 15 +++++---------- src/datastore/plugin_datastore_mysql.c | 15 +++++---------- src/datastore/plugin_datastore_postgres.c | 15 +++++---------- src/datastore/plugin_datastore_sqlite.c | 15 +++++---------- src/datastore/plugin_datastore_template.c | 15 +++++---------- src/datastore/test_datastore_api.c | 15 +++++---------- src/datastore/test_datastore_api_management.c | 15 +++++---------- src/datastore/test_plugin_datastore.c | 15 +++++---------- src/dht/dht.h | 15 +++++---------- src/dht/dht_api.c | 15 +++++---------- src/dht/dht_test_lib.c | 15 +++++---------- src/dht/dht_test_lib.h | 15 +++++---------- src/dht/gnunet-dht-get.c | 15 +++++---------- src/dht/gnunet-dht-monitor.c | 15 +++++---------- src/dht/gnunet-dht-put.c | 15 +++++---------- src/dht/gnunet-service-dht.c | 15 +++++---------- src/dht/gnunet-service-dht.h | 15 +++++---------- src/dht/gnunet-service-dht_clients.c | 15 +++++---------- src/dht/gnunet-service-dht_datacache.c | 15 +++++---------- src/dht/gnunet-service-dht_datacache.h | 15 +++++---------- src/dht/gnunet-service-dht_hello.c | 15 +++++---------- src/dht/gnunet-service-dht_hello.h | 15 +++++---------- src/dht/gnunet-service-dht_neighbours.c | 15 +++++---------- src/dht/gnunet-service-dht_neighbours.h | 15 +++++---------- src/dht/gnunet-service-dht_nse.c | 15 +++++---------- src/dht/gnunet-service-dht_nse.h | 15 +++++---------- src/dht/gnunet-service-dht_routing.c | 15 +++++---------- src/dht/gnunet-service-dht_routing.h | 15 +++++---------- src/dht/gnunet_dht_profiler.c | 15 +++++---------- src/dht/plugin_block_dht.c | 15 +++++---------- src/dht/test_dht_api.c | 15 +++++---------- src/dht/test_dht_monitor.c | 15 +++++---------- src/dht/test_dht_topo.c | 15 +++++---------- src/dns/dns.h | 15 +++++---------- src/dns/dns_api.c | 15 +++++---------- src/dns/dnsparser.c | 15 +++++---------- src/dns/dnsstub.c | 15 +++++---------- src/dns/gnunet-dns-monitor.c | 15 +++++---------- src/dns/gnunet-dns-redirector.c | 15 +++++---------- src/dns/gnunet-helper-dns.c | 15 +++++---------- src/dns/gnunet-service-dns.c | 15 +++++---------- src/dns/gnunet-zonewalk.c | 15 +++++---------- src/dns/plugin_block_dns.c | 15 +++++---------- src/dns/test_hexcoder.c | 15 +++++---------- src/dv/dv.h | 15 +++++---------- src/dv/dv_api.c | 15 +++++---------- src/dv/gnunet-dv.c | 15 +++++---------- src/dv/gnunet-service-dv.c | 15 +++++---------- src/dv/plugin_transport_dv.c | 15 +++++---------- src/dv/test_transport_blacklist.c | 15 +++++---------- src/dv/test_transport_dv.c | 15 +++++---------- src/exit/exit.h | 15 +++++---------- src/exit/gnunet-daemon-exit.c | 15 +++++---------- src/exit/gnunet-helper-exit-windows.c | 15 +++++---------- src/exit/gnunet-helper-exit.c | 15 +++++---------- src/fragmentation/defragmentation.c | 15 +++++---------- src/fragmentation/fragmentation.c | 15 +++++---------- src/fragmentation/fragmentation.h | 15 +++++---------- src/fragmentation/test_fragmentation.c | 15 +++++---------- src/fragmentation/test_fragmentation_parallel.c | 15 +++++---------- src/fs/fs.h | 15 +++++---------- src/fs/fs_api.c | 15 +++++---------- src/fs/fs_api.h | 15 +++++---------- src/fs/fs_directory.c | 15 +++++---------- src/fs/fs_dirmetascan.c | 15 +++++---------- src/fs/fs_download.c | 15 +++++---------- src/fs/fs_file_information.c | 15 +++++---------- src/fs/fs_getopt.c | 15 +++++---------- src/fs/fs_list_indexed.c | 15 +++++---------- src/fs/fs_misc.c | 15 +++++---------- src/fs/fs_namespace.c | 15 +++++---------- src/fs/fs_publish.c | 15 +++++---------- src/fs/fs_publish_ksk.c | 15 +++++---------- src/fs/fs_publish_ublock.c | 15 +++++---------- src/fs/fs_publish_ublock.h | 15 +++++---------- src/fs/fs_sharetree.c | 15 +++++---------- src/fs/fs_test_lib.c | 15 +++++---------- src/fs/fs_test_lib.h | 15 +++++---------- src/fs/fs_tree.c | 15 +++++---------- src/fs/fs_tree.h | 15 +++++---------- src/fs/fs_unindex.c | 15 +++++---------- src/fs/fs_uri.c | 15 +++++---------- src/fs/gnunet-auto-share.c | 15 +++++---------- src/fs/gnunet-daemon-fsprofiler.c | 15 +++++---------- src/fs/gnunet-directory.c | 15 +++++---------- src/fs/gnunet-download.c | 15 +++++---------- src/fs/gnunet-fs-profiler.c | 15 +++++---------- src/fs/gnunet-fs.c | 15 +++++---------- src/fs/gnunet-helper-fs-publish.c | 15 +++++---------- src/fs/gnunet-publish.c | 15 +++++---------- src/fs/gnunet-search.c | 15 +++++---------- src/fs/gnunet-service-fs.c | 15 +++++---------- src/fs/gnunet-service-fs.h | 15 +++++---------- src/fs/gnunet-service-fs_cadet.h | 15 +++++---------- src/fs/gnunet-service-fs_cadet_client.c | 15 +++++---------- src/fs/gnunet-service-fs_cadet_server.c | 15 +++++---------- src/fs/gnunet-service-fs_cp.c | 15 +++++---------- src/fs/gnunet-service-fs_cp.h | 15 +++++---------- src/fs/gnunet-service-fs_indexing.c | 15 +++++---------- src/fs/gnunet-service-fs_indexing.h | 15 +++++---------- src/fs/gnunet-service-fs_pe.c | 15 +++++---------- src/fs/gnunet-service-fs_pe.h | 15 +++++---------- src/fs/gnunet-service-fs_pr.c | 15 +++++---------- src/fs/gnunet-service-fs_pr.h | 15 +++++---------- src/fs/gnunet-service-fs_push.c | 15 +++++---------- src/fs/gnunet-service-fs_push.h | 15 +++++---------- src/fs/gnunet-service-fs_put.c | 15 +++++---------- src/fs/gnunet-service-fs_put.h | 15 +++++---------- src/fs/gnunet-unindex.c | 15 +++++---------- src/fs/perf_gnunet_service_fs_p2p.c | 15 +++++---------- src/fs/perf_gnunet_service_fs_p2p_respect.c | 15 +++++---------- src/fs/plugin_block_fs.c | 15 +++++---------- src/fs/test_fs.c | 15 +++++---------- src/fs/test_fs_directory.c | 15 +++++---------- src/fs/test_fs_download.c | 15 +++++---------- src/fs/test_fs_download_persistence.c | 15 +++++---------- src/fs/test_fs_file_information.c | 15 +++++---------- src/fs/test_fs_getopt.c | 15 +++++---------- src/fs/test_fs_list_indexed.c | 15 +++++---------- src/fs/test_fs_namespace.c | 15 +++++---------- src/fs/test_fs_namespace_list_updateable.c | 15 +++++---------- src/fs/test_fs_publish.c | 15 +++++---------- src/fs/test_fs_publish_persistence.c | 15 +++++---------- src/fs/test_fs_search.c | 15 +++++---------- src/fs/test_fs_search_persistence.c | 15 +++++---------- src/fs/test_fs_search_probes.c | 15 +++++---------- src/fs/test_fs_search_with_and.c | 15 +++++---------- src/fs/test_fs_start_stop.c | 15 +++++---------- src/fs/test_fs_test_lib.c | 15 +++++---------- src/fs/test_fs_unindex.c | 15 +++++---------- src/fs/test_fs_unindex_persistence.c | 15 +++++---------- src/fs/test_fs_uri.c | 15 +++++---------- src/fs/test_gnunet_fs_idx.py.in | 15 +++++---------- src/fs/test_gnunet_fs_psd.py.in | 15 +++++---------- src/fs/test_gnunet_fs_rec.py.in | 15 +++++---------- src/fs/test_gnunet_service_fs_migration.c | 15 +++++---------- src/fs/test_gnunet_service_fs_p2p.c | 15 +++++---------- src/fs/test_plugin_block_fs.c | 15 +++++---------- src/gns/gns.h | 15 +++++---------- src/gns/gns_api.c | 15 +++++---------- src/gns/gns_api.h | 15 +++++---------- src/gns/gns_tld_api.c | 15 +++++---------- src/gns/gnunet-bcd.c | 15 +++++---------- src/gns/gnunet-dns2gns.c | 15 +++++---------- src/gns/gnunet-gns-benchmark.c | 15 +++++---------- src/gns/gnunet-gns-helper-service-w32.c | 15 +++++---------- src/gns/gnunet-gns-import.c | 15 +++++---------- src/gns/gnunet-gns-proxy.c | 15 +++++---------- src/gns/gnunet-gns.c | 15 +++++---------- src/gns/gnunet-service-gns.c | 15 +++++---------- src/gns/gnunet-service-gns.h | 15 +++++---------- src/gns/gnunet-service-gns_interceptor.c | 15 +++++---------- src/gns/gnunet-service-gns_interceptor.h | 15 +++++---------- src/gns/gnunet-service-gns_resolver.c | 15 +++++---------- src/gns/gnunet-service-gns_resolver.h | 15 +++++---------- src/gns/nss/nss_gns_query.c | 15 +++++---------- src/gns/nss/nss_gns_query.h | 15 +++++---------- src/gns/plugin_block_gns.c | 15 +++++---------- src/gns/plugin_gnsrecord_gns.c | 15 +++++---------- src/gns/plugin_rest_gns.c | 15 +++++---------- src/gns/test_gns_proxy.c | 15 +++++---------- src/gns/w32nsp-install.c | 15 +++++---------- src/gns/w32nsp-resolve.c | 15 +++++---------- src/gns/w32nsp.c | 15 +++++---------- src/gns/w32resolver.h | 15 +++++---------- src/gnsrecord/gnsrecord.c | 15 +++++---------- src/gnsrecord/gnsrecord_crypto.c | 15 +++++---------- src/gnsrecord/gnsrecord_misc.c | 15 +++++---------- src/gnsrecord/gnsrecord_serialization.c | 15 +++++---------- src/gnsrecord/perf_gnsrecord_crypto.c | 15 +++++---------- src/gnsrecord/plugin_gnsrecord_dns.c | 15 +++++---------- src/gnsrecord/test_gnsrecord_block_expiration.c | 15 +++++---------- src/gnsrecord/test_gnsrecord_crypto.c | 15 +++++---------- src/gnsrecord/test_gnsrecord_serialization.c | 15 +++++---------- src/hello/address.c | 15 +++++---------- src/hello/gnunet-hello.c | 15 +++++---------- src/hello/hello.c | 15 +++++---------- src/hello/test_friend_hello.c | 15 +++++---------- src/hello/test_hello.c | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist.c | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist.h | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist_client.c | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist_client.h | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist_server.c | 15 +++++---------- src/hostlist/gnunet-daemon-hostlist_server.h | 15 +++++---------- src/hostlist/test_gnunet_daemon_hostlist.c | 15 +++++---------- src/hostlist/test_gnunet_daemon_hostlist_learning.c | 15 +++++---------- src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 15 +++++---------- src/identity-attribute/identity_attribute.c | 15 +++++---------- src/identity-attribute/identity_attribute.h | 15 +++++---------- src/identity-attribute/plugin_identity_attribute_gnuid.c | 15 +++++---------- src/identity-provider/gnunet-idp.c | 15 +++++---------- src/identity-provider/gnunet-service-identity-provider.c | 15 +++++---------- src/identity-provider/jwt.c | 15 +++++---------- .../plugin_gnsrecord_identity_provider.c | 15 +++++---------- src/identity-provider/plugin_identity_provider_sqlite.c | 15 +++++---------- src/identity-provider/plugin_rest_identity_provider.c | 15 +++++---------- src/identity-provider/plugin_rest_openid_connect.c | 15 +++++---------- src/identity/gnunet-identity.c | 15 +++++---------- src/identity/gnunet-service-identity.c | 15 +++++---------- src/identity/plugin_rest_identity.c | 15 +++++---------- src/identity/test_identity.c | 15 +++++---------- src/identity/test_identity_defaults.c | 15 +++++---------- src/include/block_dns.h | 15 +++++---------- src/include/block_fs.h | 15 +++++---------- src/include/block_regex.h | 15 +++++---------- src/include/gnunet_abe_lib.h | 15 +++++---------- src/include/gnunet_applications.h | 15 +++++---------- src/include/gnunet_arm_service.h | 15 +++++---------- src/include/gnunet_ats_plugin.h | 15 +++++---------- src/include/gnunet_ats_service.h | 15 +++++---------- src/include/gnunet_bandwidth_lib.h | 15 +++++---------- src/include/gnunet_bio_lib.h | 15 +++++---------- src/include/gnunet_block_group_lib.h | 15 +++++---------- src/include/gnunet_block_lib.h | 15 +++++---------- src/include/gnunet_block_plugin.h | 15 +++++---------- src/include/gnunet_cadet_service.h | 15 +++++---------- src/include/gnunet_client_lib.h | 15 +++++---------- src/include/gnunet_common.h | 15 +++++---------- src/include/gnunet_configuration_lib.h | 15 +++++---------- src/include/gnunet_consensus_service.h | 15 +++++---------- src/include/gnunet_constants.h | 15 +++++---------- src/include/gnunet_container_lib.h | 15 +++++---------- src/include/gnunet_conversation_service.h | 15 +++++---------- src/include/gnunet_core_service.h | 15 +++++---------- src/include/gnunet_credential_service.h | 15 +++++---------- src/include/gnunet_crypto_lib.h | 15 +++++---------- src/include/gnunet_datacache_lib.h | 15 +++++---------- src/include/gnunet_datacache_plugin.h | 15 +++++---------- src/include/gnunet_datastore_plugin.h | 15 +++++---------- src/include/gnunet_datastore_service.h | 15 +++++---------- src/include/gnunet_dht_service.h | 15 +++++---------- src/include/gnunet_disk_lib.h | 15 +++++---------- src/include/gnunet_dns_service.h | 15 +++++---------- src/include/gnunet_dnsparser_lib.h | 15 +++++---------- src/include/gnunet_dnsstub_lib.h | 15 +++++---------- src/include/gnunet_dv_service.h | 15 +++++---------- src/include/gnunet_fragmentation_lib.h | 15 +++++---------- src/include/gnunet_friends_lib.h | 15 +++++---------- src/include/gnunet_fs_service.h | 15 +++++---------- src/include/gnunet_getopt_lib.h | 15 +++++---------- src/include/gnunet_gns_service.h | 15 +++++---------- src/include/gnunet_gnsrecord_lib.h | 15 +++++---------- src/include/gnunet_gnsrecord_plugin.h | 15 +++++---------- src/include/gnunet_hello_lib.h | 15 +++++---------- src/include/gnunet_helper_lib.h | 15 +++++---------- src/include/gnunet_identity_attribute_lib.h | 15 +++++---------- src/include/gnunet_identity_attribute_plugin.h | 15 +++++---------- src/include/gnunet_identity_provider_plugin.h | 15 +++++---------- src/include/gnunet_identity_provider_service.h | 15 +++++---------- src/include/gnunet_identity_service.h | 15 +++++---------- src/include/gnunet_load_lib.h | 15 +++++---------- src/include/gnunet_microphone_lib.h | 15 +++++---------- src/include/gnunet_mq_lib.h | 15 +++++---------- src/include/gnunet_mst_lib.h | 15 +++++---------- src/include/gnunet_multicast_service.h | 15 +++++---------- src/include/gnunet_my_lib.h | 15 +++++---------- src/include/gnunet_mysql_lib.h | 15 +++++---------- src/include/gnunet_namecache_plugin.h | 15 +++++---------- src/include/gnunet_namecache_service.h | 15 +++++---------- src/include/gnunet_namestore_plugin.h | 15 +++++---------- src/include/gnunet_namestore_service.h | 15 +++++---------- src/include/gnunet_nat_auto_service.h | 15 +++++---------- src/include/gnunet_nat_service.h | 15 +++++---------- src/include/gnunet_nc_lib.h | 15 +++++---------- src/include/gnunet_network_lib.h | 15 +++++---------- src/include/gnunet_nse_service.h | 15 +++++---------- src/include/gnunet_op_lib.h | 15 +++++---------- src/include/gnunet_os_lib.h | 15 +++++---------- src/include/gnunet_peer_lib.h | 15 +++++---------- src/include/gnunet_peerinfo_service.h | 15 +++++---------- src/include/gnunet_peerstore_plugin.h | 15 +++++---------- src/include/gnunet_peerstore_service.h | 15 +++++---------- src/include/gnunet_plugin_lib.h | 15 +++++---------- src/include/gnunet_program_lib.h | 15 +++++---------- src/include/gnunet_protocols.h | 15 +++++---------- src/include/gnunet_psyc_env.h | 15 +++++---------- src/include/gnunet_psyc_message.h | 15 +++++---------- src/include/gnunet_psyc_service.h | 15 +++++---------- src/include/gnunet_psyc_slicer.h | 15 +++++---------- src/include/gnunet_psyc_util_lib.h | 15 +++++---------- src/include/gnunet_psycstore_plugin.h | 15 +++++---------- src/include/gnunet_psycstore_service.h | 15 +++++---------- src/include/gnunet_regex_service.h | 15 +++++---------- src/include/gnunet_resolver_service.h | 15 +++++---------- src/include/gnunet_rest_lib.h | 15 +++++---------- src/include/gnunet_rest_plugin.h | 15 +++++---------- src/include/gnunet_rps_service.h | 15 +++++---------- src/include/gnunet_scalarproduct_service.h | 15 +++++---------- src/include/gnunet_scheduler_lib.h | 15 +++++---------- src/include/gnunet_secretsharing_service.h | 15 +++++---------- src/include/gnunet_sensor_service.h | 15 +++++---------- src/include/gnunet_sensor_util_lib.h | 15 +++++---------- src/include/gnunet_sensordashboard_service.h | 15 +++++---------- src/include/gnunet_service_lib.h | 15 +++++---------- src/include/gnunet_set_service.h | 15 +++++---------- src/include/gnunet_signal_lib.h | 15 +++++---------- src/include/gnunet_signatures.h | 15 +++++---------- src/include/gnunet_social_service.h | 15 +++++---------- src/include/gnunet_socks.h | 15 +++++---------- src/include/gnunet_speaker_lib.h | 15 +++++---------- src/include/gnunet_statistics_service.h | 15 +++++---------- src/include/gnunet_strings_lib.h | 15 +++++---------- src/include/gnunet_testbed_logger_service.h | 15 +++++---------- src/include/gnunet_testbed_service.h | 15 +++++---------- src/include/gnunet_testing_lib.h | 15 +++++---------- src/include/gnunet_time_lib.h | 15 +++++---------- src/include/gnunet_transport_communication_service.h | 15 +++++---------- src/include/gnunet_transport_core_service.h | 15 +++++---------- src/include/gnunet_transport_hello_service.h | 15 +++++---------- src/include/gnunet_transport_manipulation_service.h | 15 +++++---------- src/include/gnunet_transport_monitor_service.h | 15 +++++---------- src/include/gnunet_transport_plugin.h | 15 +++++---------- src/include/gnunet_transport_service.h | 15 +++++---------- src/include/gnunet_tun_lib.h | 15 +++++---------- src/include/gnunet_util_lib.h | 15 +++++---------- src/include/gnunet_util_taler_wallet_lib.h | 15 +++++---------- src/include/gnunet_vpn_service.h | 15 +++++---------- src/include/platform.h | 15 +++++---------- src/include/winproc.h | 15 +++++---------- src/integration-tests/gnunet_pyexpect.py.in | 15 +++++---------- src/integration-tests/gnunet_testing.py.in | 15 +++++---------- .../test_integration_bootstrap_and_connect.py.in | 15 +++++---------- src/integration-tests/test_integration_clique.py.in | 15 +++++---------- src/integration-tests/test_integration_disconnect.py.in | 15 +++++---------- .../test_integration_disconnect_nat.py.in | 15 +++++---------- src/integration-tests/test_integration_reconnect.py.in | 15 +++++---------- .../test_integration_reconnect_nat.py.in | 15 +++++---------- src/multicast/gnunet-multicast.c | 15 +++++---------- src/multicast/gnunet-service-multicast.c | 15 +++++---------- src/multicast/multicast.h | 15 +++++---------- src/multicast/multicast_api.c | 15 +++++---------- src/multicast/test_multicast.c | 15 +++++---------- src/multicast/test_multicast_2peers.c | 15 +++++---------- src/multicast/test_multicast_multipeer.c | 15 +++++---------- src/my/my.c | 15 +++++---------- src/my/my_query_helper.c | 15 +++++---------- src/my/test_my.c | 15 +++++---------- src/mysql/mysql.c | 15 +++++---------- src/namecache/gnunet-namecache.c | 15 +++++---------- src/namecache/gnunet-service-namecache.c | 15 +++++---------- src/namecache/namecache.h | 15 +++++---------- src/namecache/namecache_api.c | 15 +++++---------- src/namecache/plugin_namecache_flat.c | 15 +++++---------- src/namecache/plugin_namecache_postgres.c | 15 +++++---------- src/namecache/plugin_namecache_sqlite.c | 15 +++++---------- src/namecache/test_namecache_api_cache_block.c | 15 +++++---------- src/namecache/test_plugin_namecache.c | 15 +++++---------- src/namestore/gnunet-namestore-fcfsd.c | 15 +++++---------- src/namestore/gnunet-namestore.c | 15 +++++---------- src/namestore/gnunet-service-namestore.c | 15 +++++---------- src/namestore/gnunet-zoneimport.c | 15 +++++---------- src/namestore/namestore.h | 15 +++++---------- src/namestore/namestore_api.c | 15 +++++---------- src/namestore/namestore_api_monitor.c | 15 +++++---------- src/namestore/perf_namestore_api_zone_iteration.c | 15 +++++---------- src/namestore/plugin_namestore_flat.c | 15 +++++---------- src/namestore/plugin_namestore_postgres.c | 15 +++++---------- src/namestore/plugin_namestore_sqlite.c | 15 +++++---------- src/namestore/plugin_rest_namestore.c | 15 +++++---------- src/namestore/test_namestore_api_lookup_nick.c | 15 +++++---------- src/namestore/test_namestore_api_lookup_private.c | 15 +++++---------- src/namestore/test_namestore_api_lookup_public.c | 15 +++++---------- src/namestore/test_namestore_api_lookup_shadow.c | 15 +++++---------- src/namestore/test_namestore_api_lookup_shadow_filter.c | 15 +++++---------- src/namestore/test_namestore_api_monitoring.c | 15 +++++---------- src/namestore/test_namestore_api_monitoring_existing.c | 15 +++++---------- src/namestore/test_namestore_api_remove.c | 15 +++++---------- .../test_namestore_api_remove_not_existing_record.c | 15 +++++---------- src/namestore/test_namestore_api_store.c | 15 +++++---------- src/namestore/test_namestore_api_store_update.c | 15 +++++---------- src/namestore/test_namestore_api_zone_iteration.c | 15 +++++---------- src/namestore/test_namestore_api_zone_iteration_nick.c | 15 +++++---------- .../test_namestore_api_zone_iteration_specific_zone.c | 15 +++++---------- src/namestore/test_namestore_api_zone_iteration_stop.c | 15 +++++---------- src/namestore/test_namestore_api_zone_to_name.c | 15 +++++---------- src/namestore/test_plugin_namestore.c | 15 +++++---------- src/nat-auto/gnunet-nat-auto.c | 15 +++++---------- src/nat-auto/gnunet-nat-auto_legacy.c | 15 +++++---------- src/nat-auto/gnunet-nat-server.c | 15 +++++---------- src/nat-auto/gnunet-service-nat-auto.c | 15 +++++---------- src/nat-auto/gnunet-service-nat-auto_legacy.c | 15 +++++---------- src/nat-auto/nat-auto.h | 15 +++++---------- src/nat-auto/nat_auto_api.c | 15 +++++---------- src/nat-auto/nat_auto_api_test.c | 15 +++++---------- src/nat/gnunet-helper-nat-client-windows.c | 15 +++++---------- src/nat/gnunet-helper-nat-client.c | 15 +++++---------- src/nat/gnunet-helper-nat-server-windows.c | 15 +++++---------- src/nat/gnunet-helper-nat-server.c | 15 +++++---------- src/nat/gnunet-nat.c | 15 +++++---------- src/nat/gnunet-service-nat.c | 15 +++++---------- src/nat/gnunet-service-nat.h | 15 +++++---------- src/nat/gnunet-service-nat_externalip.c | 15 +++++---------- src/nat/gnunet-service-nat_externalip.h | 15 +++++---------- src/nat/gnunet-service-nat_helper.c | 15 +++++---------- src/nat/gnunet-service-nat_helper.h | 15 +++++---------- src/nat/gnunet-service-nat_mini.c | 15 +++++---------- src/nat/gnunet-service-nat_mini.h | 15 +++++---------- src/nat/gnunet-service-nat_stun.c | 15 +++++---------- src/nat/gnunet-service-nat_stun.h | 15 +++++---------- src/nat/nat.h | 15 +++++---------- src/nat/nat_api.c | 15 +++++---------- src/nat/nat_api_stun.c | 15 +++++---------- src/nat/nat_stun.h | 15 +++++---------- src/nat/test_nat.c | 15 +++++---------- src/nat/test_nat_mini.c | 15 +++++---------- src/nat/test_nat_test.c | 15 +++++---------- src/nat/test_stun.c | 15 +++++---------- src/nse/gnunet-nse-profiler.c | 15 +++++---------- src/nse/gnunet-nse.c | 15 +++++---------- src/nse/gnunet-service-nse.c | 15 +++++---------- src/nse/nse.h | 15 +++++---------- src/nse/nse_api.c | 15 +++++---------- src/nse/perf_kdf.c | 15 +++++---------- src/nse/test_nse_api.c | 15 +++++---------- src/nse/test_nse_multipeer.c | 15 +++++---------- src/peerinfo-tool/gnunet-peerinfo.c | 15 +++++---------- src/peerinfo-tool/gnunet-peerinfo_plugins.c | 15 +++++---------- src/peerinfo-tool/gnunet-peerinfo_plugins.h | 15 +++++---------- src/peerinfo-tool/test_gnunet_peerinfo.py.in | 15 +++++---------- src/peerinfo/gnunet-service-peerinfo.c | 15 +++++---------- src/peerinfo/peerinfo.h | 15 +++++---------- src/peerinfo/peerinfo_api.c | 15 +++++---------- src/peerinfo/peerinfo_api_notify.c | 15 +++++---------- src/peerinfo/perf_peerinfo_api.c | 15 +++++---------- src/peerinfo/test_peerinfo_api.c | 15 +++++---------- src/peerinfo/test_peerinfo_api_friend_only.c | 15 +++++---------- src/peerinfo/test_peerinfo_api_notify_friend_only.c | 15 +++++---------- src/peerinfo/test_peerinfo_shipped_hellos.c | 15 +++++---------- src/peerstore/gnunet-peerstore.c | 15 +++++---------- src/peerstore/gnunet-service-peerstore.c | 15 +++++---------- src/peerstore/peerstore.h | 15 +++++---------- src/peerstore/peerstore_api.c | 15 +++++---------- src/peerstore/peerstore_common.c | 15 +++++---------- src/peerstore/peerstore_common.h | 15 +++++---------- src/peerstore/perf_peerstore_store.c | 15 +++++---------- src/peerstore/plugin_peerstore_flat.c | 15 +++++---------- src/peerstore/plugin_peerstore_sqlite.c | 15 +++++---------- src/peerstore/test_peerstore_api_iterate.c | 15 +++++---------- src/peerstore/test_peerstore_api_store.c | 15 +++++---------- src/peerstore/test_peerstore_api_sync.c | 15 +++++---------- src/peerstore/test_peerstore_api_watch.c | 15 +++++---------- src/peerstore/test_plugin_peerstore.c | 15 +++++---------- src/psyc/gnunet-service-psyc.c | 15 +++++---------- src/psyc/psyc.h | 15 +++++---------- src/psyc/psyc_api.c | 15 +++++---------- src/psyc/psyc_test_lib.h | 15 +++++---------- src/psyc/test_psyc.c | 15 +++++---------- src/psyc/test_psyc2.c | 15 +++++---------- src/psyc/test_psyc_api_join.c | 15 +++++---------- src/psycstore/gnunet-service-psycstore.c | 15 +++++---------- src/psycstore/plugin_psycstore_mysql.c | 15 +++++---------- src/psycstore/plugin_psycstore_postgres.c | 15 +++++---------- src/psycstore/plugin_psycstore_sqlite.c | 15 +++++---------- src/psycstore/psycstore.h | 15 +++++---------- src/psycstore/psycstore_api.c | 15 +++++---------- src/psycstore/test_plugin_psycstore.c | 15 +++++---------- src/psycstore/test_psycstore.c | 15 +++++---------- src/psycutil/psyc_env.c | 15 +++++---------- src/psycutil/psyc_message.c | 15 +++++---------- src/psycutil/psyc_slicer.c | 15 +++++---------- src/psycutil/test_psyc_env.c | 15 +++++---------- src/pt/gnunet-daemon-pt.c | 15 +++++---------- src/pt/test_gns_vpn.c | 15 +++++---------- src/pt/test_gnunet_vpn.c | 15 +++++---------- src/regex/gnunet-daemon-regexprofiler.c | 15 +++++---------- src/regex/gnunet-regex-profiler.c | 15 +++++---------- src/regex/gnunet-regex-simulation-profiler.c | 15 +++++---------- src/regex/gnunet-service-regex.c | 15 +++++---------- src/regex/perf-regex.c | 15 +++++---------- src/regex/plugin_block_regex.c | 15 +++++---------- src/regex/regex_api_announce.c | 15 +++++---------- src/regex/regex_api_search.c | 15 +++++---------- src/regex/regex_block_lib.c | 15 +++++---------- src/regex/regex_block_lib.h | 15 +++++---------- src/regex/regex_internal.c | 15 +++++---------- src/regex/regex_internal.h | 15 +++++---------- src/regex/regex_internal_dht.c | 15 +++++---------- src/regex/regex_internal_lib.h | 15 +++++---------- src/regex/regex_ipc.h | 15 +++++---------- src/regex/regex_test_graph.c | 15 +++++---------- src/regex/regex_test_lib.c | 15 +++++---------- src/regex/regex_test_lib.h | 15 +++++---------- src/regex/regex_test_random.c | 15 +++++---------- src/regex/test_regex_api.c | 15 +++++---------- src/regex/test_regex_eval_api.c | 15 +++++---------- src/regex/test_regex_graph_api.c | 15 +++++---------- src/regex/test_regex_integration.c | 15 +++++---------- src/regex/test_regex_iterate_api.c | 15 +++++---------- src/regex/test_regex_proofs.c | 15 +++++---------- src/rest/gnunet-rest-server.c | 15 +++++---------- src/rest/rest.c | 15 +++++---------- src/revocation/gnunet-revocation.c | 15 +++++---------- src/revocation/plugin_block_revocation.c | 15 +++++---------- src/revocation/revocation.h | 15 +++++---------- src/revocation/test_local_revocation.py.in | 15 +++++---------- src/revocation/test_revocation.c | 15 +++++---------- src/rps/gnunet-rps-profiler.c | 15 +++++---------- src/rps/gnunet-rps.c | 15 +++++---------- src/rps/gnunet-service-rps.c | 15 +++++---------- src/rps/gnunet-service-rps_custommap.c | 15 +++++---------- src/rps/gnunet-service-rps_custommap.h | 15 +++++---------- src/rps/gnunet-service-rps_sampler.c | 15 +++++---------- src/rps/gnunet-service-rps_sampler.h | 15 +++++---------- src/rps/gnunet-service-rps_sampler_elem.c | 15 +++++---------- src/rps/gnunet-service-rps_sampler_elem.h | 15 +++++---------- src/rps/gnunet-service-rps_view.c | 15 +++++---------- src/rps/gnunet-service-rps_view.h | 15 +++++---------- src/rps/rps-test_util.c | 15 +++++---------- src/rps/rps-test_util.h | 15 +++++---------- src/rps/rps.h | 15 +++++---------- src/rps/rps_api.c | 15 +++++---------- src/rps/test_rps.c | 15 +++++---------- src/rps/test_rps_api.c | 15 +++++---------- src/rps/test_service_rps_custommap.c | 15 +++++---------- src/rps/test_service_rps_sampler_elem.c | 15 +++++---------- src/rps/test_service_rps_view.c | 15 +++++---------- src/scalarproduct/gnunet-scalarproduct.c | 15 +++++---------- src/scalarproduct/gnunet-service-scalarproduct-ecc.h | 15 +++++---------- .../gnunet-service-scalarproduct-ecc_alice.c | 15 +++++---------- src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 15 +++++---------- src/scalarproduct/gnunet-service-scalarproduct.h | 15 +++++---------- src/scalarproduct/gnunet-service-scalarproduct_alice.c | 15 +++++---------- src/scalarproduct/gnunet-service-scalarproduct_bob.c | 15 +++++---------- src/scalarproduct/scalarproduct.h | 15 +++++---------- src/scalarproduct/scalarproduct_api.c | 15 +++++---------- src/secretsharing/gnunet-secretsharing-profiler.c | 15 +++++---------- src/secretsharing/gnunet-service-secretsharing.c | 15 +++++---------- src/secretsharing/secretsharing.h | 15 +++++---------- src/secretsharing/secretsharing_api.c | 15 +++++---------- src/secretsharing/secretsharing_common.c | 15 +++++---------- src/secretsharing/secretsharing_protocol.h | 15 +++++---------- src/secretsharing/test_secretsharing_api.c | 15 +++++---------- src/set/gnunet-service-set.c | 15 +++++---------- src/set/gnunet-service-set.h | 15 +++++---------- src/set/gnunet-service-set_intersection.c | 15 +++++---------- src/set/gnunet-service-set_intersection.h | 15 +++++---------- src/set/gnunet-service-set_protocol.h | 15 +++++---------- src/set/gnunet-service-set_union.c | 15 +++++---------- src/set/gnunet-service-set_union.h | 15 +++++---------- src/set/gnunet-service-set_union_strata_estimator.c | 15 +++++---------- src/set/gnunet-service-set_union_strata_estimator.h | 15 +++++---------- src/set/gnunet-set-ibf-profiler.c | 15 +++++---------- src/set/gnunet-set-profiler.c | 15 +++++---------- src/set/ibf.c | 15 +++++---------- src/set/ibf.h | 15 +++++---------- src/set/ibf_sim.c | 15 +++++---------- src/set/plugin_block_set_test.c | 15 +++++---------- src/set/set.h | 15 +++++---------- src/set/set_api.c | 15 +++++---------- src/set/test_set_api.c | 15 +++++---------- src/set/test_set_intersection_result_full.c | 15 +++++---------- src/set/test_set_union_copy.c | 15 +++++---------- src/set/test_set_union_result_symmetric.c | 15 +++++---------- src/social/gnunet-service-social.c | 15 +++++---------- src/social/gnunet-social.c | 15 +++++---------- src/social/social.h | 15 +++++---------- src/social/social_api.c | 15 +++++---------- src/social/test_social.c | 15 +++++---------- src/statistics/gnunet-service-statistics.c | 15 +++++---------- src/statistics/gnunet-statistics.c | 15 +++++---------- src/statistics/statistics.h | 15 +++++---------- src/statistics/statistics_api.c | 15 +++++---------- src/statistics/test_statistics_api.c | 15 +++++---------- src/statistics/test_statistics_api_loop.c | 15 +++++---------- src/statistics/test_statistics_api_watch.c | 15 +++++---------- src/statistics/test_statistics_api_watch_zero_value.c | 15 +++++---------- src/template/gnunet-service-template.c | 15 +++++---------- src/template/gnunet-template.c | 15 +++++---------- src/template/test_template_api.c | 15 +++++---------- src/testbed-logger/gnunet-service-testbed-logger.c | 15 +++++---------- src/testbed-logger/test_testbed_logger_api.c | 15 +++++---------- src/testbed-logger/testbed_logger_api.c | 15 +++++---------- src/testbed/buildvars.py.in | 15 +++++---------- src/testbed/generate-underlay-topology.c | 15 +++++---------- src/testbed/gnunet-daemon-latency-logger.c | 15 +++++---------- src/testbed/gnunet-daemon-testbed-blacklist.c | 15 +++++---------- src/testbed/gnunet-daemon-testbed-underlay.c | 15 +++++---------- src/testbed/gnunet-helper-testbed.c | 15 +++++---------- src/testbed/gnunet-service-test-barriers.c | 15 +++++---------- src/testbed/gnunet-service-testbed.c | 15 +++++---------- src/testbed/gnunet-service-testbed.h | 15 +++++---------- src/testbed/gnunet-service-testbed_barriers.c | 15 +++++---------- src/testbed/gnunet-service-testbed_barriers.h | 15 +++++---------- src/testbed/gnunet-service-testbed_cache.c | 15 +++++---------- src/testbed/gnunet-service-testbed_connectionpool.c | 15 +++++---------- src/testbed/gnunet-service-testbed_connectionpool.h | 15 +++++---------- src/testbed/gnunet-service-testbed_cpustatus.c | 15 +++++---------- src/testbed/gnunet-service-testbed_links.c | 15 +++++---------- src/testbed/gnunet-service-testbed_links.h | 15 +++++---------- src/testbed/gnunet-service-testbed_meminfo.c | 15 +++++---------- src/testbed/gnunet-service-testbed_meminfo.h | 15 +++++---------- src/testbed/gnunet-service-testbed_oc.c | 15 +++++---------- src/testbed/gnunet-service-testbed_peers.c | 15 +++++---------- src/testbed/gnunet-testbed-profiler.c | 15 +++++---------- src/testbed/test_gnunet_helper_testbed.c | 15 +++++---------- src/testbed/test_testbed_api.c | 15 +++++---------- src/testbed/test_testbed_api_2peers_1controller.c | 15 +++++---------- src/testbed/test_testbed_api_3peers_3controllers.c | 15 +++++---------- src/testbed/test_testbed_api_barriers.c | 15 +++++---------- src/testbed/test_testbed_api_controllerlink.c | 15 +++++---------- src/testbed/test_testbed_api_hosts.c | 15 +++++---------- src/testbed/test_testbed_api_operations.c | 15 +++++---------- src/testbed/test_testbed_api_peer_reconfiguration.c | 15 +++++---------- src/testbed/test_testbed_api_peers_manage_services.c | 15 +++++---------- src/testbed/test_testbed_api_sd.c | 15 +++++---------- src/testbed/test_testbed_api_statistics.c | 15 +++++---------- src/testbed/test_testbed_api_test.c | 15 +++++---------- src/testbed/test_testbed_api_test_timeout.c | 15 +++++---------- src/testbed/test_testbed_api_testbed_run.c | 15 +++++---------- src/testbed/test_testbed_api_topology.c | 15 +++++---------- src/testbed/test_testbed_api_topology_clique.c | 15 +++++---------- src/testbed/test_testbed_underlay.c | 15 +++++---------- src/testbed/testbed.h | 15 +++++---------- src/testbed/testbed_api.c | 15 +++++---------- src/testbed/testbed_api.h | 15 +++++---------- src/testbed/testbed_api_barriers.c | 15 +++++---------- src/testbed/testbed_api_hosts.c | 15 +++++---------- src/testbed/testbed_api_hosts.h | 15 +++++---------- src/testbed/testbed_api_operations.c | 15 +++++---------- src/testbed/testbed_api_operations.h | 15 +++++---------- src/testbed/testbed_api_peers.c | 15 +++++---------- src/testbed/testbed_api_peers.h | 15 +++++---------- src/testbed/testbed_api_sd.c | 15 +++++---------- src/testbed/testbed_api_sd.h | 15 +++++---------- src/testbed/testbed_api_services.c | 15 +++++---------- src/testbed/testbed_api_statistics.c | 15 +++++---------- src/testbed/testbed_api_test.c | 15 +++++---------- src/testbed/testbed_api_testbed.c | 15 +++++---------- src/testbed/testbed_api_topology.c | 15 +++++---------- src/testbed/testbed_api_topology.h | 15 +++++---------- src/testbed/testbed_api_underlay.c | 15 +++++---------- src/testbed/testbed_helper.h | 15 +++++---------- src/testing/gnunet-testing.c | 15 +++++---------- src/testing/test_testing_peerstartup.c | 15 +++++---------- src/testing/test_testing_peerstartup2.c | 15 +++++---------- src/testing/test_testing_portreservation.c | 15 +++++---------- src/testing/test_testing_servicestartup.c | 15 +++++---------- src/testing/test_testing_sharedservices.c | 15 +++++---------- src/testing/testing.c | 15 +++++---------- src/topology/friends.c | 15 +++++---------- src/topology/gnunet-daemon-topology.c | 15 +++++---------- src/topology/test_gnunet_daemon_topology.c | 15 +++++---------- src/transport/gnunet-helper-transport-bluetooth.c | 15 +++++---------- src/transport/gnunet-helper-transport-wlan-dummy.c | 15 +++++---------- src/transport/gnunet-helper-transport-wlan.c | 15 +++++---------- src/transport/gnunet-service-transport.c | 15 +++++---------- src/transport/gnunet-service-transport.h | 15 +++++---------- src/transport/gnunet-service-transport_ats.c | 15 +++++---------- src/transport/gnunet-service-transport_ats.h | 15 +++++---------- src/transport/gnunet-service-transport_hello.c | 15 +++++---------- src/transport/gnunet-service-transport_hello.h | 15 +++++---------- src/transport/gnunet-service-transport_manipulation.c | 15 +++++---------- src/transport/gnunet-service-transport_manipulation.h | 15 +++++---------- src/transport/gnunet-service-transport_neighbours.c | 15 +++++---------- src/transport/gnunet-service-transport_neighbours.h | 15 +++++---------- src/transport/gnunet-service-transport_plugins.c | 15 +++++---------- src/transport/gnunet-service-transport_plugins.h | 15 +++++---------- src/transport/gnunet-service-transport_validation.c | 15 +++++---------- src/transport/gnunet-service-transport_validation.h | 15 +++++---------- src/transport/gnunet-transport-certificate-creation.c | 15 +++++---------- src/transport/gnunet-transport-profiler.c | 15 +++++---------- src/transport/gnunet-transport-wlan-receiver.c | 15 +++++---------- src/transport/gnunet-transport-wlan-sender.c | 15 +++++---------- src/transport/gnunet-transport.c | 15 +++++---------- src/transport/plugin_transport_http.h | 15 +++++---------- src/transport/plugin_transport_http_client.c | 15 +++++---------- src/transport/plugin_transport_http_common.c | 15 +++++---------- src/transport/plugin_transport_http_common.h | 15 +++++---------- src/transport/plugin_transport_http_server.c | 15 +++++---------- src/transport/plugin_transport_smtp.c | 15 +++++---------- src/transport/plugin_transport_tcp.c | 15 +++++---------- src/transport/plugin_transport_template.c | 15 +++++---------- src/transport/plugin_transport_udp.c | 15 +++++---------- src/transport/plugin_transport_udp.h | 15 +++++---------- src/transport/plugin_transport_udp_broadcasting.c | 15 +++++---------- src/transport/plugin_transport_unix.c | 15 +++++---------- src/transport/plugin_transport_wlan.c | 15 +++++---------- src/transport/plugin_transport_wlan.h | 15 +++++---------- src/transport/plugin_transport_xt.c | 15 +++++---------- src/transport/plugin_transport_xu.c | 15 +++++---------- src/transport/plugin_transport_xu.h | 15 +++++---------- src/transport/tcp_connection_legacy.c | 15 +++++---------- src/transport/tcp_server_legacy.c | 15 +++++---------- src/transport/tcp_server_mst_legacy.c | 15 +++++---------- src/transport/tcp_service_legacy.c | 15 +++++---------- src/transport/test_http_common.c | 15 +++++---------- src/transport/test_plugin_transport.c | 15 +++++---------- src/transport/test_quota_compliance.c | 15 +++++---------- src/transport/test_transport_address_switch.c | 15 +++++---------- src/transport/test_transport_api.c | 15 +++++---------- src/transport/test_transport_api_blacklisting.c | 15 +++++---------- src/transport/test_transport_api_disconnect.c | 15 +++++---------- src/transport/test_transport_api_limited_sockets.c | 15 +++++---------- src/transport/test_transport_api_manipulation_cfg.c | 15 +++++---------- src/transport/test_transport_api_manipulation_recv_tcp.c | 15 +++++---------- src/transport/test_transport_api_manipulation_send_tcp.c | 15 +++++---------- src/transport/test_transport_api_monitor_peers.c | 15 +++++---------- src/transport/test_transport_api_reliability.c | 15 +++++---------- src/transport/test_transport_api_restart_reconnect.c | 15 +++++---------- src/transport/test_transport_api_timeout.c | 15 +++++---------- src/transport/test_transport_blacklisting.c | 15 +++++---------- src/transport/test_transport_testing_restart.c | 15 +++++---------- src/transport/test_transport_testing_startstop.c | 15 +++++---------- src/transport/transport-testing-filenames.c | 15 +++++---------- src/transport/transport-testing-loggers.c | 15 +++++---------- src/transport/transport-testing-main.c | 15 +++++---------- src/transport/transport-testing-send.c | 15 +++++---------- src/transport/transport-testing.c | 15 +++++---------- src/transport/transport-testing.h | 15 +++++---------- src/transport/transport.h | 15 +++++---------- src/transport/transport_api_address_to_string.c | 15 +++++---------- src/transport/transport_api_blacklist.c | 15 +++++---------- src/transport/transport_api_core.c | 15 +++++---------- src/transport/transport_api_hello_get.c | 15 +++++---------- src/transport/transport_api_manipulation.c | 15 +++++---------- src/transport/transport_api_monitor_peers.c | 15 +++++---------- src/transport/transport_api_monitor_plugins.c | 15 +++++---------- src/transport/transport_api_offer_hello.c | 15 +++++---------- src/tun/regex.c | 15 +++++---------- src/tun/test_regex.c | 15 +++++---------- src/tun/test_tun.c | 15 +++++---------- src/tun/tun.c | 15 +++++---------- src/util/bandwidth.c | 15 +++++---------- src/util/bio.c | 15 +++++---------- src/util/client.c | 15 +++++---------- src/util/common_allocation.c | 15 +++++---------- src/util/common_endian.c | 15 +++++---------- src/util/common_logging.c | 15 +++++---------- src/util/configuration.c | 15 +++++---------- src/util/configuration_loader.c | 15 +++++---------- src/util/container_bloomfilter.c | 15 +++++---------- src/util/container_heap.c | 15 +++++---------- src/util/container_meta_data.c | 15 +++++---------- src/util/container_multihashmap.c | 15 +++++---------- src/util/container_multihashmap32.c | 15 +++++---------- src/util/container_multipeermap.c | 15 +++++---------- src/util/container_multishortmap.c | 15 +++++---------- src/util/crypto_abe.c | 15 +++++---------- src/util/crypto_bug.c | 15 +++++---------- src/util/crypto_crc.c | 15 +++++---------- src/util/crypto_ecc.c | 15 +++++---------- src/util/crypto_ecc_setup.c | 15 +++++---------- src/util/crypto_hash.c | 15 +++++---------- src/util/crypto_hash_file.c | 15 +++++---------- src/util/crypto_kdf.c | 15 +++++---------- src/util/crypto_mpi.c | 15 +++++---------- src/util/crypto_paillier.c | 15 +++++---------- src/util/crypto_random.c | 15 +++++---------- src/util/crypto_symmetric.c | 15 +++++---------- src/util/disk.c | 15 +++++---------- src/util/disk.h | 15 +++++---------- src/util/getopt_helpers.c | 15 +++++---------- src/util/gnunet-config.c | 15 +++++---------- src/util/gnunet-ecc.c | 15 +++++---------- src/util/gnunet-helper-w32-console.c | 15 +++++---------- src/util/gnunet-helper-w32-console.h | 15 +++++---------- src/util/gnunet-resolver.c | 15 +++++---------- src/util/gnunet-scrypt.c | 15 +++++---------- src/util/gnunet-service-resolver.c | 15 +++++---------- src/util/gnunet-uri.c | 15 +++++---------- src/util/helper.c | 15 +++++---------- src/util/load.c | 15 +++++---------- src/util/mq.c | 15 +++++---------- src/util/mst.c | 15 +++++---------- src/util/nc.c | 15 +++++---------- src/util/network.c | 15 +++++---------- src/util/op.c | 15 +++++---------- src/util/os_installation.c | 15 +++++---------- src/util/os_network.c | 15 +++++---------- src/util/os_priority.c | 15 +++++---------- src/util/peer.c | 15 +++++---------- src/util/perf_crypto_asymmetric.c | 15 +++++---------- src/util/perf_crypto_hash.c | 15 +++++---------- src/util/perf_crypto_paillier.c | 15 +++++---------- src/util/perf_crypto_rsa.c | 15 +++++---------- src/util/perf_crypto_symmetric.c | 15 +++++---------- src/util/perf_malloc.c | 15 +++++---------- src/util/plugin.c | 15 +++++---------- src/util/program.c | 15 +++++---------- src/util/resolver.h | 15 +++++---------- src/util/resolver_api.c | 15 +++++---------- src/util/scheduler.c | 15 +++++---------- src/util/service.c | 15 +++++---------- src/util/signal.c | 15 +++++---------- src/util/socks.c | 15 +++++---------- src/util/speedup.c | 15 +++++---------- src/util/speedup.h | 15 +++++---------- src/util/strings.c | 15 +++++---------- src/util/test_bio.c | 15 +++++---------- src/util/test_client.c | 15 +++++---------- src/util/test_common_allocation.c | 15 +++++---------- src/util/test_common_endian.c | 15 +++++---------- src/util/test_common_logging.c | 15 +++++---------- src/util/test_common_logging_dummy.c | 15 +++++---------- src/util/test_common_logging_runtime_loglevels.c | 15 +++++---------- src/util/test_configuration.c | 15 +++++---------- src/util/test_container_bloomfilter.c | 15 +++++---------- src/util/test_container_dll.c | 15 +++++---------- src/util/test_container_heap.c | 15 +++++---------- src/util/test_container_meta_data.c | 15 +++++---------- src/util/test_container_multihashmap.c | 15 +++++---------- src/util/test_container_multihashmap32.c | 15 +++++---------- src/util/test_container_multipeermap.c | 15 +++++---------- src/util/test_crypto_crc.c | 15 +++++---------- src/util/test_crypto_ecdh_eddsa.c | 15 +++++---------- src/util/test_crypto_ecdhe.c | 15 +++++---------- src/util/test_crypto_ecdsa.c | 15 +++++---------- src/util/test_crypto_eddsa.c | 15 +++++---------- src/util/test_crypto_hash.c | 15 +++++---------- src/util/test_crypto_paillier.c | 15 +++++---------- src/util/test_crypto_random.c | 15 +++++---------- src/util/test_crypto_symmetric.c | 15 +++++---------- src/util/test_disk.c | 15 +++++---------- src/util/test_getopt.c | 15 +++++---------- src/util/test_mq.c | 15 +++++---------- src/util/test_os_network.c | 15 +++++---------- src/util/test_os_start_process.c | 15 +++++---------- src/util/test_peer.c | 15 +++++---------- src/util/test_plugin.c | 15 +++++---------- src/util/test_plugin_plug.c | 15 +++++---------- src/util/test_program.c | 15 +++++---------- src/util/test_resolver_api.c | 15 +++++---------- src/util/test_scheduler.c | 15 +++++---------- src/util/test_scheduler_delay.c | 15 +++++---------- src/util/test_service.c | 15 +++++---------- src/util/test_socks.c | 15 +++++---------- src/util/test_speedup.c | 15 +++++---------- src/util/test_strings.c | 15 +++++---------- src/util/test_strings_to_data.c | 15 +++++---------- src/util/test_time.c | 15 +++++---------- src/util/time.c | 15 +++++---------- src/util/win.c | 15 +++++---------- src/util/winproc.c | 15 +++++---------- src/vpn/gnunet-helper-vpn-windows.c | 15 +++++---------- src/vpn/gnunet-helper-vpn.c | 15 +++++---------- src/vpn/gnunet-service-vpn.c | 15 +++++---------- src/vpn/gnunet-vpn.c | 15 +++++---------- src/vpn/vpn.h | 15 +++++---------- src/vpn/vpn_api.c | 15 +++++---------- src/zonemaster/gnunet-service-zonemaster-monitor.c | 15 +++++---------- src/zonemaster/gnunet-service-zonemaster.c | 15 +++++---------- 1005 files changed, 5025 insertions(+), 10050 deletions(-) diff --git a/src/abe/abe.c b/src/abe/abe.c index 8b59953fbd..a785e5159b 100644 --- a/src/abe/abe.c +++ b/src/abe/abe.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2018 Christian Grothoff (and other contributing authors) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c index 9b2062b23d..1a5dfa4119 100644 --- a/src/abe/test_cpabe.c +++ b/src/abe/test_cpabe.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/arm.h b/src/arm/arm.h index fa97c89674..9e55ef5d95 100644 --- a/src/arm/arm.h +++ b/src/arm/arm.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 56af544b16..8783674f19 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c index b4dc6cb6a7..4c449f1a5a 100644 --- a/src/arm/arm_monitor_api.c +++ b/src/arm/arm_monitor_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 4c30985b1a..c5a4ea10ff 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index bf5982d10c..78a0b48654 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2011, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c index fae8692583..2631e5a2cb 100644 --- a/src/arm/mockup-service.c +++ b/src/arm/mockup-service.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007, 2008, 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #include diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c index 0449c41d4a..c77f628d0e 100644 --- a/src/arm/test_arm_api.c +++ b/src/arm/test_arm_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file arm/test_arm_api.c diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index 0905f145d5..8df0a3af6b 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file arm/test_exponential_backoff.c diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c index 71bf550847..4ee71680dc 100644 --- a/src/arm/test_gnunet_service_arm.c +++ b/src/arm/test_gnunet_service_arm.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file arm/test_gnunet_service_arm.c diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c index 9b11caec34..459b1f97ae 100644 --- a/src/ats-tests/ats-testing-experiment.c +++ b/src/ats-tests/ats-testing-experiment.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 6e8e3bd13c..1916c9f231 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-log.c diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index 256fa844b6..0cb59a11a2 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-preferences.c diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 760c050c8f..4da9f19da1 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-traffic.c diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 326d3bdd41..65178d0442 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing.c diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index 32f0b02d88..93556a4684 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing.h diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index 0f32df5110..2737500620 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/gnunet-ats-sim.c diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c index 04508d1df9..da0d389f27 100644 --- a/src/ats-tests/gnunet-solver-eval.c +++ b/src/ats-tests/gnunet-solver-eval.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index 4df4f0c739..b5ea53d28e 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/perf_ats.c diff --git a/src/ats-tests/perf_ats.h b/src/ats-tests/perf_ats.h index b727272731..5d3d352e0e 100644 --- a/src/ats-tests/perf_ats.h +++ b/src/ats-tests/perf_ats.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/perf_ats.c diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c index d4c4f2cd92..a56f688ce5 100644 --- a/src/ats-tests/perf_ats_logging.c +++ b/src/ats-tests/perf_ats_logging.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/perf_ats_logging.c diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index d88e6d523a..3e72c5c09e 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009--2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/ats.h b/src/ats/ats.h index 56117e5437..910e5e11d5 100644 --- a/src/ats/ats.h +++ b/src/ats/ats.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/ats.h diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c index d551aacd4a..4640d1e9d7 100644 --- a/src/ats/ats_api_connectivity.c +++ b/src/ats/ats_api_connectivity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/ats_api_connectivity.c diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c index c5b126e08a..a76853921c 100644 --- a/src/ats/ats_api_performance.c +++ b/src/ats/ats_api_performance.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/ats_api_performance.c diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c index 7015a31e8f..9b1496d285 100644 --- a/src/ats/ats_api_scanner.c +++ b/src/ats/ats_api_scanner.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/ats_api_scanner.c diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 81ae01b6ad..a8f4fec599 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/ats_api_scheduling.c diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 5af2fbce3a..77df38a160 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h index 4136605a7c..3ddbe22862 100644 --- a/src/ats/gnunet-ats-solver-eval.h +++ b/src/ats/gnunet-ats-solver-eval.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c index 9762faa511..2d7328756b 100644 --- a/src/ats/gnunet-service-ats.c +++ b/src/ats/gnunet-service-ats.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats.c diff --git a/src/ats/gnunet-service-ats.h b/src/ats/gnunet-service-ats.h index 5dd3612932..58ba836a9a 100644 --- a/src/ats/gnunet-service-ats.h +++ b/src/ats/gnunet-service-ats.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index ba34cbacb1..54b66b6cb0 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index 61de1cd31f..7eb46bc56b 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c index c47ee03e66..d1043b3022 100644 --- a/src/ats/gnunet-service-ats_connectivity.c +++ b/src/ats/gnunet-service-ats_connectivity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h index b8f194b364..32ac84d2e8 100644 --- a/src/ats/gnunet-service-ats_connectivity.h +++ b/src/ats/gnunet-service-ats_connectivity.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats_connectivity.h diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index c2d68292ce..bafc4eca43 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h index 97389f561d..b2a4065200 100644 --- a/src/ats/gnunet-service-ats_normalization.h +++ b/src/ats/gnunet-service-ats_normalization.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 07ddf05316..291e96ce37 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats_performance.c diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h index 7958a84e51..998c5766b4 100644 --- a/src/ats/gnunet-service-ats_performance.h +++ b/src/ats/gnunet-service-ats_performance.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index f70c4cd9b8..0a76c45562 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h index 8b12416c6f..aad3a5ec6f 100644 --- a/src/ats/gnunet-service-ats_plugins.h +++ b/src/ats/gnunet-service-ats_plugins.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c index 9f11dc6a8d..5f16c88cfc 100644 --- a/src/ats/gnunet-service-ats_preferences.c +++ b/src/ats/gnunet-service-ats_preferences.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats_preferences.c diff --git a/src/ats/gnunet-service-ats_preferences.h b/src/ats/gnunet-service-ats_preferences.h index fe01aa573b..b3a48a913a 100644 --- a/src/ats/gnunet-service-ats_preferences.h +++ b/src/ats/gnunet-service-ats_preferences.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats_preferences.h diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 95952e96fc..176fc8f19b 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/gnunet-service-ats_reservations.c diff --git a/src/ats/gnunet-service-ats_reservations.h b/src/ats/gnunet-service-ats_reservations.h index ec28053b5a..18071069db 100644 --- a/src/ats/gnunet-service-ats_reservations.h +++ b/src/ats/gnunet-service-ats_reservations.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index fd7eff8fbe..303e42ca27 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/gnunet-service-ats_scheduling.h b/src/ats/gnunet-service-ats_scheduling.h index 26cb2c73af..6a9b401b53 100644 --- a/src/ats/gnunet-service-ats_scheduling.h +++ b/src/ats/gnunet-service-ats_scheduling.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c index 7fae3624fd..7d3ff180b5 100644 --- a/src/ats/perf_ats_solver.c +++ b/src/ats/perf_ats_solver.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/perf_ats_solver.c diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index 90f99cb5d6..2ecb432e45 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c index 9309bc2ea7..faa949a889 100644 --- a/src/ats/plugin_ats_proportional.c +++ b/src/ats/plugin_ats_proportional.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/plugin_ats_proportional.c diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index ea79207790..361eee799e 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c index 5bf80e50b1..4d5bcf1642 100644 --- a/src/ats/test_ats_api.c +++ b/src/ats/test_ats_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/test_ats_api.c diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index d02d257ad2..d3c986e1f2 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/test_ats_lib.c diff --git a/src/ats/test_ats_lib.h b/src/ats/test_ats_lib.h index 1c3928df89..763dda9572 100644 --- a/src/ats/test_ats_lib.h +++ b/src/ats/test_ats_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/test_ats_lib.h diff --git a/src/ats/test_ats_reservation_api.c b/src/ats/test_ats_reservation_api.c index 5897f8d707..3067daf567 100644 --- a/src/ats/test_ats_reservation_api.c +++ b/src/ats/test_ats_reservation_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file ats/test_ats_reservation_api.c diff --git a/src/auction/auction.h b/src/auction/auction.h index 758307aeb4..0682e0352f 100644 --- a/src/auction/auction.h +++ b/src/auction/auction.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c index 9e6c23b88b..160a436fea 100644 --- a/src/auction/gnunet-auction-create.c +++ b/src/auction/gnunet-auction-create.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c index a4af1152a0..fd51f80e74 100644 --- a/src/auction/gnunet-auction-info.c +++ b/src/auction/gnunet-auction-info.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c index a4af1152a0..fd51f80e74 100644 --- a/src/auction/gnunet-auction-join.c +++ b/src/auction/gnunet-auction-join.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c index dac38914d7..3819406370 100644 --- a/src/auction/gnunet-service-auction.c +++ b/src/auction/gnunet-service-auction.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c index 38e93c6fc3..8c6f205a5f 100644 --- a/src/auction/test_auction_api.c +++ b/src/auction/test_auction_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file auction/test_auction_api.c diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c index 3e7d38892d..ca41add1c2 100644 --- a/src/block/bg_bf.c +++ b/src/block/bg_bf.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file block/bg_bf.c diff --git a/src/block/block.c b/src/block/block.c index bbf45477cd..2881217837 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c index 0105fac386..ebbe211ba6 100644 --- a/src/block/plugin_block_template.c +++ b/src/block/plugin_block_template.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c index e359acd7f3..a0d8016974 100644 --- a/src/block/plugin_block_test.c +++ b/src/block/plugin_block_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h index 99f9f26531..46ab7c1ba8 100644 --- a/src/cadet/cadet.h +++ b/src/cadet/cadet.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001 - 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 59f0bfe85d..eaf79fade4 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/cadet_api.c diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h index d4a40f9e58..20c6d9c925 100644 --- a/src/cadet/cadet_protocol.h +++ b/src/cadet/cadet_protocol.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007 - 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c index 0efb81ab4d..45387a2f17 100644 --- a/src/cadet/cadet_test_lib.c +++ b/src/cadet/cadet_test_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/cadet_test_lib.c diff --git a/src/cadet/cadet_test_lib.h b/src/cadet/cadet_test_lib.h index 4b3a6b18dd..fa1a91e6a6 100644 --- a/src/cadet/cadet_test_lib.h +++ b/src/cadet/cadet_test_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012,2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/cadet_test_lib.h diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c index 15da05b6d4..0d4b9f5393 100644 --- a/src/cadet/gnunet-cadet-profiler.c +++ b/src/cadet/gnunet-cadet-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-cadet-profiler.c diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index a9b02714bf..50031d5334 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index 23a4bc2476..a8afec52f0 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h index 162867823f..62fb73c676 100644 --- a/src/cadet/gnunet-service-cadet.h +++ b/src/cadet/gnunet-service-cadet.h @@ -3,20 +3,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 2d8d36c6c8..89853b90b3 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-service-cadet_channel.c diff --git a/src/cadet/gnunet-service-cadet_channel.h b/src/cadet/gnunet-service-cadet_channel.h index 16517c457b..fe29e627f4 100644 --- a/src/cadet/gnunet-service-cadet_channel.h +++ b/src/cadet/gnunet-service-cadet_channel.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 9ff62b29f5..bfa09cc57d 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_connection.h b/src/cadet/gnunet-service-cadet_connection.h index 1c0475d409..36ea3bdaec 100644 --- a/src/cadet/gnunet-service-cadet_connection.h +++ b/src/cadet/gnunet-service-cadet_connection.h @@ -3,20 +3,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 65738504ed..2bb6368031 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_core.h b/src/cadet/gnunet-service-cadet_core.h index 65b0a6ba5f..698951cef8 100644 --- a/src/cadet/gnunet-service-cadet_core.h +++ b/src/cadet/gnunet-service-cadet_core.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c index f00c0caf3b..66a5e7a628 100644 --- a/src/cadet/gnunet-service-cadet_dht.c +++ b/src/cadet/gnunet-service-cadet_dht.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-service-cadet_dht.c diff --git a/src/cadet/gnunet-service-cadet_dht.h b/src/cadet/gnunet-service-cadet_dht.h index 5d7ab29a06..1d7e847168 100644 --- a/src/cadet/gnunet-service-cadet_dht.h +++ b/src/cadet/gnunet-service-cadet_dht.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c index 6d85de39f6..10d6e4a224 100644 --- a/src/cadet/gnunet-service-cadet_hello.c +++ b/src/cadet/gnunet-service-cadet_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-service-cadet_hello.c diff --git a/src/cadet/gnunet-service-cadet_hello.h b/src/cadet/gnunet-service-cadet_hello.h index 4291ae985d..c187777cb9 100644 --- a/src/cadet/gnunet-service-cadet_hello.h +++ b/src/cadet/gnunet-service-cadet_hello.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 5218d0848f..4d5791284b 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-service-cadet_paths.c diff --git a/src/cadet/gnunet-service-cadet_paths.h b/src/cadet/gnunet-service-cadet_paths.h index 6b7bef640b..c7fef94eb4 100644 --- a/src/cadet/gnunet-service-cadet_paths.h +++ b/src/cadet/gnunet-service-cadet_paths.h @@ -3,20 +3,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index 35e2c61487..1f389ae971 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/cadet/gnunet-service-cadet_peer.h index baa87ea878..360f1c46e2 100644 --- a/src/cadet/gnunet-service-cadet_peer.h +++ b/src/cadet/gnunet-service-cadet_peer.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index ed1eaf1678..22b8223447 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2017, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/gnunet-service-cadet_tunnels.c diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h index 4a3619ab6c..6f7d090714 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.h +++ b/src/cadet/gnunet-service-cadet_tunnels.h @@ -3,20 +3,15 @@ This file is part of GNUnet. Copyright (C) 2001-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index 608136e567..4bec4123d4 100644 --- a/src/cadet/test_cadet.c +++ b/src/cadet/test_cadet.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/test_cadet.c diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c index 554ee1d85d..71b6ba5ac7 100644 --- a/src/cadet/test_cadet_flow.c +++ b/src/cadet/test_cadet_flow.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file cadet/test_cadet_flow.c diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c index 2ea7547432..42d573e80a 100644 --- a/src/cadet/test_cadet_local_mq.c +++ b/src/cadet/test_cadet_local_mq.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 6629ffaa88..88c912b008 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet # (C) 2013, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. from __future__ import absolute_import from __future__ import print_function diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 60e4396559..8d5d2eb939 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index d5ed8db80f..8474fb5fd8 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h index f2933ed6f8..c985ec3f67 100644 --- a/src/consensus/consensus_protocol.h +++ b/src/consensus/consensus_protocol.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c index 68c2ad5947..fccbee2940 100644 --- a/src/consensus/gnunet-consensus-profiler.c +++ b/src/consensus/gnunet-consensus-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 90a3a36f19..57ab916297 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/plugin_block_consensus.c b/src/consensus/plugin_block_consensus.c index de0f0886f7..3224fac456 100644 --- a/src/consensus/plugin_block_consensus.c +++ b/src/consensus/plugin_block_consensus.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c index 85707eed10..bc7d9cab21 100644 --- a/src/consensus/test_consensus_api.c +++ b/src/consensus/test_consensus_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h index 1ca816f0e8..fae0355e45 100644 --- a/src/conversation/conversation.h +++ b/src/conversation/conversation.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 00ee3d3ea6..4bcc593086 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 816920f0fd..ce58fdac34 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index 804df4c888..75605384f3 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 70ccedbee4..7ac5e7678d 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-conversation.c diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c index 002fed6c74..a97412d2d1 100644 --- a/src/conversation/gnunet-helper-audio-playback-gst.c +++ b/src/conversation/gnunet-helper-audio-playback-gst.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-helper-audio-playback-gst.c diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 18f63ad186..f96878051d 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-helper-audio-playback.c diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c index b9aed4ea7e..69d0e67442 100644 --- a/src/conversation/gnunet-helper-audio-record-gst.c +++ b/src/conversation/gnunet-helper-audio-record-gst.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-helper-audio-record-gst.c diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 82bb6d5b3a..9442e9b459 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-helper-audio-record.c diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 7d319e51e1..fb4f9fcad5 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet-service-conversation.c diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c index 828b350770..7b8a764de6 100644 --- a/src/conversation/gnunet_gst.c +++ b/src/conversation/gnunet_gst.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet_gst.c diff --git a/src/conversation/gnunet_gst.h b/src/conversation/gnunet_gst.h index 266a0d8924..4d5b550677 100644 --- a/src/conversation/gnunet_gst.h +++ b/src/conversation/gnunet_gst.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet_gst.c diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h index 980ed2f481..33dffabd13 100644 --- a/src/conversation/gnunet_gst_def.h +++ b/src/conversation/gnunet_gst_def.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet_gst_def.h diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c index 03f6a4d95c..7ba1ae7baa 100644 --- a/src/conversation/gnunet_gst_test.c +++ b/src/conversation/gnunet_gst_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/gnunet_gst_test.c diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c index 11468fc59f..505c5ee845 100644 --- a/src/conversation/microphone.c +++ b/src/conversation/microphone.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index 91cae72611..dd81ec917c 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c index deff9e3194..80e577a2d0 100644 --- a/src/conversation/speaker.c +++ b/src/conversation/speaker.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index 180f6619f8..e0bd200353 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/test_conversation_api.c diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c index 284889e494..e0fff34410 100644 --- a/src/conversation/test_conversation_api_reject.c +++ b/src/conversation/test_conversation_api_reject.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/test_conversation_api_reject.c diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index ac3a87fadf..554770bf05 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2018x GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file conversation/test_conversation_api_twocalls.c diff --git a/src/core/core.h b/src/core/core.h index 7c3a5bdd8e..37e30c4fed 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/core_api.c b/src/core/core_api.c index ed8ce364dd..ab8e8bd5e9 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file core/core_api.c diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index 796fdb9d5b..46d59560ac 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c index 76b7e8ac4a..71b6768219 100644 --- a/src/core/gnunet-core.c +++ b/src/core/gnunet-core.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 214f729043..c6324d0078 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h index 86ac333b54..0b3f0d0baf 100644 --- a/src/core/gnunet-service-core.h +++ b/src/core/gnunet-service-core.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 1f1a476774..8bf4a0d216 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_kx.h b/src/core/gnunet-service-core_kx.h index 28293e6072..e11a6669d3 100644 --- a/src/core/gnunet-service-core_kx.h +++ b/src/core/gnunet-service-core_kx.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index babf169c0a..fe5fd69433 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_sessions.h b/src/core/gnunet-service-core_sessions.h index 82d9879015..6ec8c85efe 100644 --- a/src/core/gnunet-service-core_sessions.h +++ b/src/core/gnunet-service-core_sessions.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c index 0600f59ef9..1b940b1383 100644 --- a/src/core/gnunet-service-core_typemap.c +++ b/src/core/gnunet-service-core_typemap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/gnunet-service-core_typemap.h b/src/core/gnunet-service-core_typemap.h index 66596748c1..e999412a31 100644 --- a/src/core/gnunet-service-core_typemap.h +++ b/src/core/gnunet-service-core_typemap.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 847ba6e757..791e8c0235 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file core/test_core_api.c diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index 528093c994..1cb5d2ccd9 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file core/test_core_api_reliability.c diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 5cfc8b35f7..e9e04d50d3 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 31e300b148..73ec8daf89 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_core_api_start_only.c diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index dcc33288dc..7ed7e759d7 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file core/test_core_quota_compliance.c diff --git a/src/credential/credential.h b/src/credential/credential.h index 66a4636fc7..a76b493fe6 100644 --- a/src/credential/credential.h +++ b/src/credential/credential.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file credential/credential.h diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c index 677cb9ad41..122d6a5036 100644 --- a/src/credential/credential_api.c +++ b/src/credential/credential_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file credential/credential_api.c diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c index 2575f1de8d..2b134bc93d 100644 --- a/src/credential/credential_misc.c +++ b/src/credential/credential_misc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/credential/credential_misc.h b/src/credential/credential_misc.h index c3aa8c2144..875d66ccf4 100644 --- a/src/credential/credential_misc.h +++ b/src/credential/credential_misc.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file credential/credential_misc.h diff --git a/src/credential/credential_serialization.c b/src/credential/credential_serialization.c index 2bbf3bfb82..26b1d8a34e 100644 --- a/src/credential/credential_serialization.c +++ b/src/credential/credential_serialization.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/credential/credential_serialization.h b/src/credential/credential_serialization.h index b870d47dce..103ecbdc67 100644 --- a/src/credential/credential_serialization.h +++ b/src/credential/credential_serialization.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/credential/gnunet-credential.c b/src/credential/gnunet-credential.c index b5bcc4d433..5a86175f19 100644 --- a/src/credential/gnunet-credential.c +++ b/src/credential/gnunet-credential.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-credential.c diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c index 29bdf63d82..1967d191f6 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/credential/gnunet-service-credential.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file credential/gnunet-service-credential.c diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c index cba362a504..69e68b042d 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/credential/plugin_gnsrecord_credential.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/credential/plugin_rest_credential.c b/src/credential/plugin_rest_credential.c index 7f39b34ead..854aeeb314 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/credential/plugin_rest_credential.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 7c0a975da4..7ee8dc954d 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file datacache/datacache.c diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index b01b9f9c49..49c6e5d8fd 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datacache/perf_datacache.c diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index ad5e7834d5..35b7a6563c 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index c6ccfb2109..683c6148a6 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2009, 2010, 2012, 2015, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index ef24199caa..c96afa6306 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index 1064d31254..f102925593 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index c4d59c3cc6..37b32208b4 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datacache/test_datacache.c diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index b89d71a27c..50106de3ae 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datacache/test_datacache_quota.c diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h index 98f8b82ef1..6d0a54ae12 100644 --- a/src/datastore/datastore.h +++ b/src/datastore/datastore.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index 2ad864987f..ae1e6e15c0 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c index 891343e172..4ceca77c12 100644 --- a/src/datastore/gnunet-datastore.c +++ b/src/datastore/gnunet-datastore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 53ba858e45..dd39f54c52 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 10d9cf72e8..f54fed4391 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datastore/perf_datastore_api.c diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index d6f44bf9fd..d3515aae91 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file perf_plugin_datastore.c diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c index 9950f7ab2b..87117bf80b 100644 --- a/src/datastore/plugin_datastore_heap.c +++ b/src/datastore/plugin_datastore_heap.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c index 708e358603..93586e2528 100644 --- a/src/datastore/plugin_datastore_mysql.c +++ b/src/datastore/plugin_datastore_mysql.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index fd1a533bb3..0dc22b0f27 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 4980f8109b..331b9f7f1f 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009, 2011, 2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c index 16bda45d48..13b746c6e8 100644 --- a/src/datastore/plugin_datastore_template.c +++ b/src/datastore/plugin_datastore_template.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 63927a3643..7a43dbf584 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2007, 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datastore/test_datastore_api.c diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index e50b989099..563593f8ec 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file datastore/test_datastore_api_management.c diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index d460daed7e..b3fba19978 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file test_plugin_datastore.c diff --git a/src/dht/dht.h b/src/dht/dht.h index 95ffa33ca5..4d919a03f1 100644 --- a/src/dht/dht.h +++ b/src/dht/dht.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index de29b05eb4..886ee8053b 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2012, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c index 52d5a3731a..d4ba97957c 100644 --- a/src/dht/dht_test_lib.c +++ b/src/dht/dht_test_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/dht_test_lib.c diff --git a/src/dht/dht_test_lib.h b/src/dht/dht_test_lib.h index 0b4a51c8f0..bc7ccaf8a3 100644 --- a/src/dht/dht_test_lib.h +++ b/src/dht/dht_test_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/dht_test_lib.h diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index afcd5422cc..a1e5c00dcb 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/gnunet-dht-get.c diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index a699b3d175..d499c7cc4e 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/gnunet-dht-monitor.c diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c index db4d04681f..0021629442 100644 --- a/src/dht/gnunet-dht-put.c +++ b/src/dht/gnunet-dht-put.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/gnunet-dht-put.c diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 829c53aea0..872cefd375 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h index 8b0602104b..c27f28f3a4 100644 --- a/src/dht/gnunet-service-dht.h +++ b/src/dht/gnunet-service-dht.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 503d7867bb..ad97cdb113 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 07a666db61..368020e053 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2015, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/gnunet-service-dht_datacache.c diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h index ff6ae23dac..e41b81cda7 100644 --- a/src/dht/gnunet-service-dht_datacache.h +++ b/src/dht/gnunet-service-dht_datacache.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c index 5a5c415675..7fb8452cf2 100644 --- a/src/dht/gnunet-service-dht_hello.c +++ b/src/dht/gnunet-service-dht_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_hello.h b/src/dht/gnunet-service-dht_hello.h index 8d9b940ad8..6627e9ff91 100644 --- a/src/dht/gnunet-service-dht_hello.h +++ b/src/dht/gnunet-service-dht_hello.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 94844374de..977e2626fb 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index bf3ed80a23..54cabed3a9 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c index da4aae60c2..b3d5052037 100644 --- a/src/dht/gnunet-service-dht_nse.c +++ b/src/dht/gnunet-service-dht_nse.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_nse.h b/src/dht/gnunet-service-dht_nse.h index 075a872b3c..3719e72475 100644 --- a/src/dht/gnunet-service-dht_nse.h +++ b/src/dht/gnunet-service-dht_nse.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c index 098b6e8958..8cfd2e5434 100644 --- a/src/dht/gnunet-service-dht_routing.c +++ b/src/dht/gnunet-service-dht_routing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet-service-dht_routing.h b/src/dht/gnunet-service-dht_routing.h index ad7958363a..0883a62f95 100644 --- a/src/dht/gnunet-service-dht_routing.h +++ b/src/dht/gnunet-service-dht_routing.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c index 5341e7d61c..01a678b785 100644 --- a/src/dht/gnunet_dht_profiler.c +++ b/src/dht/gnunet_dht_profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index 9f2861b50c..82cad21b21 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 62d1213062..83fdf5e2ed 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/test_dht_api.c diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index 3de8001448..8d94519182 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/test_dht_monitor.c diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index 79edb2b0cc..3047433a11 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dht/test_dht_topo.c diff --git a/src/dns/dns.h b/src/dns/dns.h index 3d82cb8ae5..c6755ee363 100644 --- a/src/dns/dns.h +++ b/src/dns/dns.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c index 9f0dee9a9b..9c51daf79d 100644 --- a/src/dns/dns_api.c +++ b/src/dns/dns_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c index 6f9a24b7e5..122ca312f4 100644 --- a/src/dns/dnsparser.c +++ b/src/dns/dnsparser.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index b1068a6de0..b5ce908741 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dns/dnsstub.c diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index fb5c768ac2..39d327f511 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c index 44d3d0b6c0..2e2bf0f1a1 100644 --- a/src/dns/gnunet-dns-redirector.c +++ b/src/dns/gnunet-dns-redirector.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c index 5cf1967f51..80f5df3513 100644 --- a/src/dns/gnunet-helper-dns.c +++ b/src/dns/gnunet-helper-dns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 39ce7f6e56..6df5bd0ffa 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c index 860672e7aa..e05a04f360 100644 --- a/src/dns/gnunet-zonewalk.c +++ b/src/dns/gnunet-zonewalk.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c index ca6ea84c46..95a66b83fc 100644 --- a/src/dns/plugin_block_dns.c +++ b/src/dns/plugin_block_dns.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dns/test_hexcoder.c b/src/dns/test_hexcoder.c index f1e0af1048..1838c0897a 100644 --- a/src/dns/test_hexcoder.c +++ b/src/dns/test_hexcoder.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dv/dv.h b/src/dv/dv.h index 844cfb5e1c..6f2258baa1 100644 --- a/src/dv/dv.h +++ b/src/dv/dv.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index ab521ec1fb..10c0a350dc 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c index d99097a156..176444371d 100644 --- a/src/dv/gnunet-dv.c +++ b/src/dv/gnunet-dv.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dv/gnunet-dv.c diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index fa1c16be82..9bfce0d992 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index 51d75330fc..75afda7529 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002--2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c index e40418a420..d6d2fd5c66 100644 --- a/src/dv/test_transport_blacklist.c +++ b/src/dv/test_transport_blacklist.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dv/test_transport_blacklist.c diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c index 0a43252a5c..9e487f2618 100644 --- a/src/dv/test_transport_dv.c +++ b/src/dv/test_transport_dv.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file dv/test_transport_dv.c diff --git a/src/exit/exit.h b/src/exit/exit.h index 530d92125e..b79a918e28 100644 --- a/src/exit/exit.h +++ b/src/exit/exit.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index ae40feea0c..78c4967644 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2017 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/exit/gnunet-helper-exit-windows.c b/src/exit/gnunet-helper-exit-windows.c index aa7a7a4a3f..3593c41b15 100644 --- a/src/exit/gnunet-helper-exit-windows.c +++ b/src/exit/gnunet-helper-exit-windows.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file exit/gnunet-helper-exit-windows.c diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c index 3c6f975575..d3453bb137 100644 --- a/src/exit/gnunet-helper-exit.c +++ b/src/exit/gnunet-helper-exit.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index cc0f5a8c54..aabf9a6219 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/fragmentation/defragmentation.c diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index f686351004..22a3b3a500 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/fragmentation/fragmentation.c diff --git a/src/fragmentation/fragmentation.h b/src/fragmentation/fragmentation.h index f585eb46be..e60b742ed9 100644 --- a/src/fragmentation/fragmentation.h +++ b/src/fragmentation/fragmentation.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/fragmentation/fragmentation.h diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c index 61ba73bb26..77ac7db5ad 100644 --- a/src/fragmentation/test_fragmentation.c +++ b/src/fragmentation/test_fragmentation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fragmentation/test_fragmentation.c diff --git a/src/fragmentation/test_fragmentation_parallel.c b/src/fragmentation/test_fragmentation_parallel.c index 23349e6f7c..27f2ebad6d 100644 --- a/src/fragmentation/test_fragmentation_parallel.c +++ b/src/fragmentation/test_fragmentation_parallel.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fragmentation/test_fragmentation.c diff --git a/src/fs/fs.h b/src/fs/fs.h index 83b9073c7a..7e98f90969 100644 --- a/src/fs/fs.h +++ b/src/fs/fs.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003--2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index a5b82ec271..60d3bfa745 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001--2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h index be22ea73e7..edf288bec9 100644 --- a/src/fs/fs_api.h +++ b/src/fs/fs_api.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index 514eb64b3b..df64100c72 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c index e904b90925..9bdda59031 100644 --- a/src/fs/fs_dirmetascan.c +++ b/src/fs/fs_dirmetascan.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2005-2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index c2a3d4c5df..73ace1056b 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/fs_download.c diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index c2e591e120..ef8baa8196 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index bfe45957e9..5206a25d93 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index eec125a10c..00090aca0a 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index b26de431cc..29df6fb7c1 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/fs_misc.c diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 69876b8b55..34f4803146 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2003-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 759467ba42..361a99ca35 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/fs_publish.c diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c index a7ad3e91f9..f3c6526b98 100644 --- a/src/fs/fs_publish_ksk.c +++ b/src/fs/fs_publish_ksk.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c index 189a6909a2..83e019b369 100644 --- a/src/fs/fs_publish_ublock.c +++ b/src/fs/fs_publish_ublock.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_publish_ublock.h b/src/fs/fs_publish_ublock.h index bfc4ca0809..aa282d4ee0 100644 --- a/src/fs/fs_publish_ublock.h +++ b/src/fs/fs_publish_ublock.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c index 906e78dd3e..17c363114d 100644 --- a/src/fs/fs_sharetree.c +++ b/src/fs/fs_sharetree.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2005-2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index d03888021f..1620904980 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 8f57aa5c87..68be1bf328 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index e57e4e4943..f721f441aa 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/fs_tree.c diff --git a/src/fs/fs_tree.h b/src/fs/fs_tree.h index 3fb485f7d3..8c5a8ea2d8 100644 --- a/src/fs/fs_tree.h +++ b/src/fs/fs_tree.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 95a48f8cce..73e7e805a9 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index b90c75981a..70f24baccc 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003--2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index 0976b37e4e..8564185005 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001--2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-auto-share.c diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c index b9171c42dd..4c5dec005b 100644 --- a/src/fs/gnunet-daemon-fsprofiler.c +++ b/src/fs/gnunet-daemon-fsprofiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index dabf554fbd..ef6e564229 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-directory.c diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index 27266a18ae..338c6042c3 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-download.c diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c index ac9f6777f4..08ab74ac6e 100644 --- a/src/fs/gnunet-fs-profiler.c +++ b/src/fs/gnunet-fs-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c index ad8f223ff1..8f55c0d9a0 100644 --- a/src/fs/gnunet-fs.c +++ b/src/fs/gnunet-fs.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-fs.c diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 72a656de15..bd7a9391b6 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index c75469a243..e4530e68d4 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-publish.c diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index 89811669f8..ca989aae74 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-search.c diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 09b1e05d8f..1d0a6ef2cf 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h index 2606565bf0..f9031b1b77 100644 --- a/src/fs/gnunet-service-fs.h +++ b/src/fs/gnunet-service-fs.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_cadet.h b/src/fs/gnunet-service-fs_cadet.h index 1fbd3a4060..3536f92b18 100644 --- a/src/fs/gnunet-service-fs_cadet.h +++ b/src/fs/gnunet-service-fs_cadet.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index c729ebe414..7a40a2c11b 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c index 02ebb2ffee..ad47d80de8 100644 --- a/src/fs/gnunet-service-fs_cadet_server.c +++ b/src/fs/gnunet-service-fs_cadet_server.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index 6e28ca6066..a6099b4a1c 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-service-fs_cp.c diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h index 3aba5c6a61..bbbb09d6bb 100644 --- a/src/fs/gnunet-service-fs_cp.h +++ b/src/fs/gnunet-service-fs_cp.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c index f3cc03adc9..8e81772968 100644 --- a/src/fs/gnunet-service-fs_indexing.c +++ b/src/fs/gnunet-service-fs_indexing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_indexing.h b/src/fs/gnunet-service-fs_indexing.h index 331c511053..d96841cb2a 100644 --- a/src/fs/gnunet-service-fs_indexing.h +++ b/src/fs/gnunet-service-fs_indexing.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 12b04dcd19..3dee9c6e60 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_pe.h b/src/fs/gnunet-service-fs_pe.h index dd66f82ed5..af194fca7c 100644 --- a/src/fs/gnunet-service-fs_pe.h +++ b/src/fs/gnunet-service-fs_pe.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 7c64ab98b7..42aeea47ee 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_pr.h b/src/fs/gnunet-service-fs_pr.h index fe4297414b..ef12d9f2c4 100644 --- a/src/fs/gnunet-service-fs_pr.h +++ b/src/fs/gnunet-service-fs_pr.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index 21c598a72c..692285b0bf 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_push.h b/src/fs/gnunet-service-fs_push.h index 55aefa4789..35c02efec9 100644 --- a/src/fs/gnunet-service-fs_push.h +++ b/src/fs/gnunet-service-fs_push.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c index bb8560fff1..836343e38e 100644 --- a/src/fs/gnunet-service-fs_put.c +++ b/src/fs/gnunet-service-fs_put.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-service-fs_put.h b/src/fs/gnunet-service-fs_put.h index 8bad7aebbd..848bb368d3 100644 --- a/src/fs/gnunet-service-fs_put.h +++ b/src/fs/gnunet-service-fs_put.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index 213d2b3327..92bffb99b1 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/gnunet-unindex.c diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index 316fdbd8a1..b80cb4edf9 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index 8098afbe96..6fd1b8291b 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_respect.c +++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index c762835ce1..94b79f336c 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 6fdc589bfa..467e967835 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c index edffdc7fad..59c2308d74 100644 --- a/src/fs/test_fs_directory.c +++ b/src/fs/test_fs_directory.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2005, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_directory.c diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 936f001dfd..9114dc321e 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index 8f27e82af5..a31ce3610c 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index 0b73d4a530..fc108c3875 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c index fa433b96c8..d425b43ae2 100644 --- a/src/fs/test_fs_getopt.c +++ b/src/fs/test_fs_getopt.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_getopt.c diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 61e4df5123..6840b38716 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index b8325d8d86..e3603cf6af 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2005-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index c8869aaca8..192c100fa9 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2005-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index f4c56e0151..e86a7ce476 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_publish.c diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 103ca01b8b..39611a8d2f 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_publish_persistence.c diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 0918b4b6b5..40ea9f6d9c 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_search.c diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index db084446e4..0a925a8df7 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_search_persistence.c diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index eaf804a22d..c413b103d9 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c index 83edf2e6c1..b5efbc83f2 100644 --- a/src/fs/test_fs_search_with_and.c +++ b/src/fs/test_fs_search_with_and.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_search_with_and.c diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index c4b27259b6..d5637e216a 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_start_stop.c diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index f8de3a4df9..58a7468c1d 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index bd36fcd187..122a6d697e 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 7c76ee2277..5c78e38871 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c index 7e00219b10..e1fc584a49 100644 --- a/src/fs/test_fs_uri.c +++ b/src/fs/test_fs_uri.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_fs_uri.c diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index a669998fb4..059254812d 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for file-sharing command-line tools (indexing and unindexing) import sys diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index 4b27b45323..00029ca0db 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for file-sharing command-line tools (publish, search, download) import sys diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index aa9b7b4617..125d7a4bad 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for file-sharing command-line tools (recursive publishing & download) import sys diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 02d18c3738..b848693cd4 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 3c5120fe78..40e341c20e 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c index ba4f28bc5a..94039fabb7 100644 --- a/src/fs/test_plugin_block_fs.c +++ b/src/fs/test_plugin_block_fs.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/test_plugin_block_fs.c diff --git a/src/gns/gns.h b/src/gns/gns.h index d77bf53c6a..6a0b06ffc9 100644 --- a/src/gns/gns.h +++ b/src/gns/gns.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gns.h diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index ed30fa44c8..ae3505713d 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gns_api.c diff --git a/src/gns/gns_api.h b/src/gns/gns_api.h index e4912338fd..3f9ce19998 100644 --- a/src/gns/gns_api.h +++ b/src/gns/gns_api.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gns_api.h diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c index 8a4d03b116..f106633e4f 100644 --- a/src/gns/gns_tld_api.c +++ b/src/gns/gns_tld_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gns_tld_api.c diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index d7fd1a8120..af3644a819 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index bc66f1325a..9ed323a0b3 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-dns2gns.c diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c index dd393972a0..c1f5989943 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/gns/gnunet-gns-benchmark.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/gns/gnunet-gns-benchmark.c diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index a59cc59818..11fea80c2c 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-gns-helper-service-w32.c diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c index 3b9b0a0819..1a4fff9733 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/gns/gnunet-gns-import.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-gns.c diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 84b8da04ab..fb02295c8e 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 34f6e2c829..3dfeb9e776 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2013, 2017-2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-gns.c diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index aaa4aeb0e0..f8f0683014 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gnunet-service-gns.c diff --git a/src/gns/gnunet-service-gns.h b/src/gns/gnunet-service-gns.h index 439bad8814..0189e6cbae 100644 --- a/src/gns/gnunet-service-gns.h +++ b/src/gns/gnunet-service-gns.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gnunet-service-gns.h diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 0425e95005..b071aa952d 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gnunet-service-gns_interceptor.c diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/gns/gnunet-service-gns_interceptor.h index ff54b7b6e8..ecaf6eb4b1 100644 --- a/src/gns/gnunet-service-gns_interceptor.h +++ b/src/gns/gnunet-service-gns_interceptor.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gnunet-service-gns_interceptor.h diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 0d04fc6b9c..c915c616ad 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index 06ecc51cee..d5df279c1e 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/gnunet-service-gns_resolver.h diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index 4700100b59..85f1842d1b 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #include #include diff --git a/src/gns/nss/nss_gns_query.h b/src/gns/nss/nss_gns_query.h index 024f11e2e7..d1337b5027 100644 --- a/src/gns/nss/nss_gns_query.h +++ b/src/gns/nss/nss_gns_query.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #ifndef NSS_GNS_QUERY_H #define NSS_GNS_QUERY_H diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index a42fef9530..dc1c9fd1f8 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c index b88e8fcc25..ff1d63e17e 100644 --- a/src/gns/plugin_gnsrecord_gns.c +++ b/src/gns/plugin_gnsrecord_gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c index 1d215b6a49..9c07611b8b 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/gns/plugin_rest_gns.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index b381f5b4f9..0fc57e3ce7 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2007, 2009, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gns/w32nsp-install.c b/src/gns/w32nsp-install.c index a4da577bab..c072f8386d 100644 --- a/src/gns/w32nsp-install.c +++ b/src/gns/w32nsp-install.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/w32nsp-install.c diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index 82f15c6ccf..95504180b0 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/w32nsp-resolve.c diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index 3e926fcc42..2c316fca12 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gns/w32nsp.c diff --git a/src/gns/w32resolver.h b/src/gns/w32resolver.h index cac082b427..232a094532 100644 --- a/src/gns/w32resolver.h +++ b/src/gns/w32resolver.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c index ece1665fc9..8f4cf9ef10 100644 --- a/src/gnsrecord/gnsrecord.c +++ b/src/gnsrecord/gnsrecord.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index 6d3887392f..6737825a86 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c index 05f56cf703..94ef6ca70a 100644 --- a/src/gnsrecord/gnsrecord_misc.c +++ b/src/gnsrecord/gnsrecord_misc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c index 77118ab946..3d0565cec3 100644 --- a/src/gnsrecord/gnsrecord_serialization.c +++ b/src/gnsrecord/gnsrecord_serialization.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/perf_gnsrecord_crypto.c b/src/gnsrecord/perf_gnsrecord_crypto.c index ff97210062..91d4984957 100644 --- a/src/gnsrecord/perf_gnsrecord_crypto.c +++ b/src/gnsrecord/perf_gnsrecord_crypto.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c index 691936c160..2cca62d945 100644 --- a/src/gnsrecord/plugin_gnsrecord_dns.c +++ b/src/gnsrecord/plugin_gnsrecord_dns.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c b/src/gnsrecord/test_gnsrecord_block_expiration.c index 3fab577a51..1c9ec78632 100644 --- a/src/gnsrecord/test_gnsrecord_block_expiration.c +++ b/src/gnsrecord/test_gnsrecord_block_expiration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c index 9dd09c0bf4..0b095c31ca 100644 --- a/src/gnsrecord/test_gnsrecord_crypto.c +++ b/src/gnsrecord/test_gnsrecord_crypto.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c index a43bf2efa8..3f23b2b3ec 100644 --- a/src/gnsrecord/test_gnsrecord_serialization.c +++ b/src/gnsrecord/test_gnsrecord_serialization.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnsrecord/test_gnsrecord_serialization.c diff --git a/src/hello/address.c b/src/hello/address.c index 7819c2806f..ac89b06167 100644 --- a/src/hello/address.c +++ b/src/hello/address.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c index 6fd5756ba9..2ad187250b 100644 --- a/src/hello/gnunet-hello.c +++ b/src/hello/gnunet-hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hello/gnunet-hello.c diff --git a/src/hello/hello.c b/src/hello/hello.c index 690a0961a3..3d968067b1 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hello/test_friend_hello.c b/src/hello/test_friend_hello.c index 0b4ed0b266..8b3b46ae66 100644 --- a/src/hello/test_friend_hello.c +++ b/src/hello/test_friend_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hello/test_friend_hello.c diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c index 6d824ef81f..e6de13c65f 100644 --- a/src/hello/test_hello.c +++ b/src/hello/test_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hello/test_hello.c diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 854340d3d5..8955e46e2d 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007, 2008, 2009, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist.h b/src/hostlist/gnunet-daemon-hostlist.h index f19815b457..e61e42b217 100644 --- a/src/hostlist/gnunet-daemon-hostlist.h +++ b/src/hostlist/gnunet-daemon-hostlist.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index 2283efe6c3..6ae5e22a1a 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2010, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hostlist/gnunet-daemon-hostlist_client.c diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h b/src/hostlist/gnunet-daemon-hostlist_client.h index e41b90876c..d93e0ce95c 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.h +++ b/src/hostlist/gnunet-daemon-hostlist_client.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hostlist/gnunet-daemon-hostlist_client.h diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 3df6f1ef86..4766618129 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2009, 2010, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h b/src/hostlist/gnunet-daemon-hostlist_server.h index d9f778a4bc..344a3559d1 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.h +++ b/src/hostlist/gnunet-daemon-hostlist_server.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index dcdabaf6be..9bed910b6a 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hostlist/test_gnunet_daemon_hostlist.c diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 799ffc3ffa..85570e8eec 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2010, 2011, 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hostlist/test_gnunet_daemon_hostlist_learning.c diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 2ab55b6681..fcdcd0f893 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file hostlist/test_gnunet_daemon_hostlist_reconnect.c diff --git a/src/identity-attribute/identity_attribute.c b/src/identity-attribute/identity_attribute.c index dc2753fcab..c75794d143 100644 --- a/src/identity-attribute/identity_attribute.c +++ b/src/identity-attribute/identity_attribute.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity-attribute/identity_attribute.h b/src/identity-attribute/identity_attribute.h index da0cef1ca3..5e3c07dc1f 100644 --- a/src/identity-attribute/identity_attribute.h +++ b/src/identity-attribute/identity_attribute.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity-attribute/plugin_identity_attribute_gnuid.c b/src/identity-attribute/plugin_identity_attribute_gnuid.c index 006b45ea24..f275af3421 100644 --- a/src/identity-attribute/plugin_identity_attribute_gnuid.c +++ b/src/identity-attribute/plugin_identity_attribute_gnuid.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity-provider/gnunet-idp.c b/src/identity-provider/gnunet-idp.c index 267978d40a..6aef3e5f14 100644 --- a/src/identity-provider/gnunet-idp.c +++ b/src/identity-provider/gnunet-idp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 6afb7bb056..dd7c4f2170 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/jwt.c b/src/identity-provider/jwt.c index ff3676cb6a..7364093100 100644 --- a/src/identity-provider/jwt.c +++ b/src/identity-provider/jwt.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/identity-provider/plugin_gnsrecord_identity_provider.c index 6ed0b0852d..4c0ac6a9c3 100644 --- a/src/identity-provider/plugin_gnsrecord_identity_provider.c +++ b/src/identity-provider/plugin_gnsrecord_identity_provider.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity-provider/plugin_identity_provider_sqlite.c b/src/identity-provider/plugin_identity_provider_sqlite.c index 0071528b9b..e453f7aea7 100644 --- a/src/identity-provider/plugin_identity_provider_sqlite.c +++ b/src/identity-provider/plugin_identity_provider_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/identity-provider/plugin_rest_identity_provider.c index 03279983b0..8ff46b9953 100644 --- a/src/identity-provider/plugin_rest_identity_provider.c +++ b/src/identity-provider/plugin_rest_identity_provider.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/plugin_rest_openid_connect.c b/src/identity-provider/plugin_rest_openid_connect.c index 125bb98f66..3b322ee040 100644 --- a/src/identity-provider/plugin_rest_openid_connect.c +++ b/src/identity-provider/plugin_rest_openid_connect.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c index 9b66a1bc70..d315bb136d 100644 --- a/src/identity/gnunet-identity.c +++ b/src/identity/gnunet-identity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file identity/gnunet-identity.c diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index fdd7cfdc10..53b6257610 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c index 6044d06418..e16efdd214 100644 --- a/src/identity/plugin_rest_identity.c +++ b/src/identity/plugin_rest_identity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c index 7c88e0aceb..b2f290f1d8 100644 --- a/src/identity/test_identity.c +++ b/src/identity/test_identity.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity/test_identity_defaults.c b/src/identity/test_identity_defaults.c index 207db321f6..7aceadaa6d 100644 --- a/src/identity/test_identity_defaults.c +++ b/src/identity/test_identity_defaults.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/block_dns.h b/src/include/block_dns.h index 3e2c9e1fc8..163042233a 100644 --- a/src/include/block_dns.h +++ b/src/include/block_dns.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/block_fs.h b/src/include/block_fs.h index b7c358c3d8..6007f0ad0e 100644 --- a/src/include/block_fs.h +++ b/src/include/block_fs.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/block_regex.h b/src/include/block_regex.h index a709bd3f0c..ea6c7ad9a0 100644 --- a/src/include/block_regex.h +++ b/src/include/block_regex.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012,2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h index f73ea2431f..e7f6cde7dc 100644 --- a/src/include/gnunet_abe_lib.h +++ b/src/include/gnunet_abe_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h index 9620d909e4..4a03a725b1 100644 --- a/src/include/gnunet_applications.h +++ b/src/include/gnunet_applications.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index f8d71bd8b5..319070f653 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h index 27f4a6f0f3..902da23580 100644 --- a/src/include/gnunet_ats_plugin.h +++ b/src/include/gnunet_ats_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index f0d36ff6f9..c2cd8725b0 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h index 967d50dea3..fe5795d5f1 100644 --- a/src/include/gnunet_bandwidth_lib.h +++ b/src/include/gnunet_bandwidth_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h index 1cba819ad0..821ef17add 100644 --- a/src/include/gnunet_bio_lib.h +++ b/src/include/gnunet_bio_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h index 3a3dfb2e27..4e1112712f 100644 --- a/src/include/gnunet_block_group_lib.h +++ b/src/include/gnunet_block_group_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index d8ee68c21c..814832991b 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h index 3eb031573e..0c195c0539 100644 --- a/src/include/gnunet_block_plugin.h +++ b/src/include/gnunet_block_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010,2013,2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index e2edbcc2cb..b6e1b56768 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index 613349fddd..862c6be69f 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 0c527e7740..5171b6f55e 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index 8a874da139..6857011abb 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index 957e88a801..68072f4282 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h index 1c48298a02..ce626b35e4 100644 --- a/src/include/gnunet_constants.h +++ b/src/include/gnunet_constants.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index c77d82fd37..26a57cd396 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index eedf4937bf..f2a5b8cdaa 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 77af465ce3..00b940fe13 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h index 7d6f9e973b..a57a3ad3e1 100644 --- a/src/include/gnunet_credential_service.h +++ b/src/include/gnunet_credential_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index f46afa6cc0..386ae7082d 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 05ac779d6f..7730e355fd 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index 726108c648..772af8fbfa 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index 36a3fbec2c..5985017fae 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index f851385c55..7d34eff139 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index a4c63889e3..030c8ad4c2 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index 114a220521..c2c3981aa1 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h index 017d5a0391..8713a21548 100644 --- a/src/include/gnunet_dns_service.h +++ b/src/include/gnunet_dns_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h index 3a2f785d3d..337c91b1de 100644 --- a/src/include/gnunet_dnsparser_lib.h +++ b/src/include/gnunet_dnsparser_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h index 41e30d0443..cc6a2ed662 100644 --- a/src/include/gnunet_dnsstub_lib.h +++ b/src/include/gnunet_dnsstub_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h index bc59275175..22e05d4a47 100644 --- a/src/include/gnunet_dv_service.h +++ b/src/include/gnunet_dv_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h index e56091c55c..c070e0e112 100644 --- a/src/include/gnunet_fragmentation_lib.h +++ b/src/include/gnunet_fragmentation_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2011, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h index 2e111780ec..0fcd4e91ee 100644 --- a/src/include/gnunet_friends_lib.h +++ b/src/include/gnunet_friends_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index cbad374b5d..902761eea6 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2004--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h index 88c7825d07..673fd4a45f 100644 --- a/src/include/gnunet_getopt_lib.h +++ b/src/include/gnunet_getopt_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h index ff3110406a..9b24a39675 100644 --- a/src/include/gnunet_gns_service.h +++ b/src/include/gnunet_gns_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2014, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index 56dadef3a1..b50b588986 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h index e3e1a98eb8..ebaeb0b068 100644 --- a/src/include/gnunet_gnsrecord_plugin.h +++ b/src/include/gnunet_gnsrecord_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h index dc24502486..2fe4657194 100644 --- a/src/include/gnunet_hello_lib.h +++ b/src/include/gnunet_hello_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h index 60b3ff6816..f1601283f2 100644 --- a/src/include/gnunet_helper_lib.h +++ b/src/include/gnunet_helper_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_identity_attribute_lib.h index 8879ba925e..97fe3df204 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_identity_attribute_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_identity_attribute_plugin.h index edeed57fd4..f4ebb74395 100644 --- a/src/include/gnunet_identity_attribute_plugin.h +++ b/src/include/gnunet_identity_attribute_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_identity_provider_plugin.h index 4b5098d585..cb31218ba2 100644 --- a/src/include/gnunet_identity_provider_plugin.h +++ b/src/include/gnunet_identity_provider_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_identity_provider_service.h index bc666a216d..720d1ad7cc 100644 --- a/src/include/gnunet_identity_provider_service.h +++ b/src/include/gnunet_identity_provider_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index a303e6778d..d26ffc2845 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h index e36821b3ed..cc0506e544 100644 --- a/src/include/gnunet_load_lib.h +++ b/src/include/gnunet_load_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h index 625ac403ac..b130703af2 100644 --- a/src/include/gnunet_microphone_lib.h +++ b/src/include/gnunet_microphone_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index daf1869fb5..95a607cb81 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h index fe6524eb32..fd1c00c4bf 100644 --- a/src/include/gnunet_mst_lib.h +++ b/src/include/gnunet_mst_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h index 5645207dd1..57a82d64c9 100644 --- a/src/include/gnunet_multicast_service.h +++ b/src/include/gnunet_multicast_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h index f8ea01490c..59d558778a 100644 --- a/src/include/gnunet_my_lib.h +++ b/src/include/gnunet_my_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index 6a1e5b3ac2..744b069b63 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h index fd28e6f9db..b3d68228fb 100644 --- a/src/include/gnunet_namecache_plugin.h +++ b/src/include/gnunet_namecache_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h index 2c4ca29c3c..8600e51b6b 100644 --- a/src/include/gnunet_namecache_service.h +++ b/src/include/gnunet_namecache_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index e150682227..0c0d28f249 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index b8c7ea810f..320e13252d 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h index a369c49e05..a181c1cd84 100644 --- a/src/include/gnunet_nat_auto_service.h +++ b/src/include/gnunet_nat_auto_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h index e758452073..8bc3b47dc1 100644 --- a/src/include/gnunet_nat_service.h +++ b/src/include/gnunet_nat_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h index 48a01a498c..5108965154 100644 --- a/src/include/gnunet_nc_lib.h +++ b/src/include/gnunet_nc_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 2c344749f3..efde180bd5 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h index 90f74a7ffb..ac96b867d0 100644 --- a/src/include/gnunet_nse_service.h +++ b/src/include/gnunet_nse_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #ifndef GNUNET_NSE_SERVICE_H_ diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h index d170570a4b..bb16e61e06 100644 --- a/src/include/gnunet_op_lib.h +++ b/src/include/gnunet_op_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index b3800f2862..57c9e7588e 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h index 78d54a4a8d..3d3f5a7535 100644 --- a/src/include/gnunet_peer_lib.h +++ b/src/include/gnunet_peer_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h index b5c2153ac4..1d9727591d 100644 --- a/src/include/gnunet_peerinfo_service.h +++ b/src/include/gnunet_peerinfo_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h index 1d731f2cc7..e23833267d 100644 --- a/src/include/gnunet_peerstore_plugin.h +++ b/src/include/gnunet_peerstore_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h index c636447c20..6b41d7baea 100644 --- a/src/include/gnunet_peerstore_service.h +++ b/src/include/gnunet_peerstore_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h index 9e3e72a215..2e6be6615d 100644 --- a/src/include/gnunet_plugin_lib.h +++ b/src/include/gnunet_plugin_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h index 65be7ab3de..ef1568b9c7 100644 --- a/src/include/gnunet_program_lib.h +++ b/src/include/gnunet_program_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 60dbeeb789..74ff863c65 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001--2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psyc_env.h b/src/include/gnunet_psyc_env.h index 0b319e6ef5..b86681ff77 100644 --- a/src/include/gnunet_psyc_env.h +++ b/src/include/gnunet_psyc_env.h @@ -2,20 +2,15 @@ * This file is part of GNUnet. * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h index e6337d0936..afee039d41 100644 --- a/src/include/gnunet_psyc_message.h +++ b/src/include/gnunet_psyc_message.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index a37ea1b9b5..b4264877eb 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h index 56a7fb6365..93959fb3a5 100644 --- a/src/include/gnunet_psyc_slicer.h +++ b/src/include/gnunet_psyc_slicer.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psyc_util_lib.h b/src/include/gnunet_psyc_util_lib.h index 74218417e5..dd9830cc15 100644 --- a/src/include/gnunet_psyc_util_lib.h +++ b/src/include/gnunet_psyc_util_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h index b8dd0cc98e..1c7d1faf58 100644 --- a/src/include/gnunet_psycstore_plugin.h +++ b/src/include/gnunet_psycstore_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index b1be5246eb..d8c0e77e76 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h index 97063df617..7189858ce8 100644 --- a/src/include/gnunet_regex_service.h +++ b/src/include/gnunet_regex_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Maximilian Szengel diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h index daa571d6f3..3f36c236d0 100644 --- a/src/include/gnunet_resolver_service.h +++ b/src/include/gnunet_resolver_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h index 41b85401d5..cb11dd4678 100644 --- a/src/include/gnunet_rest_lib.h +++ b/src/include/gnunet_rest_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h index 424dbb1fc3..0b1e7c3ffd 100644 --- a/src/include/gnunet_rest_plugin.h +++ b/src/include/gnunet_rest_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h index 8267e28b2e..d4cf60856f 100644 --- a/src/include/gnunet_rps_service.h +++ b/src/include/gnunet_rps_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h index 21e00ca106..77c7ef4fb0 100644 --- a/src/include/gnunet_scalarproduct_service.h +++ b/src/include/gnunet_scalarproduct_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index f9b2736e42..787fbd0139 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h index f77fd33d2d..0d78c418bf 100644 --- a/src/include/gnunet_secretsharing_service.h +++ b/src/include/gnunet_secretsharing_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h index 06aecd2481..370f0920c6 100644 --- a/src/include/gnunet_sensor_service.h +++ b/src/include/gnunet_sensor_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h index 63a6fc10f5..a211410c3f 100644 --- a/src/include/gnunet_sensor_util_lib.h +++ b/src/include/gnunet_sensor_util_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_sensordashboard_service.h b/src/include/gnunet_sensordashboard_service.h index bd4acb2719..3272a8ebd1 100644 --- a/src/include/gnunet_sensordashboard_service.h +++ b/src/include/gnunet_sensordashboard_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h index dda827c95e..b2a2714d02 100644 --- a/src/include/gnunet_service_lib.h +++ b/src/include/gnunet_service_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 0c14aa945f..760e11757d 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h index 08c72fb3a1..4a2edffa3c 100644 --- a/src/include/gnunet_signal_lib.h +++ b/src/include/gnunet_signal_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h index 03bc4575ed..e7c85eedac 100644 --- a/src/include/gnunet_signatures.h +++ b/src/include/gnunet_signatures.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index e9c7f309cf..6929a47d15 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h index 21bc917acd..7d4f7042b0 100644 --- a/src/include/gnunet_socks.h +++ b/src/include/gnunet_socks.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h index b8890a9d72..4ec2483934 100644 --- a/src/include/gnunet_speaker_lib.h +++ b/src/include/gnunet_speaker_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h index 2765a07a9e..5bdfe7bce4 100644 --- a/src/include/gnunet_statistics_service.h +++ b/src/include/gnunet_statistics_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index 897f9f1617..e490c304d0 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h index 4d7c3f7cb6..7302dec0b1 100644 --- a/src/include/gnunet_testbed_logger_service.h +++ b/src/include/gnunet_testbed_logger_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 1c8d83ff96..2701d49d75 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index e09068444e..f88c1ae0a5 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h index 224edc03e9..a064ca5a83 100644 --- a/src/include/gnunet_time_lib.h +++ b/src/include/gnunet_time_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h index aa8cc1ba11..92401e3433 100644 --- a/src/include/gnunet_transport_communication_service.h +++ b/src/include/gnunet_transport_communication_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h index bbb5bafbf1..143b865e8f 100644 --- a/src/include/gnunet_transport_core_service.h +++ b/src/include/gnunet_transport_core_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h index 6d4d0306c7..2ce3fc8332 100644 --- a/src/include/gnunet_transport_hello_service.h +++ b/src/include/gnunet_transport_hello_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h index 8c17896369..f04b1572b2 100644 --- a/src/include/gnunet_transport_manipulation_service.h +++ b/src/include/gnunet_transport_manipulation_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h index a12cc4ed72..c91c6a8c9f 100644 --- a/src/include/gnunet_transport_monitor_service.h +++ b/src/include/gnunet_transport_monitor_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index a07f8d1631..7cbdc114f3 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 94d190f9f1..d291609a8a 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h index 7bef0a6beb..0a4a8a7474 100644 --- a/src/include/gnunet_tun_lib.h +++ b/src/include/gnunet_tun_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index c5d5db3748..3395da5afa 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h index de0c8c343c..2ec7495aa1 100644 --- a/src/include/gnunet_util_taler_wallet_lib.h +++ b/src/include/gnunet_util_taler_wallet_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h index feb5578baf..0ea87c5d2f 100644 --- a/src/include/gnunet_vpn_service.h +++ b/src/include/gnunet_vpn_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/platform.h b/src/include/platform.h index 6095d02588..8062ca658e 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/winproc.h b/src/include/winproc.h index a5352fc591..1540293123 100644 --- a/src/include/winproc.h +++ b/src/include/winproc.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index f845cdecef..f3c10014ec 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for gnunet-peerinfo from __future__ import print_function diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index d18f2b9f81..22b6b07131 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Functions for integration testing import os diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index 2a7768c6a8..c9b63b3923 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # import signal diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index b4c53da586..ea3cf57e20 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # # diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index 8ab3ff4366..be08b1b42e 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2017 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # import sys diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index 12c268bd6b..744af9e533 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # import sys diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index bc86ef3f31..da2df45b72 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2017 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # import sys diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index 81cff78334..be1f720582 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # import sys diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c index b376259884..a645d0a222 100644 --- a/src/multicast/gnunet-multicast.c +++ b/src/multicast/gnunet-multicast.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index e66bacddb1..137bc84470 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h index aeb3c0b414..561f8c36ca 100644 --- a/src/multicast/multicast.h +++ b/src/multicast/multicast.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 3c911f48ac..4f842ca802 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 7e9b51e239..7f1cb54d7a 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c index ad1a48d6cf..8f19de40a7 100644 --- a/src/multicast/test_multicast_2peers.c +++ b/src/multicast/test_multicast_2peers.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 96e86cbb44..4c0fae51d7 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/my/my.c b/src/my/my.c index 459f09b6a4..59f10db98f 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2016 Inria & GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file my/my.c diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c index 17ade5a927..a842703b8c 100644 --- a/src/my/my_query_helper.c +++ b/src/my/my_query_helper.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file my/my_query_helper.c diff --git a/src/my/test_my.c b/src/my/test_my.c index aa02ad515d..5a8dadb992 100644 --- a/src/my/test_my.c +++ b/src/my/test_my.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file my/test_my.c diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c index 157ce52752..673a44fb97 100644 --- a/src/mysql/mysql.c +++ b/src/mysql/mysql.c @@ -3,20 +3,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file mysql/mysql.c diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c index d867138e46..55bc5835c5 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/namecache/gnunet-namecache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-namecache.c diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c index c08f2aef7f..a90d7c4411 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/namecache/gnunet-service-namecache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namecache/namecache.h b/src/namecache/namecache.h index 27e1b2e28f..e9f7f529ba 100644 --- a/src/namecache/namecache.h +++ b/src/namecache/namecache.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c index c12dacd4c0..b70e9f030f 100644 --- a/src/namecache/namecache_api.c +++ b/src/namecache/namecache_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index 220c603059..7b7705c9c5 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2015 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c index d943b0cd85..550b59a7a2 100644 --- a/src/namecache/plugin_namecache_postgres.c +++ b/src/namecache/plugin_namecache_postgres.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2013, 2016, 2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c index e0f64a6b02..39090b9040 100644 --- a/src/namecache/plugin_namecache_sqlite.c +++ b/src/namecache/plugin_namecache_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c index f70388c2a3..415236811b 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/namecache/test_namecache_api_cache_block.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namecache/test_namecache_api.c diff --git a/src/namecache/test_plugin_namecache.c b/src/namecache/test_plugin_namecache.c index 2b1a2d9f8e..b12c756546 100644 --- a/src/namecache/test_plugin_namecache.c +++ b/src/namecache/test_plugin_namecache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file namecache/test_plugin_namecache.c diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 903253b1ae..0698e6d72e 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-namestore-fcfsd.c diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 83a7ee3494..a30cdbb00e 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file gnunet-namestore.c diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 2044010df8..cf11597706 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2014, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index 44c9fe89e1..93994ccab7 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/namestore/gnunet-zoneimport.c diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 679ca3d3de..4935c1c726 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index f2aaa43c8a..c0a3e0cdd1 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c index 16780ad0c9..008d257d29 100644 --- a/src/namestore/namestore_api_monitor.c +++ b/src/namestore/namestore_api_monitor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/namestore_api_monitor.c diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c index e73c61ea24..cf792751e3 100644 --- a/src/namestore/perf_namestore_api_zone_iteration.c +++ b/src/namestore/perf_namestore_api_zone_iteration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/perf_namestore_api_zone_iteration.c diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c index 95edb9d879..5a9c44a88f 100644 --- a/src/namestore/plugin_namestore_flat.c +++ b/src/namestore/plugin_namestore_flat.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2015, 2018 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 09fdd760f6..1db9e174fa 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2013, 2016-2018 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 81391ce8a1..c3babce46a 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2009-2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c index fd1528a1de..471ea7a788 100644 --- a/src/namestore/plugin_rest_namestore.c +++ b/src/namestore/plugin_rest_namestore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index acb30e79df..93b0b7cfeb 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_lookup_nick.c diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c index 3557e71fad..09b6d5f9c0 100644 --- a/src/namestore/test_namestore_api_lookup_private.c +++ b/src/namestore/test_namestore_api_lookup_private.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_store.c diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c index f17bb6fc88..79f30fe9bd 100644 --- a/src/namestore/test_namestore_api_lookup_public.c +++ b/src/namestore/test_namestore_api_lookup_public.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api.c diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index 1cab0a9f68..afe3dbeb85 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_lookup_shadow.c diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c index 0ccdf1f4bf..ba4d6a1fc6 100644 --- a/src/namestore/test_namestore_api_lookup_shadow_filter.c +++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_lookup_shadow_filter.c diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index 7c8ee27d74..b3e38a2376 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_monitoring.c diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index 89fd9c8e9d..e1c0929106 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_monitoring_existing.c diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 8f7782300f..4a1d580a37 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api.c diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index d0438a7e13..ccb764fb75 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_remove_not_existing_record.c diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index 5112126c1e..b8e062690f 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_store.c diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index d636018afb..846dc8b135 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_store_update.c diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 00b65a5762..225268144a 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index ff1b3d402b..1cf24e0322 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index a861842977..34deeab426 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_zone_iteration_specific_zone.c diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 98514885c1..a1a1bca5b8 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 4ce940114d..fb0c95ca4d 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file namestore/test_namestore_api_zone_to_name.c diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index 5c8f5e6f74..ae0dcb6283 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file namestore/test_plugin_namestore.c diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c index 7d09253b85..098150e2c3 100644 --- a/src/nat-auto/gnunet-nat-auto.c +++ b/src/nat-auto/gnunet-nat-auto.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c index 32f40c0378..87054d934f 100644 --- a/src/nat-auto/gnunet-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-nat-auto_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c index 590fad4d69..913c4a4f63 100644 --- a/src/nat-auto/gnunet-nat-server.c +++ b/src/nat-auto/gnunet-nat-server.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/nat-auto/gnunet-service-nat-auto.c index 5f10dad940..3084f53e5a 100644 --- a/src/nat-auto/gnunet-service-nat-auto.c +++ b/src/nat-auto/gnunet-service-nat-auto.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c index bcfa4b92b7..a3d5678adb 100644 --- a/src/nat-auto/gnunet-service-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/nat-auto.h b/src/nat-auto/nat-auto.h index 07b5a5b910..1673bea039 100644 --- a/src/nat-auto/nat-auto.h +++ b/src/nat-auto/nat-auto.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c index 43a5212c88..bc180904d1 100644 --- a/src/nat-auto/nat_auto_api.c +++ b/src/nat-auto/nat_auto_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c index c72b611bff..8325da5276 100644 --- a/src/nat-auto/nat_auto_api_test.c +++ b/src/nat-auto/nat_auto_api_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file nat/nat_auto_api_test.c diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c index 622f8c961f..4d641e5f17 100644 --- a/src/nat/gnunet-helper-nat-client-windows.c +++ b/src/nat/gnunet-helper-nat-client-windows.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-helper-nat-client.c b/src/nat/gnunet-helper-nat-client.c index 359e529b0f..839c9c175e 100644 --- a/src/nat/gnunet-helper-nat-client.c +++ b/src/nat/gnunet-helper-nat-client.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c index 09bd025386..53f4ed6de1 100644 --- a/src/nat/gnunet-helper-nat-server-windows.c +++ b/src/nat/gnunet-helper-nat-server-windows.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-helper-nat-server.c b/src/nat/gnunet-helper-nat-server.c index b8f499b4d0..2978261e4f 100644 --- a/src/nat/gnunet-helper-nat-server.c +++ b/src/nat/gnunet-helper-nat-server.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index 72f3436273..60c1c56512 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 21089890de..43c1740c30 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat.h b/src/nat/gnunet-service-nat.h index 96eb9f78ba..96cda80cac 100644 --- a/src/nat/gnunet-service-nat.h +++ b/src/nat/gnunet-service-nat.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/nat/gnunet-service-nat_externalip.c index f79ff40707..2c5494d5e9 100644 --- a/src/nat/gnunet-service-nat_externalip.c +++ b/src/nat/gnunet-service-nat_externalip.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * Code to figure out what our external IPv4 address(es) might diff --git a/src/nat/gnunet-service-nat_externalip.h b/src/nat/gnunet-service-nat_externalip.h index 31910555d7..211856d705 100644 --- a/src/nat/gnunet-service-nat_externalip.h +++ b/src/nat/gnunet-service-nat_externalip.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * Code to figure out what our external IPv4 address(es) might diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c index de6531fa88..fe591b63fe 100644 --- a/src/nat/gnunet-service-nat_helper.c +++ b/src/nat/gnunet-service-nat_helper.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat_helper.h b/src/nat/gnunet-service-nat_helper.h index 026526b055..f5e129def7 100644 --- a/src/nat/gnunet-service-nat_helper.h +++ b/src/nat/gnunet-service-nat_helper.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c index 8f1229be17..10bebaa7ad 100644 --- a/src/nat/gnunet-service-nat_mini.c +++ b/src/nat/gnunet-service-nat_mini.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat_mini.h b/src/nat/gnunet-service-nat_mini.h index 8a7af9bf10..341954c8b1 100644 --- a/src/nat/gnunet-service-nat_mini.h +++ b/src/nat/gnunet-service-nat_mini.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/gnunet-service-nat_stun.c b/src/nat/gnunet-service-nat_stun.c index 6f3ea10eb7..26acf71519 100644 --- a/src/nat/gnunet-service-nat_stun.c +++ b/src/nat/gnunet-service-nat_stun.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * This code provides some support for doing STUN transactions. We diff --git a/src/nat/gnunet-service-nat_stun.h b/src/nat/gnunet-service-nat_stun.h index 3d7e18f53d..070a0dab89 100644 --- a/src/nat/gnunet-service-nat_stun.h +++ b/src/nat/gnunet-service-nat_stun.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * This code provides some support for doing STUN transactions. We diff --git a/src/nat/nat.h b/src/nat/nat.h index d34900bd19..89832cc2b6 100644 --- a/src/nat/nat.h +++ b/src/nat/nat.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c index 69612584e8..339b7c0387 100644 --- a/src/nat/nat_api.c +++ b/src/nat/nat_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c index b1309fb538..3697d93419 100644 --- a/src/nat/nat_api_stun.c +++ b/src/nat/nat_api_stun.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * This code provides some support for doing STUN transactions. diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h index 8d1c2720fe..5fa160ce69 100644 --- a/src/nat/nat_stun.h +++ b/src/nat/nat_stun.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * Message types for STUN server resolution diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 2e14a1ffad..8afee1e78e 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index d6ab2a3214..047348dd58 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index 402671bd2f..be226afd28 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file nat/test_nat_test.c diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c index 9d4792cd67..d2b768569e 100644 --- a/src/nat/test_stun.c +++ b/src/nat/test_stun.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index b665812e53..d02aed17cb 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file nse/gnunet-nse-profiler.c diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c index bd6bcec550..730d233c18 100644 --- a/src/nse/gnunet-nse.c +++ b/src/nse/gnunet-nse.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index e35115e31d..1e8257513f 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/nse.h b/src/nse/nse.h index e3a69cdeb4..e1219dfa24 100644 --- a/src/nse/nse.h +++ b/src/nse/nse.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index d50b0214ac..f9acd93142 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c index 61e4778741..7900095aee 100644 --- a/src/nse/perf_kdf.c +++ b/src/nse/perf_kdf.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 22826b2981..5714c33fa5 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file nse/test_nse_api.c diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index d6d63778e4..aeea216d7f 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file nse/test_nse_multipeer.c diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c index de7dcd6fa9..ddc295eef7 100644 --- a/src/peerinfo-tool/gnunet-peerinfo.c +++ b/src/peerinfo-tool/gnunet-peerinfo.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.c b/src/peerinfo-tool/gnunet-peerinfo_plugins.c index 5f298647d1..dd1be3eeac 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.h b/src/peerinfo-tool/gnunet-peerinfo_plugins.h index 728029bb2d..a8420c7ab3 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.h +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index fb5941121c..cbd6191b85 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 3, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for gnunet-peerinfo import sys diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index 6b39149beb..bb05fbc953 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h index 518b8d5e5a..607cf00338 100644 --- a/src/peerinfo/peerinfo.h +++ b/src/peerinfo/peerinfo.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index 09ec04bf8e..d84338417d 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c index ce226d96e4..195bd78ae8 100644 --- a/src/peerinfo/peerinfo_api_notify.c +++ b/src/peerinfo/peerinfo_api_notify.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 840c85c1bb..0e093673f4 100644 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009, 2010, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 96e73e20a8..3bf6c4ff0a 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/test_peerinfo_api_friend_only.c b/src/peerinfo/test_peerinfo_api_friend_only.c index 8086d8d43b..0c2c203a07 100644 --- a/src/peerinfo/test_peerinfo_api_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_friend_only.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c index e91610c252..0192e2246b 100644 --- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c index dfaac5da93..1411d24c73 100644 --- a/src/peerinfo/test_peerinfo_shipped_hellos.c +++ b/src/peerinfo/test_peerinfo_shipped_hellos.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c index 25a4f0ff4b..dfff50cb73 100644 --- a/src/peerstore/gnunet-peerstore.c +++ b/src/peerstore/gnunet-peerstore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c index 92d020799b..ee92a25b07 100644 --- a/src/peerstore/gnunet-service-peerstore.c +++ b/src/peerstore/gnunet-service-peerstore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h index c6b9546764..5c866f3c2c 100644 --- a/src/peerstore/peerstore.h +++ b/src/peerstore/peerstore.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/peerstore.h diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c index df182fe104..788ea43cbe 100644 --- a/src/peerstore/peerstore_api.c +++ b/src/peerstore/peerstore_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/peerstore_api.c diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c index e0ab778faf..c046344eb6 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/peerstore/peerstore_common.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/peerstore_common.c diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h index 0fc14d9b48..2b8d621da6 100644 --- a/src/peerstore/peerstore_common.h +++ b/src/peerstore/peerstore_common.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c index 82a3adec1b..dcbaab3b41 100644 --- a/src/peerstore/perf_peerstore_store.c +++ b/src/peerstore/perf_peerstore_store.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/perf_peerstore_store.c diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index c75b2b1e4a..b8903908a7 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2015 Christian Grothoff (and other contributing authors) * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c index 440263d44b..31add2bad1 100644 --- a/src/peerstore/plugin_peerstore_sqlite.c +++ b/src/peerstore/plugin_peerstore_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013, 2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c index c607d9fb38..98089e867a 100644 --- a/src/peerstore/test_peerstore_api_iterate.c +++ b/src/peerstore/test_peerstore_api_iterate.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/test_peerstore_api_iterate.c diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c index 978009dbbb..3ee2789ea6 100644 --- a/src/peerstore/test_peerstore_api_store.c +++ b/src/peerstore/test_peerstore_api_store.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/test_peerstore_api_store.c diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c index a09763d057..b18575220d 100644 --- a/src/peerstore/test_peerstore_api_sync.c +++ b/src/peerstore/test_peerstore_api_sync.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/test_peerstore_api_sync.c diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c index 1c9995c317..ccb9414759 100644 --- a/src/peerstore/test_peerstore_api_watch.c +++ b/src/peerstore/test_peerstore_api_watch.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file peerstore/test_peerstore_api_watch.c diff --git a/src/peerstore/test_plugin_peerstore.c b/src/peerstore/test_plugin_peerstore.c index 62c06be8e6..c20f7cbe17 100644 --- a/src/peerstore/test_plugin_peerstore.c +++ b/src/peerstore/test_plugin_peerstore.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* * @file namestore/test_plugin_namestore.c diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 49779ef2c3..be6d442c45 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h index c1ce466a93..c6a5b26dd2 100644 --- a/src/psyc/psyc.h +++ b/src/psyc/psyc.h @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c index d8f4c98bcb..6d431c2003 100644 --- a/src/psyc/psyc_api.c +++ b/src/psyc/psyc_api.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/psyc_test_lib.h b/src/psyc/psyc_test_lib.h index 10e3c46fe6..02a09cdfcf 100644 --- a/src/psyc/psyc_test_lib.h +++ b/src/psyc/psyc_test_lib.h @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 370befb9df..f76ebbaac7 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c index bbf3eed9d9..636d49b86f 100644 --- a/src/psyc/test_psyc2.c +++ b/src/psyc/test_psyc2.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c index ae019d42ed..c42274fed7 100644 --- a/src/psyc/test_psyc_api_join.c +++ b/src/psyc/test_psyc_api_join.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index 1bee8da65d..b544ecb86a 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index c76e7e6b12..4a75e9997d 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c index 046daf6ead..3fba646d6d 100644 --- a/src/psycstore/plugin_psycstore_postgres.c +++ b/src/psycstore/plugin_psycstore_postgres.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2016 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c index 69291b4406..44a9f4a56b 100644 --- a/src/psycstore/plugin_psycstore_sqlite.c +++ b/src/psycstore/plugin_psycstore_sqlite.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h index 402d7d5eaa..23308ba48e 100644 --- a/src/psycstore/psycstore.h +++ b/src/psycstore/psycstore.h @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c index 5a4865dcef..4cfd3c2c56 100644 --- a/src/psycstore/psycstore_api.c +++ b/src/psycstore/psycstore_api.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c index 8bc1407cd2..7a0fb7fa1c 100644 --- a/src/psycstore/test_plugin_psycstore.c +++ b/src/psycstore/test_plugin_psycstore.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 37e6b657cd..771c929a89 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c index 0d8a4ec69c..f06259dbbd 100644 --- a/src/psycutil/psyc_env.c +++ b/src/psycutil/psyc_env.c @@ -2,20 +2,15 @@ * This file is part of GNUnet. * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c index 3bd99425ef..f5c91f4d23 100644 --- a/src/psycutil/psyc_message.c +++ b/src/psycutil/psyc_message.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c index a32bbe4845..a93b6633b1 100644 --- a/src/psycutil/psyc_slicer.c +++ b/src/psycutil/psyc_slicer.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c index 324c244e4d..91be092b86 100644 --- a/src/psycutil/test_psyc_env.c +++ b/src/psycutil/test_psyc_env.c @@ -2,20 +2,15 @@ * This file is part of GNUnet. * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c index 295082c0ec..d194a37b1b 100644 --- a/src/pt/gnunet-daemon-pt.c +++ b/src/pt/gnunet-daemon-pt.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012, 2017 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file pt/gnunet-daemon-pt.c diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 53f27610b4..b4e46da19a 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2007, 2009, 2011, 2012, 2015, 2017 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 6393b395fe..5addcf172f 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2007, 2009, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index 24919aebe7..198ac1dd7b 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 73ca7c809f..6cdbfcfe96 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 - 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c index 67c2ecfff9..cdeeaf0f0b 100644 --- a/src/regex/gnunet-regex-simulation-profiler.c +++ b/src/regex/gnunet-regex-simulation-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c index 9a40a52648..0c697c3d84 100644 --- a/src/regex/gnunet-service-regex.c +++ b/src/regex/gnunet-service-regex.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c index ec42d26250..9940ba388e 100644 --- a/src/regex/perf-regex.c +++ b/src/regex/perf-regex.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c index 287ecf905d..95b4df4611 100644 --- a/src/regex/plugin_block_regex.c +++ b/src/regex/plugin_block_regex.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c index 8e018f26ce..14ab15948d 100644 --- a/src/regex/regex_api_announce.c +++ b/src/regex/regex_api_announce.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/regex_api_announce.c diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c index a5480ac7a6..9695195ecc 100644 --- a/src/regex/regex_api_search.c +++ b/src/regex/regex_api_search.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/regex_api_search.c diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c index d545c89de0..1ae295745b 100644 --- a/src/regex/regex_block_lib.c +++ b/src/regex/regex_block_lib.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012,2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Bartlomiej Polot diff --git a/src/regex/regex_block_lib.h b/src/regex/regex_block_lib.h index a85e447f3a..e0ccf5f83e 100644 --- a/src/regex/regex_block_lib.h +++ b/src/regex/regex_block_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012,2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c index a74471ba12..740e1be3d6 100644 --- a/src/regex/regex_internal.c +++ b/src/regex/regex_internal.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/regex/regex_internal.c diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h index 53d7dad090..6180305c06 100644 --- a/src/regex/regex_internal.h +++ b/src/regex/regex_internal.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/regex/regex_internal.h diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c index 828bb16489..b68341a2c8 100644 --- a/src/regex/regex_internal_dht.c +++ b/src/regex/regex_internal_dht.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/regex/regex_internal_dht.c diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h index 1156e33f3c..8b2dfce523 100644 --- a/src/regex/regex_internal_lib.h +++ b/src/regex/regex_internal_lib.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/regex_internal_lib.h diff --git a/src/regex/regex_ipc.h b/src/regex/regex_ipc.h index 6ab3b32d95..2b3345f989 100644 --- a/src/regex/regex_ipc.h +++ b/src/regex/regex_ipc.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/regex_ipc.h diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c index d502faabfc..be0f65ece5 100644 --- a/src/regex/regex_test_graph.c +++ b/src/regex/regex_test_graph.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/regex/regex_test_graph.c diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index c5f9f6cf0e..4ae2892ebb 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2012-2017 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** * @file src/regex/regex_test_lib.c diff --git a/src/regex/regex_test_lib.h b/src/regex/regex_test_lib.h index c4f7e7539b..f7af542017 100644 --- a/src/regex/regex_test_lib.h +++ b/src/regex/regex_test_lib.h @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2012 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** * @file src/regex/regex_test_lib.h diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c index 08f75696d4..3307bd0435 100644 --- a/src/regex/regex_test_random.c +++ b/src/regex/regex_test_random.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/regex/regex_test_random.c diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c index 01f455854d..fa9b05baf4 100644 --- a/src/regex/test_regex_api.c +++ b/src/regex/test_regex_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_api.c diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c index d598dc5087..d0a4a5be82 100644 --- a/src/regex/test_regex_eval_api.c +++ b/src/regex/test_regex_eval_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_eval_api.c diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c index 2bf5395a3e..c9ab692a13 100644 --- a/src/regex/test_regex_graph_api.c +++ b/src/regex/test_regex_graph_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_graph_api.c diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c index d98d800709..41121404c8 100644 --- a/src/regex/test_regex_integration.c +++ b/src/regex/test_regex_integration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_integration.c diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c index 363c27147f..4ffdb973c2 100644 --- a/src/regex/test_regex_iterate_api.c +++ b/src/regex/test_regex_iterate_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_iterate_api.c diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c index 5458e46ec0..a29fe52b47 100644 --- a/src/regex/test_regex_proofs.c +++ b/src/regex/test_regex_proofs.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file regex/test_regex_proofs.c diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index da75edf812..19084af164 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Martin Schanzenbach diff --git a/src/rest/rest.c b/src/rest/rest.c index 94803a3069..fa54a5c2d8 100644 --- a/src/rest/rest.c +++ b/src/rest/rest.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index 13e6b23a5c..51e33a62f3 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c index eb0766b818..53b61d1062 100644 --- a/src/revocation/plugin_block_revocation.c +++ b/src/revocation/plugin_block_revocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/revocation/revocation.h b/src/revocation/revocation.h index 56ed9555ae..934d678510 100644 --- a/src/revocation/revocation.h +++ b/src/revocation/revocation.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index 067091b58e..b9acd10dbc 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.py.in @@ -2,20 +2,15 @@ # This file is part of GNUnet. # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # Testcase for ego revocation from __future__ import print_function diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index c3eefa8b1e..b28cf5ba53 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file revocation/test_revocation.c diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index 1ad9deabb2..bda43a5887 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_rps.c diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c index 8de5885685..b91fdf6cd9 100644 --- a/src/rps/gnunet-rps.c +++ b/src/rps/gnunet-rps.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index eb47903e00..9a9f6a91e7 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c index aef081a002..335f4d2e3f 100644 --- a/src/rps/gnunet-service-rps_custommap.c +++ b/src/rps/gnunet-service-rps_custommap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_custommap.h b/src/rps/gnunet-service-rps_custommap.h index f339b841de..f2cb58bc96 100644 --- a/src/rps/gnunet-service-rps_custommap.h +++ b/src/rps/gnunet-service-rps_custommap.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c index cfc5ce77b9..de8b516981 100644 --- a/src/rps/gnunet-service-rps_sampler.c +++ b/src/rps/gnunet-service-rps_sampler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/rps/gnunet-service-rps_sampler.h index f33e7430c3..de82d9f33d 100644 --- a/src/rps/gnunet-service-rps_sampler.h +++ b/src/rps/gnunet-service-rps_sampler.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_sampler_elem.c b/src/rps/gnunet-service-rps_sampler_elem.c index 007f818e28..7d6c7f8452 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.c +++ b/src/rps/gnunet-service-rps_sampler_elem.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_sampler_elem.h b/src/rps/gnunet-service-rps_sampler_elem.h index bbf2c147bd..e52be95ed3 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.h +++ b/src/rps/gnunet-service-rps_sampler_elem.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_view.c b/src/rps/gnunet-service-rps_view.c index b7a0ba2873..7181a33373 100644 --- a/src/rps/gnunet-service-rps_view.c +++ b/src/rps/gnunet-service-rps_view.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/gnunet-service-rps_view.h b/src/rps/gnunet-service-rps_view.h index 6a85a21342..ee04699f86 100644 --- a/src/rps/gnunet-service-rps_view.h +++ b/src/rps/gnunet-service-rps_view.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 869170a8ae..2d53cbffd4 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index 59f0623319..e05b0cf6cf 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/rps.h b/src/rps/rps.h index 6a7fa3e147..76485c56da 100644 --- a/src/rps/rps.h +++ b/src/rps/rps.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/rps.h diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c index 0da3bd4a4a..9e591510cc 100644 --- a/src/rps/rps_api.c +++ b/src/rps/rps_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index 39aeacfebc..1f6d88f326 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_rps.c diff --git a/src/rps/test_rps_api.c b/src/rps/test_rps_api.c index 546d8f2854..d3ca4d2360 100644 --- a/src/rps/test_rps_api.c +++ b/src/rps/test_rps_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_rps_api.c diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c index f88842b791..eeab0db92a 100644 --- a/src/rps/test_service_rps_custommap.c +++ b/src/rps/test_service_rps_custommap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_service_rps_custommap.c diff --git a/src/rps/test_service_rps_sampler_elem.c b/src/rps/test_service_rps_sampler_elem.c index 6f515d2c23..f97ee57191 100644 --- a/src/rps/test_service_rps_sampler_elem.c +++ b/src/rps/test_service_rps_sampler_elem.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_service_rps_sampler_elem.c diff --git a/src/rps/test_service_rps_view.c b/src/rps/test_service_rps_view.c index 68d1b11d41..2606c6deb3 100644 --- a/src/rps/test_service_rps_view.c +++ b/src/rps/test_service_rps_view.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file rps/test_service_rps_view.c diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c index 4a152e09ef..fe5099c078 100644 --- a/src/scalarproduct/gnunet-scalarproduct.c +++ b/src/scalarproduct/gnunet-scalarproduct.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h index 2c84a6bf97..1fab820014 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc.h diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c index 57f275c81e..94b2029afa 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc_alice.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index 0b0333332a..63d1490cd7 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc_bob.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h b/src/scalarproduct/gnunet-service-scalarproduct.h index c07fe5d723..f8d7f197f6 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct.h +++ b/src/scalarproduct/gnunet-service-scalarproduct.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct.h diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index fcb1ce0322..ddd4e42f40 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct_alice.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 0c38cb4269..0f94093b77 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/gnunet-service-scalarproduct_bob.c diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h index a7ffefbde2..700a545299 100644 --- a/src/scalarproduct/scalarproduct.h +++ b/src/scalarproduct/scalarproduct.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct.h diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c index 05c122e74d..061929000c 100644 --- a/src/scalarproduct/scalarproduct_api.c +++ b/src/scalarproduct/scalarproduct_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file scalarproduct/scalarproduct_api.c diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index a83dcd92aa..89c2315096 100644 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index ccdba12c29..34b71f4a2b 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/secretsharing/secretsharing.h b/src/secretsharing/secretsharing.h index 5936b6ab94..6c3c2deaaf 100644 --- a/src/secretsharing/secretsharing.h +++ b/src/secretsharing/secretsharing.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c index 85df66c13b..9792c58d0b 100644 --- a/src/secretsharing/secretsharing_api.c +++ b/src/secretsharing/secretsharing_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/secretsharing/secretsharing_common.c b/src/secretsharing/secretsharing_common.c index 236b88894e..5f0380ba33 100644 --- a/src/secretsharing/secretsharing_common.c +++ b/src/secretsharing/secretsharing_common.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #include "secretsharing.h" diff --git a/src/secretsharing/secretsharing_protocol.h b/src/secretsharing/secretsharing_protocol.h index e5e535738b..4b94238363 100644 --- a/src/secretsharing/secretsharing_protocol.h +++ b/src/secretsharing/secretsharing_protocol.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c index e814f74967..43b6787f32 100644 --- a/src/secretsharing/test_secretsharing_api.c +++ b/src/secretsharing/test_secretsharing_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 42d06b2753..3e0955108e 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set.c diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h index 19413fd304..416e136d74 100644 --- a/src/set/gnunet-service-set.h +++ b/src/set/gnunet-service-set.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set.h diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index 9dc4217921..44c7e6d5d2 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set_intersection.c diff --git a/src/set/gnunet-service-set_intersection.h b/src/set/gnunet-service-set_intersection.h index 3bd2551422..2506c83eb7 100644 --- a/src/set/gnunet-service-set_intersection.h +++ b/src/set/gnunet-service-set_intersection.h @@ -3,20 +3,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set_intersection.h diff --git a/src/set/gnunet-service-set_protocol.h b/src/set/gnunet-service-set_protocol.h index 0138b21c77..b134818c41 100644 --- a/src/set/gnunet-service-set_protocol.h +++ b/src/set/gnunet-service-set_protocol.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @author Florian Dold diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 219cc6235c..f8253da2e4 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set_union.c diff --git a/src/set/gnunet-service-set_union.h b/src/set/gnunet-service-set_union.h index 0866667708..f9fe1d2651 100644 --- a/src/set/gnunet-service-set_union.h +++ b/src/set/gnunet-service-set_union.h @@ -3,20 +3,15 @@ This file is part of GNUnet Copyright (C) 2013-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set_union.h diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c index 0bd22c92ef..16eb9c9ff1 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.c +++ b/src/set/gnunet-service-set_union_strata_estimator.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/gnunet-service-set_union_strata_estimator.c diff --git a/src/set/gnunet-service-set_union_strata_estimator.h b/src/set/gnunet-service-set_union_strata_estimator.h index 4d8ab31a22..0b01aaee94 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.h +++ b/src/set/gnunet-service-set_union_strata_estimator.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c index 70fafa1e14..8ed4935b3e 100644 --- a/src/set/gnunet-set-ibf-profiler.c +++ b/src/set/gnunet-set-ibf-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index 68f7be690b..c622049231 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/ibf.c b/src/set/ibf.c index 83e809a16a..8002c173f2 100644 --- a/src/set/ibf.c +++ b/src/set/ibf.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/ibf.h b/src/set/ibf.h index 92ae2c0f37..71589a49dd 100644 --- a/src/set/ibf.h +++ b/src/set/ibf.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c index 2ef1305637..d1b665f854 100644 --- a/src/set/ibf_sim.c +++ b/src/set/ibf_sim.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c index 01b0c8602c..9e0113464e 100644 --- a/src/set/plugin_block_set_test.c +++ b/src/set/plugin_block_set_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/set.h b/src/set/set.h index 258e2bff9d..b22f98a8b9 100644 --- a/src/set/set.h +++ b/src/set/set.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/set.h diff --git a/src/set/set_api.c b/src/set/set_api.c index cefc6734a4..5026e9b04c 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file set/set_api.c diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c index ca7d8a4e26..67e8bff05c 100644 --- a/src/set/test_set_api.c +++ b/src/set/test_set_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c index 16de983cf0..755d08fdbb 100644 --- a/src/set/test_set_intersection_result_full.c +++ b/src/set/test_set_intersection_result_full.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/test_set_union_copy.c b/src/set/test_set_union_copy.c index 242b9f2f2d..7940fdd14a 100644 --- a/src/set/test_set_union_copy.c +++ b/src/set/test_set_union_copy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c index 3008e5aac0..79275c5861 100644 --- a/src/set/test_set_union_result_symmetric.c +++ b/src/set/test_set_union_result_symmetric.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index bac08ae9da..52c466e64e 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index 12c5bf2e18..353081648c 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/social/social.h b/src/social/social.h index 751ad186c1..8069310488 100644 --- a/src/social/social.h +++ b/src/social/social.h @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/social/social_api.c b/src/social/social_api.c index 89843831be..8c32760ae9 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** diff --git a/src/social/test_social.c b/src/social/test_social.c index 4d95cf005b..09b1322465 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c @@ -2,20 +2,15 @@ * This file is part of GNUnet * Copyright (C) 2013 GNUnet e.V. * - * GNUnet is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 3, or (at your - * option) any later version. + * GNUnet is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * * GNUnet is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GNUnet; see the file COPYING. If not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Affero General Public License for more details. */ /** * @file social/test_social.c diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c index 87e966a01d..c14969ae31 100644 --- a/src/statistics/gnunet-service-statistics.c +++ b/src/statistics/gnunet-service-statistics.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2012, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c index 159afda53c..659b76d340 100644 --- a/src/statistics/gnunet-statistics.c +++ b/src/statistics/gnunet-statistics.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004-2007, 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/statistics/statistics.h b/src/statistics/statistics.h index 41863a64f7..79abe7daa4 100644 --- a/src/statistics/statistics.h +++ b/src/statistics/statistics.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c index 9d04e854fa..66a4c3a642 100644 --- a/src/statistics/statistics_api.c +++ b/src/statistics/statistics_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 41f1ef562b..1776d39a93 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file statistics/test_statistics_api.c diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index a1664cde55..02dfeaa1df 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file statistics/test_statistics_api_loop.c diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index 9b004d1d52..d8814083db 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file statistics/test_statistics_api_watch.c diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index fd0c0410ba..7c1130a542 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2011, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file statistics/test_statistics_api_watch_zero_value.c diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c index 815cc26d69..b23550f3cd 100644 --- a/src/template/gnunet-service-template.c +++ b/src/template/gnunet-service-template.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c index 22b78d632d..66b6590613 100644 --- a/src/template/gnunet-template.c +++ b/src/template/gnunet-template.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c index 3263612910..bea01f5c4e 100644 --- a/src/template/test_template_api.c +++ b/src/template/test_template_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file template/test_template_api.c diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c index f915e70af4..046440fa14 100644 --- a/src/testbed-logger/gnunet-service-testbed-logger.c +++ b/src/testbed-logger/gnunet-service-testbed-logger.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed-logger/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c index e627feeb4f..199ba1cd80 100644 --- a/src/testbed-logger/test_testbed_logger_api.c +++ b/src/testbed-logger/test_testbed_logger_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file testbed-logger/test_testbed_logger_api.c diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index 7aa4ade352..cb2e7f326a 100644 --- a/src/testbed-logger/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in index 2a881b8f0f..caf8434364 100644 --- a/src/testbed/buildvars.py.in +++ b/src/testbed/buildvars.py.in @@ -1,20 +1,15 @@ # This file is part of GNUnet. # (C) 2008--2013, 2018 Christian Grothoff (and other contributing authors) # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 2, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # file: testbed/buildvars.py diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c index 2e78c60be1..55bd938f1d 100644 --- a/src/testbed/generate-underlay-topology.c +++ b/src/testbed/generate-underlay-topology.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index b2c7b1043b..36fd441ed5 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index 3ebe20258b..a6308f4139 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index 3605e03842..e61e3838b0 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 9601e75677..554bafbbb5 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c index 874c7a363e..5a5d4de822 100644 --- a/src/testbed/gnunet-service-test-barriers.c +++ b/src/testbed/gnunet-service-test-barriers.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 39697cb56b..e1a397e5b5 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 6f797a066b..d01aab8cd1 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index 681ed6df29..4404b5d7f0 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_barriers.h b/src/testbed/gnunet-service-testbed_barriers.h index 2fc3222f88..45ac574400 100644 --- a/src/testbed/gnunet-service-testbed_barriers.h +++ b/src/testbed/gnunet-service-testbed_barriers.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index 2e5c41d5b4..b7c2118730 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index 6bc744ba87..a67a907394 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_connectionpool.h b/src/testbed/gnunet-service-testbed_connectionpool.h index dc887ff8ce..6d7709d34a 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.h +++ b/src/testbed/gnunet-service-testbed_connectionpool.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index ae49e31f9e..2f70d887ba 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c index 3447a3f344..24f8874588 100644 --- a/src/testbed/gnunet-service-testbed_links.c +++ b/src/testbed/gnunet-service-testbed_links.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_links.h b/src/testbed/gnunet-service-testbed_links.h index 09764b99ac..a0c8717417 100644 --- a/src/testbed/gnunet-service-testbed_links.h +++ b/src/testbed/gnunet-service-testbed_links.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c index 73732eb9d7..38c56be207 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.c +++ b/src/testbed/gnunet-service-testbed_meminfo.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #include "platform.h" diff --git a/src/testbed/gnunet-service-testbed_meminfo.h b/src/testbed/gnunet-service-testbed_meminfo.h index f2da53412b..0704e9331b 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.h +++ b/src/testbed/gnunet-service-testbed_meminfo.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /* obsolete */ diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 11c45a0f5d..3f12dd9503 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index aacd625832..09498b6c75 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 0fa6d8172f..95a29670f8 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index 7ba9e7c313..8666e93169 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 19e95f2c21..3960a29798 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index 1e15d07aa8..187d37505b 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 0ee1fc5669..c35c703570 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c index e712e2d5af..07e0a46969 100644 --- a/src/testbed/test_testbed_api_barriers.c +++ b/src/testbed/test_testbed_api_barriers.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 6ed7e57334..2a880e8cb0 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index 0999020a83..18f4431f8b 100644 --- a/src/testbed/test_testbed_api_hosts.c +++ b/src/testbed/test_testbed_api_hosts.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index f2fc4e6e33..8bdcabd1d3 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 315d8a3f3d..5b9416c512 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index 170f4a067a..aa58158dba 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c index 16f720a03a..5cf1e2ca05 100644 --- a/src/testbed/test_testbed_api_sd.c +++ b/src/testbed/test_testbed_api_sd.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index 20598b565e..327934f2c0 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 61d3f2aba1..b47615d1c8 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c index bb4c439dda..94b9cccd0b 100644 --- a/src/testbed/test_testbed_api_test_timeout.c +++ b/src/testbed/test_testbed_api_test_timeout.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 45c9f5adf3..1ceae012e6 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 49b46b0dfd..dda08a0263 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 4ca6dbddae..6995c65e59 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c index 098a2b3dbf..384cbe2659 100644 --- a/src/testbed/test_testbed_underlay.c +++ b/src/testbed/test_testbed_underlay.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index b6119e98f4..1357c2a88b 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 1acd0e47c9..86ef3ae1a7 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index 09db9265f8..ba929d3110 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index 93698d4b72..118ebba21d 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 8efcab6498..4948ae0cef 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h index 2e53e1c649..56a23a5f98 100644 --- a/src/testbed/testbed_api_hosts.h +++ b/src/testbed/testbed_api_hosts.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index de24517d6a..f567d22ccf 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index 43f5034ab1..3f176e8747 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index 871e554a94..1b70a7249f 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h index 3c8cf86884..6dccd254ec 100644 --- a/src/testbed/testbed_api_peers.h +++ b/src/testbed/testbed_api_peers.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c index 1690b10540..264a7dc75d 100644 --- a/src/testbed/testbed_api_sd.c +++ b/src/testbed/testbed_api_sd.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_sd.h b/src/testbed/testbed_api_sd.h index e2a697634f..d1109627c6 100644 --- a/src/testbed/testbed_api_sd.h +++ b/src/testbed/testbed_api_sd.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c index 1a94ecc0ff..a433f38969 100644 --- a/src/testbed/testbed_api_services.c +++ b/src/testbed/testbed_api_services.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c index 4fd117953e..f308c7b38e 100644 --- a/src/testbed/testbed_api_statistics.c +++ b/src/testbed/testbed_api_statistics.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index 559c4abd92..dbd9e745e6 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index eaa1656ba2..2b6a1728af 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 7d0ccd269a..a0168e644b 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_topology.h b/src/testbed/testbed_api_topology.h index 89f7abb45f..2f7bd11ffe 100644 --- a/src/testbed/testbed_api_topology.h +++ b/src/testbed/testbed_api_topology.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_api_underlay.c b/src/testbed/testbed_api_underlay.c index 1f26919e19..47b08d8afa 100644 --- a/src/testbed/testbed_api_underlay.c +++ b/src/testbed/testbed_api_underlay.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h index f0c6c04a22..3750f1cf99 100644 --- a/src/testbed/testbed_helper.h +++ b/src/testbed/testbed_helper.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c index 3dbe658834..4676428c15 100644 --- a/src/testing/gnunet-testing.c +++ b/src/testing/gnunet-testing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c index 956788f6c3..f97f812945 100644 --- a/src/testing/test_testing_peerstartup.c +++ b/src/testing/test_testing_peerstartup.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c index fd46e5c3ef..f300b8dcbe 100644 --- a/src/testing/test_testing_peerstartup2.c +++ b/src/testing/test_testing_peerstartup2.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c index 4c1fc35e9a..876a3bf5c6 100644 --- a/src/testing/test_testing_portreservation.c +++ b/src/testing/test_testing_portreservation.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/test_testing_servicestartup.c b/src/testing/test_testing_servicestartup.c index 10e0cc4434..8872b2b356 100644 --- a/src/testing/test_testing_servicestartup.c +++ b/src/testing/test_testing_servicestartup.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/test_testing_sharedservices.c b/src/testing/test_testing_sharedservices.c index ee1ac85305..41ad356887 100644 --- a/src/testing/test_testing_sharedservices.c +++ b/src/testing/test_testing_sharedservices.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/testing/testing.c b/src/testing/testing.c index ba7bf827e3..fdd4f90081 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2008, 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/topology/friends.c b/src/topology/friends.c index a9a1f14987..d00f5fcc8a 100644 --- a/src/topology/friends.c +++ b/src/topology/friends.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index da4f623510..3838d21d04 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index 7242fcf439..a8d8cf8921 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file topology/test_gnunet_daemon_topology.c diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 28855c31ed..181a6e3350 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c @@ -4,20 +4,15 @@ Copyright (c) 2007, 2008, Andy Green Copyright Copyright (C) 2009 Thomas d'Otreppe - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #include "gnunet_config.h" diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c index f02d8bdd72..a18a82a149 100644 --- a/src/transport/gnunet-helper-transport-wlan-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/gnunet-helper-transport-wlan-dummy.c diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index 0ce3870139..0ba8de1dbd 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c @@ -4,20 +4,15 @@ Copyright (c) 2007, 2008, Andy Green Copyright Copyright (C) 2009 Thomas d'Otreppe - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/transport/gnunet-helper-transport-wlan.c diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 124260c414..0451b50758 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/gnunet-service-transport.c diff --git a/src/transport/gnunet-service-transport.h b/src/transport/gnunet-service-transport.h index 2807afd793..fd556a5a21 100644 --- a/src/transport/gnunet-service-transport.h +++ b/src/transport/gnunet-service-transport.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c index 01e115bfca..abb45fc1fd 100644 --- a/src/transport/gnunet-service-transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/gnunet-service-transport_ats.c diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h index d9d7b555be..d366741648 100644 --- a/src/transport/gnunet-service-transport_ats.h +++ b/src/transport/gnunet-service-transport_ats.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/gnunet-service-transport_ats.h diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c index 1a3c2c32e9..fc7c0249c6 100644 --- a/src/transport/gnunet-service-transport_hello.c +++ b/src/transport/gnunet-service-transport_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h index f040086304..7cfbf4f794 100644 --- a/src/transport/gnunet-service-transport_hello.h +++ b/src/transport/gnunet-service-transport_hello.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/gnunet-service-transport_hello.h diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index e68753583f..4c02f2ee08 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_manipulation.h b/src/transport/gnunet-service-transport_manipulation.h index 312dd11682..715125eb92 100644 --- a/src/transport/gnunet-service-transport_manipulation.h +++ b/src/transport/gnunet-service-transport_manipulation.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index e124f16674..3757c0ee32 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 1a4de72947..26e9cb7638 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c index e68538c778..5466d32b7d 100644 --- a/src/transport/gnunet-service-transport_plugins.c +++ b/src/transport/gnunet-service-transport_plugins.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h index dc9d841ca6..5bb31d9e5a 100644 --- a/src/transport/gnunet-service-transport_plugins.h +++ b/src/transport/gnunet-service-transport_plugins.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index 91acc18ed5..66bb86d548 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h index 53528437ae..bcc394c0b0 100644 --- a/src/transport/gnunet-service-transport_validation.h +++ b/src/transport/gnunet-service-transport_validation.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010,2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index edaf4773a5..28fd1c6d33 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c index d580fce088..3906230ff7 100644 --- a/src/transport/gnunet-transport-profiler.c +++ b/src/transport/gnunet-transport-profiler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-transport-wlan-receiver.c b/src/transport/gnunet-transport-wlan-receiver.c index 595210c422..82429dd050 100644 --- a/src/transport/gnunet-transport-wlan-receiver.c +++ b/src/transport/gnunet-transport-wlan-receiver.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c index bc5f6c3211..42ed9af2fc 100644 --- a/src/transport/gnunet-transport-wlan-sender.c +++ b/src/transport/gnunet-transport-wlan-sender.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 96d0a6a3a3..d336e22348 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2014, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h index cbd780a585..ae5cfee3d8 100644 --- a/src/transport/plugin_transport_http.h +++ b/src/transport/plugin_transport_http.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index e20948c5ac..ad2d428c46 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index eb8320c8e6..95f63445ad 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index 8a32e17e4f..2f2c5fdc9b 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/plugin_transport_http_common.c diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 6a9c1b0bab..28ea354b3b 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2014, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c index 876f81ce33..c17ae2daa7 100644 --- a/src/transport/plugin_transport_smtp.c +++ b/src/transport/plugin_transport_smtp.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2003-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 8b00543c3d..b1f7900f25 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002--2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/plugin_transport_tcp.c diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c index 1df06d792f..81595d93eb 100644 --- a/src/transport/plugin_transport_template.c +++ b/src/transport/plugin_transport_template.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 0daac44431..32c3a29ab2 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h index 48c7365c71..3282a09dcc 100644 --- a/src/transport/plugin_transport_udp.h +++ b/src/transport/plugin_transport_udp.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index c6ddbce9b5..8fd77ebdcb 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index 6bcb7290f2..f79fc00e5b 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index b23739d3cd..610979464c 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h index bcbaa6371f..5a2796ef1e 100644 --- a/src/transport/plugin_transport_wlan.h +++ b/src/transport/plugin_transport_wlan.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c index 21ed19da5a..d1457239be 100644 --- a/src/transport/plugin_transport_xt.c +++ b/src/transport/plugin_transport_xt.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002--2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/plugin_transport_xt.c diff --git a/src/transport/plugin_transport_xu.c b/src/transport/plugin_transport_xu.c index ea0d3f065d..8e3f483f0a 100644 --- a/src/transport/plugin_transport_xu.c +++ b/src/transport/plugin_transport_xu.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/plugin_transport_xu.h b/src/transport/plugin_transport_xu.h index 1884f92e8e..4354f11bc2 100644 --- a/src/transport/plugin_transport_xu.h +++ b/src/transport/plugin_transport_xu.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2010-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c index 17157436dc..28563173b6 100644 --- a/src/transport/tcp_connection_legacy.c +++ b/src/transport/tcp_connection_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c index f75b41e8ca..dd83640916 100644 --- a/src/transport/tcp_server_legacy.c +++ b/src/transport/tcp_server_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c index 78e04c1b18..ca8cb5bf17 100644 --- a/src/transport/tcp_server_mst_legacy.c +++ b/src/transport/tcp_server_mst_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index 1f1f6c063b..c6926711fc 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c index a13a84b775..cae4a24923 100644 --- a/src/transport/test_http_common.c +++ b/src/transport/test_http_common.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_http_common.c diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 2ef3a0cebe..aa8d6b7bf2 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_plugin_transport.c diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 3ea5706d1a..864e42b942 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_quota_compliance.c diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c index e076d3501b..45fc1eebec 100644 --- a/src/transport/test_transport_address_switch.c +++ b/src/transport/test_transport_address_switch.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_address_switch.c diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 2f55631c37..e461c54a6a 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api.c diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 76780a48a6..99b69a3911 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 870d9e4c26..88d3ea3cd3 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_disconnect.c diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index e487748aa0..622c1f6646 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_limited_sockets.c diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index a2312a8723..3bf252a02d 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_manipulation_cfg.c diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 33f86e8a6c..125438f27c 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_manipulation_recv_tcp.c diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c index 602d4d277a..9204244241 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp.c +++ b/src/transport/test_transport_api_manipulation_send_tcp.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_manipulation_send_tcp.c diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c index 4a0f1a23f6..97951d26b7 100644 --- a/src/transport/test_transport_api_monitor_peers.c +++ b/src/transport/test_transport_api_monitor_peers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_monitor_peers.c diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index e5ba2831bc..d0e26aec5f 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_reliability.c diff --git a/src/transport/test_transport_api_restart_reconnect.c b/src/transport/test_transport_api_restart_reconnect.c index 477b8b54d7..ccd978fa79 100644 --- a/src/transport/test_transport_api_restart_reconnect.c +++ b/src/transport/test_transport_api_restart_reconnect.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_restart_reconnect.c diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index 042cbebedd..78094335a1 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c @@ -2,20 +2,15 @@ This file is part of GNUnet.x Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_api_timeout.c diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c index e5de8f148b..d01fa758f6 100644 --- a/src/transport/test_transport_blacklisting.c +++ b/src/transport/test_transport_blacklisting.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c index 06275055da..09797de35b 100644 --- a/src/transport/test_transport_testing_restart.c +++ b/src/transport/test_transport_testing_restart.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_testing_restart.c diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c index 931e922c47..41983ebbe7 100644 --- a/src/transport/test_transport_testing_startstop.c +++ b/src/transport/test_transport_testing_startstop.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/test_transport_testing_startstop.c diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c index 0f8076b41f..93098e4709 100644 --- a/src/transport/transport-testing-filenames.c +++ b/src/transport/transport-testing-filenames.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport-testing-filenames.c diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c index 0ebb07d741..4d42343196 100644 --- a/src/transport/transport-testing-loggers.c +++ b/src/transport/transport-testing-loggers.c @@ -3,20 +3,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport-testing-loggers.c diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c index 81a66e1137..abdf8ef84b 100644 --- a/src/transport/transport-testing-main.c +++ b/src/transport/transport-testing-main.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport-testing-main.c diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c index 24858353ec..cbb701dbca 100644 --- a/src/transport/transport-testing-send.c +++ b/src/transport/transport-testing-send.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport-testing-send.c diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index 68cda3bd7e..31c88d7a63 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport-testing.c diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index cb5ad319cc..393a20baa4 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport.h b/src/transport/transport.h index 17e4f3c215..3e8284fe49 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index 902764a8f3..36d00fbac6 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file transport/transport_api_address_to_string.c diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c index 7b1bf526e1..d995a8df5d 100644 --- a/src/transport/transport_api_blacklist.c +++ b/src/transport/transport_api_blacklist.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c index 9c29d4908e..e9d0a5a784 100644 --- a/src/transport/transport_api_core.c +++ b/src/transport/transport_api_core.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c index c53dd7a9a4..6f4b6349e4 100644 --- a/src/transport/transport_api_hello_get.c +++ b/src/transport/transport_api_hello_get.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c index fd5849a7ee..c6b16520f1 100644 --- a/src/transport/transport_api_manipulation.c +++ b/src/transport/transport_api_manipulation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c index 38e6e0d7c2..17dce9f5cd 100644 --- a/src/transport/transport_api_monitor_peers.c +++ b/src/transport/transport_api_monitor_peers.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c index e81664c41f..3b912b433d 100644 --- a/src/transport/transport_api_monitor_plugins.c +++ b/src/transport/transport_api_monitor_plugins.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c index e1dca14e35..d58e344c16 100644 --- a/src/transport/transport_api_offer_hello.c +++ b/src/transport/transport_api_offer_hello.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/tun/regex.c b/src/tun/regex.c index d48fe1da81..bf1c762250 100644 --- a/src/tun/regex.c +++ b/src/tun/regex.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file src/tun/regex.c diff --git a/src/tun/test_regex.c b/src/tun/test_regex.c index 7c589d6d1f..5e8c17c65c 100644 --- a/src/tun/test_regex.c +++ b/src/tun/test_regex.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file tun/test_regex.c diff --git a/src/tun/test_tun.c b/src/tun/test_tun.c index edbbe108dc..14d8557316 100644 --- a/src/tun/test_tun.c +++ b/src/tun/test_tun.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/tun/tun.c b/src/tun/tun.c index b55de1ea94..380c61beca 100644 --- a/src/tun/tun.c +++ b/src/tun/tun.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index f551bbb829..0571ebbe90 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/bio.c b/src/util/bio.c index 816917a223..cbc294e185 100644 --- a/src/util/bio.c +++ b/src/util/bio.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2009, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/bio.c diff --git a/src/util/client.c b/src/util/client.c index 3479fa971d..681b61ac46 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index 1c55d72b56..b3672e5e8f 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2005, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/common_endian.c b/src/util/common_endian.c index f29e42c98a..320cf3fa7c 100644 --- a/src/util/common_endian.c +++ b/src/util/common_endian.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2006, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/common_logging.c b/src/util/common_logging.c index ce9bd6e46c..cecdf45845 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/configuration.c b/src/util/configuration.c index 25eeaf80fc..ecc0990b56 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c index ceaf2a6ea2..1007c9e745 100644 --- a/src/util/configuration_loader.c +++ b/src/util/configuration_loader.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c index db61c5221d..244262aeec 100644 --- a/src/util/container_bloomfilter.c +++ b/src/util/container_bloomfilter.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2011, 2012, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/container_bloomfilter.c diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 21bdee8343..440c190f91 100644 --- a/src/util/container_heap.c +++ b/src/util/container_heap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index ec527005a0..7f83864cac 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c index 6001fc1df3..e09645914c 100644 --- a/src/util/container_multihashmap.c +++ b/src/util/container_multihashmap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/container_multihashmap.c diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c index d33c3c2d98..4b37b1ef31 100644 --- a/src/util/container_multihashmap32.c +++ b/src/util/container_multihashmap32.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/container_multihashmap32.c diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c index 7830771d86..bb5c61fd2d 100644 --- a/src/util/container_multipeermap.c +++ b/src/util/container_multipeermap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/container_multipeermap.c diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c index cfa82ca20b..2b9171a855 100644 --- a/src/util/container_multishortmap.c +++ b/src/util/container_multishortmap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/container_multishortmap.c diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c index a5cdb2823b..bb63e6d146 100644 --- a/src/util/crypto_abe.c +++ b/src/util/crypto_abe.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014 Christian Grothoff (and other contributing authors) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/util/crypto_bug.c b/src/util/crypto_bug.c index 1c3e9225eb..011df65112 100644 --- a/src/util/crypto_bug.c +++ b/src/util/crypto_bug.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c index 03b24d9f76..e4af407536 100644 --- a/src/util/crypto_crc.c +++ b/src/util/crypto_crc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. For the actual CRC-32 code: Copyright abandoned; this code is in the public domain. diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c index 200371cd72..8db01009ad 100644 --- a/src/util/crypto_ecc.c +++ b/src/util/crypto_ecc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c index 76c25dc70d..54ba375a82 100644 --- a/src/util/crypto_ecc_setup.c +++ b/src/util/crypto_ecc_setup.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index cce9cf82a4..b476a96cfb 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c index cb632d02c5..89c05eb837 100644 --- a/src/util/crypto_hash_file.c +++ b/src/util/crypto_hash_file.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index 6d7c5a0964..fb9d0a6bc1 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c index ff3e9a8a72..b6d4bfdf46 100644 --- a/src/util/crypto_mpi.c +++ b/src/util/crypto_mpi.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c index 530a2957fc..ccadcfb22b 100644 --- a/src/util/crypto_paillier.c +++ b/src/util/crypto_paillier.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c index d5b5eb9ec8..d3200d2bb5 100644 --- a/src/util/crypto_random.c +++ b/src/util/crypto_random.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014 Christian Grothoff (and other contributing authors) - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index e25e2f1dd5..eceb3b0ea9 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/disk.c b/src/util/disk.c index 9e542a91cc..6b07831732 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001--2013, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/disk.c diff --git a/src/util/disk.h b/src/util/disk.h index 149890390d..bd84ee54e1 100644 --- a/src/util/disk.h +++ b/src/util/disk.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index fb8cc4d455..2158eb1774 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index 5f7d9fc0da..51e7d516a7 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c index 59a100a8c3..b335681898 100644 --- a/src/util/gnunet-ecc.c +++ b/src/util/gnunet-ecc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-helper-w32-console.c b/src/util/gnunet-helper-w32-console.c index cde730fcd1..c95361a8e0 100644 --- a/src/util/gnunet-helper-w32-console.c +++ b/src/util/gnunet-helper-w32-console.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-helper-w32-console.h b/src/util/gnunet-helper-w32-console.h index 452c832481..33713d0adf 100644 --- a/src/util/gnunet-helper-w32-console.h +++ b/src/util/gnunet-helper-w32-console.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index 4954e03983..95ede47065 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index 3b3b7d695c..62dd668f26 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/gnunet-scrypt.c diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index cc949873c8..6c48476197 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2007-2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c index f69508f672..5426d78ec6 100644 --- a/src/util/gnunet-uri.c +++ b/src/util/gnunet-uri.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/helper.c b/src/util/helper.c index a84b06e664..7e003cfa97 100644 --- a/src/util/helper.c +++ b/src/util/helper.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/load.c b/src/util/load.c index d1de6aa366..6c51194233 100644 --- a/src/util/load.c +++ b/src/util/load.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/mq.c b/src/util/mq.c index bf8f957906..dec9711a3c 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/mst.c b/src/util/mst.c index 5e472965f9..c358389c32 100644 --- a/src/util/mst.c +++ b/src/util/mst.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/nc.c b/src/util/nc.c index d9ebde323b..431738d6d8 100644 --- a/src/util/nc.c +++ b/src/util/nc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/network.c b/src/util/network.c index 0cb1529a66..9684ab511b 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/op.c b/src/util/op.c index 41be763e52..8901e377f9 100644 --- a/src/util/op.c +++ b/src/util/op.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/os_installation.c b/src/util/os_installation.c index 2e35de6819..4cc3470248 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2006-2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/os_network.c b/src/util/os_network.c index 5cb2b6864a..effb3f5736 100644 --- a/src/util/os_network.c +++ b/src/util/os_network.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2005, 2006, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 98998b5203..9a83e059da 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/peer.c b/src/util/peer.c index b1c65fbcf4..47610c7074 100644 --- a/src/util/peer.c +++ b/src/util/peer.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2006, 2008, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c index 418d6dab39..64a435a3b8 100644 --- a/src/util/perf_crypto_asymmetric.c +++ b/src/util/perf_crypto_asymmetric.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c index 8bea26e4b1..13145743f3 100644 --- a/src/util/perf_crypto_hash.c +++ b/src/util/perf_crypto_hash.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c index 0ebd431b96..50ea32086d 100644 --- a/src/util/perf_crypto_paillier.c +++ b/src/util/perf_crypto_paillier.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c index f64b8335d4..e00eda6a6f 100644 --- a/src/util/perf_crypto_rsa.c +++ b/src/util/perf_crypto_rsa.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c index fa420e20db..c1c7c5b566 100644 --- a/src/util/perf_crypto_symmetric.c +++ b/src/util/perf_crypto_symmetric.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c index 09756c6e8b..6277ba2275 100644 --- a/src/util/perf_malloc.c +++ b/src/util/perf_malloc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/plugin.c b/src/util/plugin.c index fb296f80df..eede9c93d5 100644 --- a/src/util/plugin.c +++ b/src/util/plugin.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2002-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/program.c b/src/util/program.c index a02bff77c8..32adac20ff 100644 --- a/src/util/program.c +++ b/src/util/program.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPROSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/resolver.h b/src/util/resolver.h index 78f3fd0ed4..d58860f35e 100644 --- a/src/util/resolver.h +++ b/src/util/resolver.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index 21f902578b..a0d8008453 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/scheduler.c b/src/util/scheduler.c index cc0ba3eb07..be94a66789 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2009-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/scheduler.c diff --git a/src/util/service.c b/src/util/service.c index ae18099508..568ed2aae2 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/signal.c b/src/util/signal.c index cb917e36ae..caf3c40b90 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/socks.c b/src/util/socks.c index 85548fd794..12b9a28513 100644 --- a/src/util/socks.c +++ b/src/util/socks.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/speedup.c b/src/util/speedup.c index f5e81f16b6..6e99d53239 100644 --- a/src/util/speedup.c +++ b/src/util/speedup.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/speedup.h b/src/util/speedup.h index 36b77aaf03..71b7a6de9b 100644 --- a/src/util/speedup.h +++ b/src/util/speedup.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 -- 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/strings.c b/src/util/strings.c index 4cfcd63b38..e2f37c8ad7 100644 --- a/src/util/strings.c +++ b/src/util/strings.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2005-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/strings.c diff --git a/src/util/test_bio.c b/src/util/test_bio.c index c88b784263..84bbbcadd8 100644 --- a/src/util/test_bio.c +++ b/src/util/test_bio.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_client.c b/src/util/test_client.c index 527b400b05..73a376e2b7 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_client.c diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c index 4d1b6fe7d4..e377331fe2 100644 --- a/src/util/test_common_allocation.c +++ b/src/util/test_common_allocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2005, 2006, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c index edcbe4d311..8c3031e2c7 100644 --- a/src/util/test_common_endian.c +++ b/src/util/test_common_endian.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_common_endian.c diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c index 62acbfd1c9..2925eeb372 100644 --- a/src/util/test_common_logging.c +++ b/src/util/test_common_logging.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c index cb191ddab7..430e7891b4 100644 --- a/src/util/test_common_logging_dummy.c +++ b/src/util/test_common_logging_dummy.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index c633d7de89..818dddc176 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index 80ae01c683..bd6455bea5 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2007 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_configuration.c diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c index 53fc1c3bc9..4916e2cd08 100644 --- a/src/util/test_container_bloomfilter.c +++ b/src/util/test_container_bloomfilter.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2004, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_container_bloomfilter.c diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c index 4d2830807f..0fc5021d3b 100644 --- a/src/util/test_container_dll.c +++ b/src/util/test_container_dll.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c index 82b0e95238..ceb59907a2 100644 --- a/src/util/test_container_heap.c +++ b/src/util/test_container_heap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c index cd23674a39..1008c9891c 100644 --- a/src/util/test_container_meta_data.c +++ b/src/util/test_container_meta_data.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2006, 2009, 2010 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c index a0ef8aa368..92c5783922 100644 --- a/src/util/test_container_multihashmap.c +++ b/src/util/test_container_multihashmap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c index c50a751d4d..c094f4c565 100644 --- a/src/util/test_container_multihashmap32.c +++ b/src/util/test_container_multihashmap32.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c index 65bed6606d..500dff98a0 100644 --- a/src/util/test_container_multipeermap.c +++ b/src/util/test_container_multipeermap.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2008, 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c index 0f67dde54d..7b7dfc3591 100644 --- a/src/util/test_crypto_crc.c +++ b/src/util/test_crypto_crc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. For the actual CRC code: Copyright abandoned; this code is in the public domain. diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c index dba28e90a3..1c1c083080 100644 --- a/src/util/test_crypto_ecdh_eddsa.c +++ b/src/util/test_crypto_ecdh_eddsa.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002-2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c index d595625527..aa9f9c9484 100644 --- a/src/util/test_crypto_ecdhe.c +++ b/src/util/test_crypto_ecdhe.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c index 4e0baf09ff..827112ff5a 100644 --- a/src/util/test_crypto_ecdsa.c +++ b/src/util/test_crypto_ecdsa.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c index 4b12eb9833..9df9a42fc6 100644 --- a/src/util/test_crypto_eddsa.c +++ b/src/util/test_crypto_eddsa.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c index 731205841c..3d1245a53e 100644 --- a/src/util/test_crypto_hash.c +++ b/src/util/test_crypto_hash.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c index 1e7e0b301a..4569a77d3a 100644 --- a/src/util/test_crypto_paillier.c +++ b/src/util/test_crypto_paillier.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c index e908e4626b..4c051f7056 100644 --- a/src/util/test_crypto_random.c +++ b/src/util/test_crypto_random.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c index b2fdd07c31..462a4ee596 100644 --- a/src/util/test_crypto_symmetric.c +++ b/src/util/test_crypto_symmetric.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_disk.c b/src/util/test_disk.c index 7b9a6d45cf..2de5d1844a 100644 --- a/src/util/test_disk.c +++ b/src/util/test_disk.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2005, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index 16f2df8d16..eb08e7ae82 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_getopt.c diff --git a/src/util/test_mq.c b/src/util/test_mq.c index 533cb8af3e..aef65293bf 100644 --- a/src/util/test_mq.c +++ b/src/util/test_mq.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c index 85f98201f0..e4c3ff3b26 100644 --- a/src/util/test_os_network.c +++ b/src/util/test_os_network.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2003, 2004, 2005, 2006, 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_os_network.c diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index 929b242324..0d4b8ee4fe 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_os_start_process.c diff --git a/src/util/test_peer.c b/src/util/test_peer.c index d16c66a27d..b92e904ae5 100644 --- a/src/util/test_peer.c +++ b/src/util/test_peer.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_peer.c diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c index 3630886dc9..8cfa27694b 100644 --- a/src/util/test_plugin.c +++ b/src/util/test_plugin.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_plugin.c diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c index 7c4f581de8..5179a3788c 100644 --- a/src/util/test_plugin_plug.c +++ b/src/util/test_plugin_plug.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_plugin_plug.c diff --git a/src/util/test_program.c b/src/util/test_program.c index 6d51b1872c..b3db43d109 100644 --- a/src/util/test_program.c +++ b/src/util/test_program.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_program.c diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 8acceea3a1..8d88eadc0f 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file resolver/test_resolver_api.c diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c index 83319d2aa7..19a2992adc 100644 --- a/src/util/test_scheduler.c +++ b/src/util/test_scheduler.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_scheduler.c diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c index 93568cd81b..45ca9b2986 100644 --- a/src/util/test_scheduler_delay.c +++ b/src/util/test_scheduler_delay.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_scheduler_delay.c diff --git a/src/util/test_service.c b/src/util/test_service.c index 424a445bb5..9ae884f04f 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009, 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_service.c diff --git a/src/util/test_socks.c b/src/util/test_socks.c index cb70f916fb..abe6b5126f 100644 --- a/src/util/test_socks.c +++ b/src/util/test_socks.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_socks.c diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c index b9f2cfb4d0..d0e635f754 100644 --- a/src/util/test_speedup.c +++ b/src/util/test_speedup.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2011-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_speedup.c diff --git a/src/util/test_strings.c b/src/util/test_strings.c index b66474934b..0bfb149769 100644 --- a/src/util/test_strings.c +++ b/src/util/test_strings.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_strings.c diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c index bd594aac04..f7fb99f1dd 100644 --- a/src/util/test_strings_to_data.c +++ b/src/util/test_strings_to_data.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2009 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_strings_to_data.c diff --git a/src/util/test_time.c b/src/util/test_time.c index d0aca21666..b4ee3bfd75 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file util/test_time.c diff --git a/src/util/time.c b/src/util/time.c index 5ffb19ec15..7b0d11d77d 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/win.c b/src/util/win.c index 97877b0cac..0d9fbbf74d 100644 --- a/src/util/win.c +++ b/src/util/win.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/winproc.c b/src/util/winproc.c index 318b68a88b..49727a5ba4 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/vpn/gnunet-helper-vpn-windows.c b/src/vpn/gnunet-helper-vpn-windows.c index e74a0aa2f2..fde6b70b09 100644 --- a/src/vpn/gnunet-helper-vpn-windows.c +++ b/src/vpn/gnunet-helper-vpn-windows.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file vpn/gnunet-helper-vpn-windows.c diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index 26f77d2fcf..b82b56dc20 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index bdc6381769..157aefd748 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2010, 2011, 2012, 2016, 2017 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c index 34c5453391..d29409f09f 100644 --- a/src/vpn/gnunet-vpn.c +++ b/src/vpn/gnunet-vpn.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index 1f47724efb..0c70f8efef 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c index bc77865a89..cfe94a9559 100644 --- a/src/vpn/vpn_api.c +++ b/src/vpn/vpn_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2016 Christian Grothoff - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c index 275a3a5933..905a1548e8 100644 --- a/src/zonemaster/gnunet-service-zonemaster-monitor.c +++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2014, 2017, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c index 81d6fa2d96..0b58c307ca 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/zonemaster/gnunet-service-zonemaster.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2014, 2017, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** -- cgit v1.2.3-18-g5258 From f461f068dc304ceea5ae3d9cda67e227d2bdba96 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 07:53:25 +0200 Subject: implement proper expiration logic also for postgres plugin --- src/datacache/plugin_datacache_postgres.c | 60 +++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 683c6148a6..33b317e872 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - Copyright (C) 2006, 2009, 2010, 2012, 2015, 2017 GNUnet e.V. + Copyright (C) 2006, 2009, 2010, 2012, 2015, 2017, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -62,47 +62,57 @@ static int init_connection (struct Plugin *plugin) { struct GNUNET_PQ_ExecuteStatement es[] = { - GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn090dc (" + GNUNET_PQ_make_execute ("CREATE TEMPORARY TABLE IF NOT EXISTS gn011dc (" " type INTEGER NOT NULL," + " prox INTEGER NOT NULL," " discard_time BIGINT NOT NULL," " key BYTEA NOT NULL," " value BYTEA NOT NULL," " path BYTEA DEFAULT NULL)" "WITH OIDS"), - GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_key ON gn090dc (key)"), - GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_dt ON gn090dc (discard_time)"), - GNUNET_PQ_make_execute ("ALTER TABLE gn090dc ALTER value SET STORAGE EXTERNAL"), - GNUNET_PQ_make_execute ("ALTER TABLE gn090dc ALTER key SET STORAGE PLAIN"), + GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_key ON gn011dc (key)"), + GNUNET_PQ_make_try_execute ("CREATE INDEX IF NOT EXISTS idx_dt ON gn011dc (discard_time)"), + GNUNET_PQ_make_execute ("ALTER TABLE gn011dc ALTER value SET STORAGE EXTERNAL"), + GNUNET_PQ_make_execute ("ALTER TABLE gn011dc ALTER key SET STORAGE PLAIN"), GNUNET_PQ_EXECUTE_STATEMENT_END }; struct GNUNET_PQ_PreparedStatement ps[] = { GNUNET_PQ_make_prepare ("getkt", - "SELECT discard_time,type,value,path FROM gn090dc " + "SELECT discard_time,type,value,path FROM gn011dc " "WHERE key=$1 AND type=$2", 2), GNUNET_PQ_make_prepare ("getk", - "SELECT discard_time,type,value,path FROM gn090dc " + "SELECT discard_time,type,value,path FROM gn011dc " "WHERE key=$1", 1), + GNUNET_PQ_make_prepare ("getex", + "SELECT length(value) AS len,oid,key FROM gn011dc" + " WHERE discard_time < $1" + " ORDER BY discard_time ASC LIMIT 1", + 1), GNUNET_PQ_make_prepare ("getm", - "SELECT length(value) AS len,oid,key FROM gn090dc " + "SELECT length(value) AS len,oid,key FROM gn011dc" + " ORDER BY prox ASC, discard_time ASC LIMIT 1", + 0), + GNUNET_PQ_make_prepare ("getp", + "SELECT length(value) AS len,oid,key FROM gn011dc " "ORDER BY discard_time ASC LIMIT 1", 0), GNUNET_PQ_make_prepare ("get_random", - "SELECT discard_time,type,value,path,key FROM gn090dc " + "SELECT discard_time,type,value,path,key FROM gn011dc " "ORDER BY key ASC LIMIT 1 OFFSET $1", 1), GNUNET_PQ_make_prepare ("get_closest", - "SELECT discard_time,type,value,path,key FROM gn090dc " + "SELECT discard_time,type,value,path,key FROM gn011dc " "WHERE key>=$1 ORDER BY key ASC LIMIT $2", 1), GNUNET_PQ_make_prepare ("delrow", - "DELETE FROM gn090dc WHERE oid=$1", + "DELETE FROM gn011dc WHERE oid=$1", 1), GNUNET_PQ_make_prepare ("put", - "INSERT INTO gn090dc (type, discard_time, key, value, path) " - "VALUES ($1, $2, $3, $4, $5)", - 5), + "INSERT INTO gn011dc (type, prox, discard_time, key, value, path) " + "VALUES ($1, $2, $3, $4, $5, $6)", + 6), GNUNET_PQ_PREPARED_STATEMENT_END }; @@ -136,7 +146,7 @@ init_connection (struct Plugin *plugin) * * @param cls closure (our `struct Plugin`) * @param key key to store @a data under - * @param am_closest are we the closest peer? + * @param prox proximity of @a key to my PID * @param data_size number of bytes in @a data * @param data data to store * @param type type of the value @@ -148,7 +158,7 @@ init_connection (struct Plugin *plugin) static ssize_t postgres_plugin_put (void *cls, const struct GNUNET_HashCode *key, - int am_closest, + uint32_t prox, size_t data_size, const char *data, enum GNUNET_BLOCK_Type type, @@ -160,6 +170,7 @@ postgres_plugin_put (void *cls, uint32_t type32 = (uint32_t) type; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint32 (&type32), + GNUNET_PQ_query_param_uint32 (&prox), GNUNET_PQ_query_param_absolute_time (&discard_time), GNUNET_PQ_query_param_auto_from_type (key), GNUNET_PQ_query_param_fixed_size (data, data_size), @@ -356,11 +367,22 @@ postgres_plugin_del (void *cls) GNUNET_PQ_query_param_uint32 (&oid), GNUNET_PQ_query_param_end }; + struct GNUNET_TIME_Absolute now; + struct GNUNET_PQ_QueryParam xparam[] = { + GNUNET_PQ_query_param_absolute_time (&now), + GNUNET_PQ_query_param_end + }; + now = GNUNET_TIME_absolute_get (); res = GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, - "getm", - pempty, + "getex", + xparam, rs); + if (0 >= res) + res = GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, + "getm", + pempty, + rs); if (0 > res) return GNUNET_SYSERR; if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == res) -- cgit v1.2.3-18-g5258 From 73ab0f26d0fcd47b7b4d6f4faf5bf143a2d06743 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 07:53:39 +0200 Subject: better indentation --- src/datacache/datacache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 7ee8dc954d..39cd6126de 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -311,7 +311,8 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, 1, GNUNET_NO); while (h->utilization + used > h->env.quota) - GNUNET_assert (GNUNET_OK == h->api->del (h->api->cls)); + GNUNET_assert (GNUNET_OK == + h->api->del (h->api->cls)); h->utilization += used; return GNUNET_OK; } -- cgit v1.2.3-18-g5258 From f651dba097585be06d05592a6246c71e5cb1c936 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 07:54:01 +0200 Subject: better indentation, nicer formatting of SQL --- src/datastore/plugin_datastore_postgres.c | 32 ++++++++++++++++--------------- src/datastore/plugin_datastore_sqlite.c | 8 ++++++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 0dc22b0f27..30013ef76d 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -96,23 +96,23 @@ init_connection (struct Plugin *plugin) #define RESULT_COLUMNS "repl, type, prio, anonLevel, expire, hash, value, oid" struct GNUNET_PQ_PreparedStatement ps[] = { GNUNET_PQ_make_prepare ("get", - "SELECT " RESULT_COLUMNS " FROM gn090 " - "WHERE oid >= $1::bigint AND " - "(rvalue >= $2 OR 0 = $3::smallint) AND " - "(hash = $4 OR 0 = $5::smallint) AND " - "(type = $6 OR 0 = $7::smallint) " - "ORDER BY oid ASC LIMIT 1", + "SELECT " RESULT_COLUMNS " FROM gn090" + " WHERE oid >= $1::bigint AND" + " (rvalue >= $2 OR 0 = $3::smallint) AND" + " (hash = $4 OR 0 = $5::smallint) AND" + " (type = $6 OR 0 = $7::smallint)" + " ORDER BY oid ASC LIMIT 1", 7), GNUNET_PQ_make_prepare ("put", "INSERT INTO gn090 (repl, type, prio, anonLevel, expire, rvalue, hash, vhash, value) " "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)", 9), GNUNET_PQ_make_prepare ("update", - "UPDATE gn090 " - "SET prio = prio + $1, " - "repl = repl + $2, " - "expire = GREATEST(expire, $3) " - "WHERE hash = $4 AND vhash = $5", + "UPDATE gn090" + " SET prio = prio + $1," + " repl = repl + $2," + " expire = GREATEST(expire, $3)" + " WHERE hash = $4 AND vhash = $5", 5), GNUNET_PQ_make_prepare ("decrepl", "UPDATE gn090 SET repl = GREATEST (repl - 1, 0) " @@ -136,11 +136,13 @@ init_connection (struct Plugin *plugin) "ORDER BY repl DESC,RANDOM() LIMIT 1", 0), GNUNET_PQ_make_prepare ("delrow", - "DELETE FROM gn090 " "WHERE oid=$1", + "DELETE FROM gn090 " + "WHERE oid=$1", 1), - GNUNET_PQ_make_prepare ("remove", "DELETE FROM gn090 " - "WHERE hash = $1 AND " - "value = $2", + GNUNET_PQ_make_prepare ("remove", + "DELETE FROM gn090" + " WHERE hash = $1 AND" + " value = $2", 2), GNUNET_PQ_make_prepare ("get_keys", "SELECT hash FROM gn090", diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 331b9f7f1f..862977b9a8 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -704,12 +704,16 @@ sqlite_plugin_put (void *cls, break; case SQLITE_BUSY: GNUNET_break (0); - LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + LOG_SQLITE_MSG (plugin, + &msg, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step"); ret = GNUNET_SYSERR; break; default: - LOG_SQLITE_MSG (plugin, &msg, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, + LOG_SQLITE_MSG (plugin, + &msg, + GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_step"); GNUNET_SQ_reset (plugin->dbh, stmt); -- cgit v1.2.3-18-g5258 From d38342d597d5c8f1ac2e068f8babe1d05b840d05 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 07:56:10 +0200 Subject: fix linker issue --- src/rps/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index aa354dff77..33e03af761 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -91,6 +91,7 @@ rps_test_src = \ ld_rps_test_lib = \ libgnunetrps.la \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/testbed/libgnunettestbed.la \ -lm -- cgit v1.2.3-18-g5258 From 8eb738e7d6005ffd5e6cbb1ae80316ed0da6e3f9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 08:05:59 +0200 Subject: ignore tag file --- doc/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/.gitignore b/doc/.gitignore index c56a90359f..b12f3e008b 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -19,4 +19,4 @@ gnunet.t2p/ gnunet-c-tutorial.t2p/ *.t2p/ documentation/manuals -.\#* \ No newline at end of file +.\#*doxygen/gnunet.tag -- cgit v1.2.3-18-g5258 From 561d9096a28037d65783cf40d4016e39a0cf3a2b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 08:20:53 +0200 Subject: fix misc compiler warnings --- src/conversation/gnunet-conversation-test.c | 29 ++++++++++---- src/conversation/gnunet-helper-audio-playback.c | 39 +++++++++++++++---- src/conversation/gnunet-helper-audio-record.c | 48 +++++++++++++++++------- src/conversation/gnunet-service-conversation.c | 18 ++++++++- src/conversation/plugin_gnsrecord_conversation.c | 5 +++ 5 files changed, 108 insertions(+), 31 deletions(-) diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index 75605384f3..ac99e4d14e 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c @@ -97,6 +97,7 @@ do_shutdown (void *cls) { struct Recording *rec; + (void) cls; if (NULL != switch_task) GNUNET_SCHEDULER_cancel (switch_task); if (NULL != microphone) @@ -123,8 +124,7 @@ do_shutdown (void *cls) static void switch_to_speaker (void *cls) { - struct Recording *rec; - + (void) cls; switch_task = NULL; microphone->disable_microphone (microphone->cls); if (GNUNET_OK != @@ -138,7 +138,7 @@ switch_to_speaker (void *cls) } fprintf (stderr, _("\nWe are now playing your recording back. If you can hear it, your audio settings are working...")); - for (rec=rec_head; NULL != rec; rec = rec->next) + for (struct Recording *rec=rec_head; NULL != rec; rec = rec->next) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Replaying %u bytes\n", @@ -168,6 +168,7 @@ record (void *cls, { struct Recording *rec; + (void) cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Recorded %u bytes\n", (unsigned int) data_size); @@ -189,9 +190,14 @@ record (void *cls, * @param cfg configuration */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { + (void) cls; + (void) args; + (void) cfgfile; microphone = GNUNET_MICROPHONE_create_from_hardware (cfg); GNUNET_assert (NULL != microphone); speaker = GNUNET_SPEAKER_create_from_hardware (cfg); @@ -225,17 +231,24 @@ run (void *cls, char *const *args, const char *cfgfile, * @return 0 ok, 1 on error */ int -main (int argc, char *const *argv) +main (int argc, + char *const *argv) { static const struct GNUNET_GETOPT_CommandLineOption options[] = { GNUNET_GETOPT_OPTION_END }; - if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + + if (GNUNET_OK != + GNUNET_STRINGS_get_utf8_args (argc, argv, + &argc, &argv)) return 2; ret = (GNUNET_OK == - GNUNET_PROGRAM_run (argc, argv, "gnunet-conversation-test", - gettext_noop ("help text"), options, &run, + GNUNET_PROGRAM_run (argc, argv, + "gnunet-conversation-test", + gettext_noop ("help text"), + options, + &run, NULL)) ? ret : 1; GNUNET_free ((void*) argv); return ret; diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index f96878051d..5c13f28777 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c @@ -144,17 +144,22 @@ process_header (ogg_packet *op) OpusDecoder *dec; struct OpusHeadPacket header; - if (op->bytes < sizeof (header)) + if ( ((unsigned int) op->bytes) < sizeof (header)) return NULL; - GNUNET_memcpy (&header, op->packet, sizeof (header)); + GNUNET_memcpy (&header, + op->packet, + sizeof (header)); header.preskip = GNUNET_le16toh (header.preskip); header.sampling_rate = GNUNET_le32toh (header.sampling_rate); header.gain = GNUNET_le16toh (header.gain); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Header: v%u, %u-ch, skip %u, %uHz, %u gain\n", - header.version, header.channels, header.preskip, header.sampling_rate, header.gain); - + header.version, + header.channels, + header.preskip, + header.sampling_rate, + header.gain); channels = header.channels; preskip = header.preskip; @@ -333,7 +338,8 @@ audio_write (int64_t maxout) static void quit (int ret) { - mainloop_api->quit (mainloop_api, ret); + mainloop_api->quit (mainloop_api, + ret); exit (ret); } @@ -539,6 +545,7 @@ ogg_demux_and_decode () } } + /** * Message callback * @@ -555,6 +562,7 @@ stdin_receiver (void *cls, char *data; size_t payload_len; + (void) cls; switch (ntohs (msg->type)) { case GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO: @@ -585,6 +593,9 @@ stream_write_callback (pa_stream *s, void *userdata) { /* unblock 'main' */ + (void) userdata; + (void) length; + (void) s; if (-1 != ready_pipe[1]) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -603,6 +614,10 @@ exit_signal_callback (pa_mainloop_api *m, int sig, void *userdata) { + (void) m; + (void) e; + (void) sig; + (void) userdata; GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("gnunet-helper-audio-playback - Got signal, exiting\n")); quit (1); @@ -618,6 +633,7 @@ context_state_callback (pa_context *c, { int p; + (void) userdata; GNUNET_assert (NULL != c); switch (pa_context_get_state (c)) { @@ -730,7 +746,11 @@ ogg_init () static void drain_callback (pa_stream*s, int success, void *userdata) { - pa_threaded_mainloop_signal (m, 0); + (void) s; + (void) success; + (void) userdata; + pa_threaded_mainloop_signal (m, + 0); } @@ -745,7 +765,6 @@ int main (int argc, char *argv[]) { static unsigned long long toff; - char readbuf[MAXLINE]; struct GNUNET_MessageStreamTokenizer *stdin_mst; char c; @@ -754,6 +773,8 @@ main (int argc, char *argv[]) int read_pure_ogg = getenv ("GNUNET_READ_PURE_OGG") ? 1 : 0; #endif + (void) argc; + (void) argv; GNUNET_assert (GNUNET_OK == GNUNET_log_setup ("gnunet-helper-audio-playback", "WARNING", @@ -778,7 +799,9 @@ main (int argc, char *argv[]) #endif while (1) { - ret = read (0, readbuf, sizeof (readbuf)); + ret = read (STDIN_FILENO, + readbuf, + sizeof (readbuf)); toff += ret; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %d bytes of audio data (total: %llu)\n", diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 9442e9b459..dd8c8f447c 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c @@ -264,30 +264,36 @@ static int dump_pure_ogg; static void quit (int ret) { - mainloop_api->quit (mainloop_api, ret); + mainloop_api->quit (mainloop_api, + ret); exit (ret); } static void -write_data (const char *ptr, size_t msg_size) +write_data (const char *ptr, + size_t msg_size) { ssize_t ret; size_t off; off = 0; while (off < msg_size) { - ret = write (1, &ptr[off], msg_size - off); + ret = write (STDOUT_FILENO, + &ptr[off], + msg_size - off); if (0 >= ret) { if (-1 == ret) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "write"); + GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, + "write"); quit (2); } off += ret; } } + static void write_page (ogg_page *og) { @@ -305,12 +311,15 @@ write_page (ogg_page *og) toff); #ifdef DEBUG_RECORD_PURE_OGG if (dump_pure_ogg) - write_data ((const char *) &audio_message[1], og->header_len + og->body_len); + write_data ((const char *) &audio_message[1], + og->header_len + og->body_len); else #endif - write_data ((const char *) audio_message, msg_size); + write_data ((const char *) audio_message, + msg_size); } + /** * Creates OPUS packets from PCM data */ @@ -340,7 +349,7 @@ packetizer () opus_strerror (len)); quit (5); } - if (len > UINT16_MAX - sizeof (struct AudioMessage)) + if (((uint32_t)len) > UINT16_MAX - sizeof (struct AudioMessage)) { GNUNET_break (0); continue; @@ -360,7 +369,9 @@ packetizer () while (ogg_stream_flush_fill (&os, &og, PAGE_WATERLINE)) { - if (og.header_len + og.body_len > UINT16_MAX - sizeof (struct AudioMessage)) + if ( ((unsigned long long) og.header_len) + + ((unsigned long long) og.body_len) > + UINT16_MAX - sizeof (struct AudioMessage)) { GNUNET_assert (0); continue; @@ -399,6 +410,7 @@ stream_read_callback (pa_stream * s, { const void *data; + (void) userdata; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got %u/%d bytes of PCM data\n", (unsigned int) length, @@ -449,6 +461,10 @@ exit_signal_callback (pa_mainloop_api * m, int sig, void *userdata) { + (void) m; + (void) e; + (void) sig; + (void) userdata; GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Got signal, exiting.\n")); quit (1); @@ -459,10 +475,11 @@ exit_signal_callback (pa_mainloop_api * m, * Pulseaudio stream state callback */ static void -stream_state_callback (pa_stream * s, void *userdata) +stream_state_callback (pa_stream * s, + void *userdata) { + (void) userdata; GNUNET_assert (NULL != s); - switch (pa_stream_get_state (s)) { case PA_STREAM_CREATING: @@ -522,6 +539,7 @@ static void context_state_callback (pa_context * c, void *userdata) { + (void) userdata; GNUNET_assert (c); switch (pa_context_get_state (c)) @@ -654,6 +672,7 @@ opus_init () OPUS_SET_SIGNAL (CONV_OPUS_SIGNAL)); } + static void ogg_init () { @@ -662,8 +681,8 @@ ogg_init () struct OpusCommentsPacket *commentspacket; size_t commentspacket_len; - serialno = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 0x7FFFFFFF); - + serialno = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, + 0x7FFFFFFF); /*Initialize Ogg stream struct*/ if (-1 == ogg_stream_init (&os, serialno)) { @@ -750,8 +769,11 @@ ogg_init () * @return 0 ok, 1 on error */ int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { + (void) argc; + (void) argv; GNUNET_assert (GNUNET_OK == GNUNET_log_setup ("gnunet-helper-audio-record", "WARNING", diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index fb4f9fcad5..2d6dd09f66 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c @@ -600,6 +600,8 @@ static int check_client_audio_message (void *cls, const struct ClientAudioMessage *msg) { + (void) cls; + (void) msg; return GNUNET_OK; } @@ -766,6 +768,7 @@ handle_cadet_hangup_message (void *cls, enum ChannelStatus status; uint32_t cid; + (void) message; GNUNET_CADET_receive_done (ch->channel); cid = ch->cid; status = ch->status; @@ -811,6 +814,7 @@ handle_cadet_pickup_message (void *cls, struct GNUNET_MQ_Envelope *env; struct ClientPhonePickedupMessage *pick; + (void) message; GNUNET_CADET_receive_done (ch->channel); switch (ch->status) { @@ -860,6 +864,7 @@ handle_cadet_suspend_message (void *cls, struct GNUNET_MQ_Envelope *env; struct ClientPhoneSuspendMessage *suspend; + (void) message; GNUNET_CADET_receive_done (ch->channel); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suspending channel CID: %u\n", @@ -909,6 +914,7 @@ handle_cadet_resume_message (void *cls, struct GNUNET_MQ_Envelope *env; struct ClientPhoneResumeMessage *resume; + (void) msg; line = ch->line; GNUNET_CADET_receive_done (ch->channel); if (GNUNET_YES != ch->suspended_remote) @@ -959,6 +965,8 @@ static int check_cadet_audio_message (void *cls, const struct CadetAudioMessage *msg) { + (void) cls; + (void) msg; return GNUNET_OK; /* any payload is fine */ } @@ -1147,6 +1155,7 @@ inbound_channel (void *cls, struct Line *line = cls; struct Channel *ch; + (void) initiator; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incoming cadet channel on line %p\n", line); @@ -1178,6 +1187,7 @@ client_connect_cb (void *cls, { struct Line *line; + (void) cls; line = GNUNET_new (struct Line); line->client = client; line->mq = mq; @@ -1198,9 +1208,10 @@ client_disconnect_cb (void *cls, void *app_ctx) { struct Line *line = app_ctx; - struct Channel *ch; struct Channel *chn; + (void) cls; + (void) client; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client disconnected, closing line\n"); if (NULL != line->port) @@ -1208,7 +1219,7 @@ client_disconnect_cb (void *cls, GNUNET_CADET_close_port (line->port); line->port = NULL; } - for (ch = line->channel_head; NULL != ch; ch = chn) + for (struct Channel *ch = line->channel_head; NULL != ch; ch = chn) { chn = ch->next; ch->line = NULL; @@ -1285,6 +1296,7 @@ handle_client_register_message (void *cls, static void do_shutdown (void *cls) { + (void) cls; if (NULL != cadet) { GNUNET_CADET_disconnect (cadet); @@ -1305,6 +1317,8 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *c, struct GNUNET_SERVICE_Handle *service) { + (void) cls; + (void) service; cfg = c; GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_get_peer_identity (cfg, diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index dd81ec917c..3fee68782e 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c @@ -46,6 +46,7 @@ conversation_value_to_string (void *cls, { char *s; + (void) cls; switch (type) { case GNUNET_GNSRECORD_TYPE_PHONE: @@ -103,6 +104,7 @@ conversation_string_to_value (void *cls, void **data, size_t *data_size) { + (void) cls; if (NULL == s) { GNUNET_break (0); @@ -181,6 +183,7 @@ conversation_typename_to_number (void *cls, { unsigned int i; + (void) cls; i=0; while ( (name_map[i].name != NULL) && (0 != strcasecmp (gns_typename, name_map[i].name)) ) @@ -202,6 +205,7 @@ conversation_number_to_typename (void *cls, { unsigned int i; + (void) cls; i=0; while ( (name_map[i].name != NULL) && (type != name_map[i].number) ) @@ -221,6 +225,7 @@ libgnunet_plugin_gnsrecord_conversation_init (void *cls) { struct GNUNET_GNSRECORD_PluginFunctions *api; + (void) cls; api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions); api->value_to_string = &conversation_value_to_string; api->string_to_value = &conversation_string_to_value; -- cgit v1.2.3-18-g5258 From be9319fee506932c3d7f731f62884e8bd96431c5 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Wed, 6 Jun 2018 06:20:54 +0000 Subject: second batch complete. WE ARE AFFERO AGPL NOW! --- configure.ac | 15 +++++---------- guix-env.scm | 15 +++++---------- src/curl/curl.c | 20 +++++++++----------- src/curl/curl_reschedule.c | 20 +++++++++----------- src/fs/fs_search.c | 15 +++++---------- src/identity-provider/identity_provider.h | 15 +++++---------- src/identity-provider/identity_provider_api.c | 15 +++++---------- src/identity/identity.h | 15 +++++---------- src/identity/identity_api.c | 15 +++++---------- src/identity/identity_api_lookup.c | 15 +++++---------- src/include/gnunet_curl_lib.h | 20 +++++++++----------- src/include/gnunet_db_lib.h | 19 +++++++++---------- src/include/gnunet_json_lib.h | 19 +++++++++---------- src/include/gnunet_jsonapi_lib.h | 19 +++++++++---------- src/include/gnunet_jsonapi_util.h | 19 +++++++++---------- src/include/gnunet_pq_lib.h | 19 +++++++++---------- src/include/gnunet_revocation_service.h | 15 +++++---------- src/include/gnunet_sq_lib.h | 19 +++++++++---------- src/json/json.c | 19 +++++++++---------- src/json/json_generator.c | 19 +++++++++---------- src/json/json_helper.c | 19 +++++++++---------- src/json/json_mhd.c | 19 +++++++++---------- src/json/test_json.c | 17 ++++++++--------- src/jsonapi/jsonapi.c | 17 ++++++++--------- src/jsonapi/test_jsonapi.c | 19 +++++++++---------- src/my/my_result_helper.c | 19 +++++++++---------- src/pq/pq.c | 19 +++++++++---------- src/pq/pq_connect.c | 17 ++++++++--------- src/pq/pq_eval.c | 17 ++++++++--------- src/pq/pq_exec.c | 17 ++++++++--------- src/pq/pq_prepare.c | 17 ++++++++--------- src/pq/pq_query_helper.c | 19 +++++++++---------- src/pq/pq_result_helper.c | 19 +++++++++---------- src/pq/test_pq.c | 17 ++++++++--------- src/revocation/gnunet-service-revocation.c | 15 +++++---------- src/revocation/revocation_api.c | 15 +++++---------- src/scalarproduct/test_ecc_scalarproduct.c | 15 +++++---------- src/sq/sq.c | 17 ++++++++--------- src/sq/sq_exec.c | 17 ++++++++--------- src/sq/sq_prepare.c | 17 ++++++++--------- src/sq/sq_query_helper.c | 19 +++++++++---------- src/sq/sq_result_helper.c | 19 +++++++++---------- src/sq/test_sq.c | 17 ++++++++--------- src/util/crypto_ecc_dlog.c | 15 +++++---------- src/util/crypto_rsa.c | 19 +++++++++---------- src/util/perf_crypto_ecc_dlog.c | 15 +++++---------- src/util/test_crypto_ecc_dlog.c | 15 +++++---------- src/util/test_crypto_hash_context.c | 19 +++++++++---------- src/util/test_crypto_rsa.c | 17 ++++++++--------- 49 files changed, 369 insertions(+), 481 deletions(-) diff --git a/configure.ac b/configure.ac index 871a84f93c..53a2c655ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,20 +1,15 @@ # This file is part of GNUnet. # (C) 2001--2018 GNUnet e.V. # -# GNUnet is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; either version 3, or (at your -# option) any later version. +# GNUnet is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. # # GNUnet is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNUnet; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# Affero General Public License for more details. # # # Process this file with autoconf to produce a configure script. diff --git a/guix-env.scm b/guix-env.scm index 11e5451e21..bef9b23d37 100644 --- a/guix-env.scm +++ b/guix-env.scm @@ -1,20 +1,15 @@ ;;; This file is part of GNUnet. ;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V. ;;; -;;; GNUnet is free software; you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published -;;; by the Free Software Foundation; either version 3, or (at your -;;; option) any later version. +;;; GNUnet is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published +;;; by the Free Software Foundation, either version 3 of the License, +;;; or (at your option) any later version. ;;; ;;; GNUnet is distributed in the hope that it will be useful, but ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;;; General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNUnet; see the file COPYING. If not, write to the -;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;;; Boston, MA 02110-1301, USA. +;;; Affero General Public License for more details. (use-modules (ice-9 popen) diff --git a/src/curl/curl.c b/src/curl/curl.c index f197903386..846e47b52b 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -2,17 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016, 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see - + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file curl/curl.c diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c index 6da930ea06..34604c3ff5 100644 --- a/src/curl/curl_reschedule.c +++ b/src/curl/curl_reschedule.c @@ -2,17 +2,15 @@ This file is part of GNUnet Copyright (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see - + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file curl/curl_reschedule.c diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index 83aae2fc5c..ec535c10b3 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2001-2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Tem ple Place - Suite 330, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file fs/fs_search.c diff --git a/src/identity-provider/identity_provider.h b/src/identity-provider/identity_provider.h index 625b8f96df..eb443fa5ff 100644 --- a/src/identity-provider/identity_provider.h +++ b/src/identity-provider/identity_provider.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Liceidentity as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Liceidentity for more details. - - You should have received a copy of the GNU General Public Liceidentity - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index 6d30f9e2a6..18dbcef3d0 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Liceidentity as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Liceidentity for more details. - - You should have received a copy of the GNU General Public Liceidentity - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity/identity.h b/src/identity/identity.h index aae650a79f..5bde956e13 100644 --- a/src/identity/identity.h +++ b/src/identity/identity.h @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Liceidentity as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Liceidentity for more details. - - You should have received a copy of the GNU General Public Liceidentity - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 1601ae2fda..7852accff2 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Liceidentity as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Liceidentity for more details. - - You should have received a copy of the GNU General Public Liceidentity - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c index 7d40104fdb..4d4f01a0c2 100644 --- a/src/identity/identity_api_lookup.c +++ b/src/identity/identity_api_lookup.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Liceidentity as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Liceidentity for more details. - - You should have received a copy of the GNU General Public Liceidentity - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index ec52299cbc..72ca28efa1 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h @@ -2,17 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see - + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file src/include/gnunet_curl_lib.h diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h index 9356f66cb4..6d0dc02211 100644 --- a/src/include/gnunet_db_lib.h +++ b/src/include/gnunet_db_lib.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file include/gnunet_db_lib.h diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index 49120982ab..1df9a0b5ee 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file gnunet_json_lib.h diff --git a/src/include/gnunet_jsonapi_lib.h b/src/include/gnunet_jsonapi_lib.h index 2f6b810f0b..415262f0a1 100644 --- a/src/include/gnunet_jsonapi_lib.h +++ b/src/include/gnunet_jsonapi_lib.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file gnunet_jsonapi_lib.h diff --git a/src/include/gnunet_jsonapi_util.h b/src/include/gnunet_jsonapi_util.h index 4289a50622..dfc22c5089 100644 --- a/src/include/gnunet_jsonapi_util.h +++ b/src/include/gnunet_jsonapi_util.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file gnunet_jsonapi_util.h diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h index ed295b5002..418691d775 100644 --- a/src/include/gnunet_pq_lib.h +++ b/src/include/gnunet_pq_lib.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file include/gnunet_pq_lib.h diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h index beb203142e..787a7ec26d 100644 --- a/src/include/gnunet_revocation_service.h +++ b/src/include/gnunet_revocation_service.h @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Licerevocation as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Licerevocation for more details. - - You should have received a copy of the GNU General Public Licerevocation - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ #ifndef GNUNET_REVOCATION_SERVICE_H_ diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h index 61fd5299ae..db542564d4 100644 --- a/src/include/gnunet_sq_lib.h +++ b/src/include/gnunet_sq_lib.h @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file include/gnunet_sq_lib.h diff --git a/src/json/json.c b/src/json/json.c index c182a02f43..cde0e95032 100644 --- a/src/json/json.c +++ b/src/json/json.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014-2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file json/json.c diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 98f7163bcc..3daef5b101 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file json/json_generator.c diff --git a/src/json/json_helper.c b/src/json/json_helper.c index c7eca97ecc..772df2e37f 100644 --- a/src/json/json_helper.c +++ b/src/json/json_helper.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file json/json_helper.c diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c index b17be46f01..0950924687 100644 --- a/src/json/json_mhd.c +++ b/src/json/json_mhd.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file json/json_mhd.c diff --git a/src/json/test_json.c b/src/json/test_json.c index adab817b9c..282d0481aa 100644 --- a/src/json/test_json.c +++ b/src/json/test_json.c @@ -2,16 +2,15 @@ This file is part of GNUnet (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** diff --git a/src/jsonapi/jsonapi.c b/src/jsonapi/jsonapi.c index 5223a1e054..23b555fefd 100644 --- a/src/jsonapi/jsonapi.c +++ b/src/jsonapi/jsonapi.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file jsonapi/jsonapi.c diff --git a/src/jsonapi/test_jsonapi.c b/src/jsonapi/test_jsonapi.c index 36c7b5c6cf..9f668bcd98 100644 --- a/src/jsonapi/test_jsonapi.c +++ b/src/jsonapi/test_jsonapi.c @@ -2,16 +2,15 @@ This file is part of GNUnet (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c index f84550ced5..af3ce72ae9 100644 --- a/src/my/my_result_helper.c +++ b/src/my/my_result_helper.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file my/my_result_helper.c diff --git a/src/pq/pq.c b/src/pq/pq.c index 4e24e1ef86..2097e7f806 100644 --- a/src/pq/pq.c +++ b/src/pq/pq.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq.c diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c index 99ad06485f..eedc901706 100644 --- a/src/pq/pq_connect.c +++ b/src/pq/pq_connect.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_connect.c diff --git a/src/pq/pq_eval.c b/src/pq/pq_eval.c index 0f28aec7ee..20926ce10b 100644 --- a/src/pq/pq_eval.c +++ b/src/pq/pq_eval.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_eval.c diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c index eacc1f2b3c..feb51415d3 100644 --- a/src/pq/pq_exec.c +++ b/src/pq/pq_exec.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_exec.c diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c index 612d6df7cc..af5c5e29dd 100644 --- a/src/pq/pq_prepare.c +++ b/src/pq/pq_prepare.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_prepare.c diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c index d80a3d99a6..b532fe1c32 100644 --- a/src/pq/pq_query_helper.c +++ b/src/pq/pq_query_helper.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_query_helper.c diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c index d9fed26a6a..e10afbb74c 100644 --- a/src/pq/pq_result_helper.c +++ b/src/pq/pq_result_helper.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014, 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/pq_result_helper.c diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c index b543181103..6f5208c3dc 100644 --- a/src/pq/test_pq.c +++ b/src/pq/test_pq.c @@ -2,16 +2,15 @@ This file is part of GNUnet (C) 2015, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file pq/test_pq.c diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 23f6541418..f60141fe6a 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2013, 2014, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Licerevocation as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Licerevocation for more details. - - You should have received a copy of the GNU General Public Licerevocation - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c index ef659baa0d..8bde51fc83 100644 --- a/src/revocation/revocation_api.c +++ b/src/revocation/revocation_api.c @@ -2,20 +2,15 @@ This file is part of GNUnet Copyright (C) 2013, 2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public Licerevocation as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public Licerevocation for more details. - - You should have received a copy of the GNU General Public Licerevocation - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + Affero General Public License for more details. */ /** * @file revocation/revocation_api.c diff --git a/src/scalarproduct/test_ecc_scalarproduct.c b/src/scalarproduct/test_ecc_scalarproduct.c index 5e86f2471d..d04bc9b649 100644 --- a/src/scalarproduct/test_ecc_scalarproduct.c +++ b/src/scalarproduct/test_ecc_scalarproduct.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. */ /** diff --git a/src/sq/sq.c b/src/sq/sq.c index 089ebf0ffc..7352cc3d9b 100644 --- a/src/sq/sq.c +++ b/src/sq/sq.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/sq.c diff --git a/src/sq/sq_exec.c b/src/sq/sq_exec.c index c40b1fb75b..c5d581c38a 100644 --- a/src/sq/sq_exec.c +++ b/src/sq/sq_exec.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/sq_exec.c diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c index db1047c756..5afff1749a 100644 --- a/src/sq/sq_prepare.c +++ b/src/sq/sq_prepare.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2018 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/sq_prepare.c diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c index 94a3a3f1c8..e4fcdbab66 100644 --- a/src/sq/sq_query_helper.c +++ b/src/sq/sq_query_helper.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/sq_query_helper.c diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c index f2986a0532..6b551bafc7 100644 --- a/src/sq/sq_result_helper.c +++ b/src/sq/sq_result_helper.c @@ -3,16 +3,15 @@ This file is part of GNUnet Copyright (C) 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/sq_result_helper.c diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c index 7138090305..914af8fdea 100644 --- a/src/sq/test_sq.c +++ b/src/sq/test_sq.c @@ -2,16 +2,15 @@ This file is part of GNUnet (C) 2015, 2016, 2017 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file sq/test_sq.c diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c index 91411368f6..02cc608d73 100644 --- a/src/util/crypto_ecc_dlog.c +++ b/src/util/crypto_ecc_dlog.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2012, 2013, 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c index bbd6c95ea3..192b011e2d 100644 --- a/src/util/crypto_rsa.c +++ b/src/util/crypto_rsa.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014,2016 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c index 01369649f1..49dbc544cb 100644 --- a/src/util/perf_crypto_ecc_dlog.c +++ b/src/util/perf_crypto_ecc_dlog.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c index 3bddf8efa9..10ed0ee386 100644 --- a/src/util/test_crypto_ecc_dlog.c +++ b/src/util/test_crypto_ecc_dlog.c @@ -2,20 +2,15 @@ This file is part of GNUnet. Copyright (C) 2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Affero General Public License for more details. */ /** diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c index 5ef73fe3c9..4739e46faf 100644 --- a/src/util/test_crypto_hash_context.c +++ b/src/util/test_crypto_hash_context.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** * @file util/test_crypto_hash_context.c diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c index c64c0acf91..522767bbb3 100644 --- a/src/util/test_crypto_rsa.c +++ b/src/util/test_crypto_rsa.c @@ -2,16 +2,15 @@ This file is part of GNUnet Copyright (C) 2014,2015 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. - GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - GNUnet; see the file COPYING. If not, If not, see + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. */ /** -- cgit v1.2.3-18-g5258 From bc2853bf5de404afdcb6774eb287f31977b3c76a Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Wed, 6 Jun 2018 06:20:55 +0000 Subject: for posterity: the script that caught all kinds of funny license formatting --- contrib/scripts/afferify | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100755 contrib/scripts/afferify diff --git a/contrib/scripts/afferify b/contrib/scripts/afferify new file mode 100755 index 0000000000..188b66c640 --- /dev/null +++ b/contrib/scripts/afferify @@ -0,0 +1,95 @@ +#!/usr/bin/perl +# Catch all in-source GPL2/3 license declarations and convert +# them to AGPL. +# +# You expected this to be using diff & patch? Well, the source +# files have all sorts of different commenting and indentation +# styles, not speaking of typos and failed uses of search and +# replace, that an attempt in using the patch(1) tool would fail +# miserably. This script instead is based on my rgrep from 1998. +# Keeping it here as it may be useful to other projects under- +# going the same pains. It is forbidden to use this script to +# convert AGPL code back to less strict licensing. Haha, just +# kidding. +# +# -symlynX + +use File::Find; +$|=1; +# Recurse into current or given directories +find(\&wanted, $#ARGV >= 0 ? @ARGV : '.'); +print STDERR "\n"; +exit; + + +sub wanted { + my $name = $File::Find::name; + ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime) + = lstat; + return $File::Find::prune = 1 if /^(CVS|\.git|\.svn)$/; + # Nicer if you 'make distclean' first + return if /\.(o|pdf)$/i; + return if -d _ or -l _; + return if /afferify/; # Don't apply this to itself ;) + # No.. i didn't do it.. just being careful ;) ;) +# return unless -T _; # We don't have binaries in the repo, do we? + + # We need the default variable '$_' for more important duties. + my $f = $_; + + if (sysopen(I, $f, O_RDONLY)) { + $_ = &slurp(*I); + close I; + # Debugging: What's inside the file we just read? +# print STDERR '> ', $_; + + # Good idea to have the text start with "GNUnet" rather than "This program" + if ( s#GNUnet is free software; you can redistribute it and/or modify it under the#GNUnet is free software: you can redistribute it and/or modify it# ) { + # Whoever had the idea of reformatting the GPL license text... + print STDERR "\nTrying wide style on $name\t"; + + # Most important thing to know in order to be able + # to read perl code: if regexps appear without any + # context, it means they are applied to the default + # variable being '$_'. + return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU General Public License as published#; + return unless s#^(\W*\s+)Foundation; either version \d, or \(at your option\) any later version\.#\1by the Free Software Foundation, either version 3 of the License,\n\1or (at your option) any later version.#m; + return unless s#GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY#GNUnet is distributed in the hope that it will be useful, but#; + return unless s#WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR#WITHOUT ANY WARRANTY; without even the implied warranty of#; + return unless s#^(\W*\s+)A PARTICULAR PURPOSE. See the GNU General Public License for more details.#\1MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n\1Affero General Public License for more details.#m; + return unless s#^\W*\n\W*\s+You should have received a copy of the GNU General Public License along with\n\W*\s+GNUnet. see the file COPYING\. If not, .* see\s*\W*\s+\n##m; + } else { + # If this string is not in the file, leave it alone. + return unless s#GNUnet is free software; you can redistribute it and/or modify#GNUnet is free software: you can redistribute it and/or modify it#; + print STDERR "\nTrying regular style on $name\t"; + + # Patterns are designed to also match some typos and substitutions. + return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU General Public License as published#; + return unless s#by the Free Software Foundation; either version \d, or \(at your#by the Free Software Foundation, either version 3 of the License,#; + return unless s#option\) any later version\.#or (at your option) any later version.#; + return unless s#General Public Lice\w+ for more details\.#Affero General Public License for more details.#; + return unless s#^\W*\n\W*\s+You should have received a copy of the GNU General Public Lice\w+\n\W*\s+along with GNUnet. see the file COPYING\. If not, write to the\n\W*\s+Free Software Foundation, Inc\., (51 Franklin Street, Fifth Floor|59 Tem ?ple Place - Suite 330),\n\W*\s+Boston, MA 0211\d-130\d, USA\.\n##m; + } + print STDERR "OK"; + + # We directly overwrite the original file in the + # assumption that we're in a healthy revertible git. + open(O, '>', $f) or die "Cannot overwrite $f"; + # Imagine, I could have left out $_ here... ;) + print O $_; + close O; + } else { + die "Cannot access $name"; + } +} + +# Reads a file from a stream into a variable all at once: +sub slurp { + # Perl sure gets clunky here + local(*IN) = @_; + local($save) = $/; + undef $/; + local($data) = ; + $/ = $save; + return $data; +} -- cgit v1.2.3-18-g5258 From 5859903329d12cb4bf97b4df001692dfdaeee7cd Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 6 Jun 2018 09:04:15 +0200 Subject: add changelog --- ChangeLog | 4 + configure.ac | 2 +- po/POTFILES.in | 1 + po/de.po | 4406 +++++++++++++++++++++++++++---------------------------- po/es.po | 4407 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 4406 +++++++++++++++++++++++++++---------------------------- po/sv.po | 4407 ++++++++++++++++++++++++++++---------------------------- po/vi.po | 4407 ++++++++++++++++++++++++++++---------------------------- po/zh_CN.po | 4407 ++++++++++++++++++++++++++++---------------------------- 9 files changed, 13240 insertions(+), 13207 deletions(-) diff --git a/ChangeLog b/ChangeLog index a44065ec22..c7ab7ae338 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 6 08:28:27 CEST 2018 + Releasing GNUnet 0.11.0pre66. Let's try to keep a better + ChangeLog again henceforth. -CG + Sat Jan 7 16:41:34 CET 2017 Converting NAT library to new NAT service (and splitting of nat-auto service for auto-configuration). -CG diff --git a/configure.ac b/configure.ac index 53a2c655ee..c2659351dd 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ # AC_PREREQ(2.61) # Checks for programs. -AC_INIT([gnunet], [0.11.0], [bug-gnunet@gnu.org]) +AC_INIT([gnunet], [0.11.0pre66], [bug-gnunet@gnu.org]) AC_CANONICAL_TARGET AC_CANONICAL_HOST diff --git a/po/POTFILES.in b/po/POTFILES.in index 35a9d6977c..dd9966302e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -320,6 +320,7 @@ src/revocation/gnunet-service-revocation.c src/revocation/plugin_block_revocation.c src/revocation/revocation_api.c src/rps/gnunet-rps.c +src/rps/gnunet-rps-profiler.c src/rps/gnunet-service-rps.c src/rps/gnunet-service-rps_custommap.c src/rps/gnunet-service-rps_sampler.c diff --git a/po/de.po b/po/de.po index b436174126..d5ea3e0449 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2015-03-08 16:16+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -21,1027 +21,1027 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.7.4\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, fuzzy, c-format msgid "Failed to remove configuration file %s\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, fuzzy, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 msgid "Message was sent successfully" msgstr "" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 msgid "We disconnected from ARM before we could send a request" msgstr "" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 msgid "Unknown request status" msgstr "Unbekannter Anfragestatus" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "%s wurde gestoppt" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 #, fuzzy msgid "is starting" msgstr "%s startet" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 #, fuzzy msgid "is stopping" msgstr "%s wird gestoppt" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 #, fuzzy msgid "is starting already" msgstr "%s ist bereits gestartet" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 #, fuzzy msgid "is stopping already" msgstr "%s wird bereits gestoppt" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 #, fuzzy msgid "is started already" msgstr "%s ist bereits gestartet" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 #, fuzzy msgid "is stopped already" msgstr "%s ist bereits gestoppt" -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 msgid "service is not known to ARM" msgstr "" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "%s-Dienst konnte nicht gestartet werden" -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 msgid "service cannot be manipulated because ARM is shutting down" msgstr "" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "Unbekannter Anfragestatus" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, c-format msgid "Failed to start the ARM service: %s\n" msgstr "ARM-Dienst konnte nicht gestartet werden: %s\n" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, fuzzy, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, fuzzy, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, fuzzy, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, fuzzy, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, fuzzy, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, fuzzy, c-format msgid "Failed to request a list of services: %s\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 msgid "Error communicating with ARM. ARM not running?\n" msgstr "Fehler bei der Kommunikation mit ARM. Läuft ARM nicht?\n" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 msgid "Running services:\n" msgstr "Laufende Dienste:\n" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "%s wurde gestoppt.\n" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, c-format msgid "Starting %s...\n" msgstr "%s wird gestartet …\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "%s wird gestoppt …\n" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, fuzzy, c-format msgid "Unknown status %u for service %s.\n" msgstr "`%s': unbekannter Dienst: %s\n" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 msgid "stop all GNUnet services" msgstr "Alle GNUnet-Dienste stoppen" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "Einen bestimmten Dienst starten" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "Einen bestimmten Dienst stoppen" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 msgid "start all GNUnet default services" msgstr "Alle Standard-GNUnet-Dienste starten" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 msgid "stop and start all GNUnet default services" msgstr "Alle Standard-GNUnet-Dienste stoppen und starten" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "ARM-Aktivitäten überwachen" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "Keine Statusmeldungen ausgeben" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 msgid "list currently running services" msgstr "Alle derzeit laufenden Dienste auflisten" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, c-format msgid "Using `%s' instead\n" msgstr "" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " "domain socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, c-format msgid "Failed to resolve `%s': %s\n" msgstr "»%s« konnte nicht aufgelöst werden: %s\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, fuzzy, c-format msgid "Failed to start service `%s'\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, fuzzy, c-format msgid "Starting service `%s'\n" msgstr "Collection `%s' begonnen.\n" -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, fuzzy, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "Fehler beim Anlegen des Benutzerkontos:" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, fuzzy, c-format msgid "Preparing to stop `%s'\n" msgstr "Collection `%s' begonnen.\n" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, c-format msgid "Restarting service `%s'.\n" msgstr "Dienst »%s« wird neu gestartet.\n" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "Signal" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 msgid "unknown" msgstr "Unbekannt" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, c-format msgid "Service `%s' took %s to terminate\n" msgstr "Dienst »%s« benötigte %s zum Beenden\n" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "Dienst »%s« wurde normal beendet, wird jederzeit neu gestartet\n" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 msgid "solver to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 msgid "print logging" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, fuzzy, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, fuzzy, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, fuzzy, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "Konfiguration konnte nicht aus %s geladen werden\n" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " "%llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " "must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr " gconfig\tGTK Konfiguration\n" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, fuzzy, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 msgid "Stop logging\n" msgstr "Protokollierung stoppen\n" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, fuzzy, c-format msgid "Start logging `%s'\n" msgstr "Collection `%s' begonnen.\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " "= %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" "s, %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, fuzzy, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "Verfügbare(r) Transport(e): %s\n" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, fuzzy, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 #, fuzzy msgid "Cannot connect to ATS service, exiting...\n" msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 msgid "Cannot issue request to ATS service, exiting...\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 msgid "No preference type given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 msgid "No peer given!\n" msgstr "Kein Knoten angegeben!\n" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 msgid "Valid type required\n" msgstr "Gültiger Typ ist erforderlich\n" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "Liste aller derzeit genutzten aktiven Adressen holen" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "Liste aller aktiven Adressen holen" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "Mit einem Knoten verbinden" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 msgid "do not resolve IP addresses to hostnames" msgstr "IP-Adressen nicht zu Rechnernamen auflösen" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "Überwachungsmodus" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 msgid "set preference for the given peer" msgstr "" -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "Knoten-ID" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 #, fuzzy msgid "Print information about ATS state" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 msgid "public auction outcome" msgstr "" -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 msgid "help text" msgstr "Hilfetext" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, fuzzy, c-format msgid "Invalid peer ID `%s'\n" msgstr "Ungültige Antwort auf `%s'.\n" -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, fuzzy, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, fuzzy, c-format msgid "Invalid target `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 #, fuzzy msgid "No action requested\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 #, fuzzy msgid "Provide information about a particular connection" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 #, fuzzy msgid "Provide information about a patricular peer" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 #, fuzzy msgid "Provide information about all peers" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 #, fuzzy msgid "Provide information about a particular tunnel" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 #, fuzzy msgid "Provide information about all tunnels" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 #, fuzzy msgid "number of peers in consensus" msgstr "Anzahl an Durchläufen" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 msgid "number of values" msgstr "Anzahl der Werte" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 msgid "consensus timeout" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 msgid "write statistics to file" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, fuzzy, c-format msgid "Call from `%s' terminated\n" msgstr "Aufruf von `%s' gibt %d zurück.\n" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 msgid "Failed to setup phone (internal error)\n" msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, c-format msgid "Failed to resolve `%s'\n" msgstr "»%s« konnte nicht aufgelöst werden\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, fuzzy, c-format msgid "Call to `%s' terminated\n" msgstr "Aufruf von `%s' gibt %d zurück.\n" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, c-format msgid "Unknown command `%s'\n" msgstr "Unbekannter Befehl »%s«\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, fuzzy, c-format msgid "Ego `%s' not available\n" msgstr "`%s' ist nicht verfügbar." -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "Anzurufender Teilnehmer fehlt.\n" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "Es gibt keinen eingehenden Anruf, der angenommen werden könnte!\n" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" "Es gibt keinen eingehenden Anruf »%s«, der jetzt angenommen werden könnte!\n" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "Derzeit keine Adresse vorhanden.\n" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "Anruf wartet:\n" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, c-format msgid "#%u: `%s'\n" msgstr "#%u: »%s«\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, c-format msgid "Name of our ego changed to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Pseudonym `%s' wurde gelöscht.\n" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1049,15 +1049,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "Fehler beim Lesen aus STDIN: %d %s\n" @@ -1067,2500 +1067,2500 @@ msgstr "Fehler beim Lesen aus STDIN: %d %s\n" msgid "pa_stream_write() failed: %s\n" msgstr "pa_stream_write() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "gnunet-helper-audio-playback - Signal erhalten, wird abgebrochen\n" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 #, fuzzy msgid "Connection established.\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, c-format msgid "pa_stream_new() failed: %s\n" msgstr "pa_stream_new() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "pa_stream_connect_playback() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, c-format msgid "Connection failure: %s\n" msgstr "Verbindung fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 msgid "Wrong Spec\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 msgid "pa_mainloop_new() failed.\n" msgstr "pa_mainloop_new() fehlgeschlagen.\n" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 msgid "pa_context_new() failed.\n" msgstr "pa_context_new() fehlgeschlagen.\n" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, c-format msgid "pa_context_connect() failed: %s\n" msgstr "pa_context_connect() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 msgid "pa_mainloop_run() failed.\n" msgstr "pa_mainloop_run() fehlgeschlagen.\n" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "Fehler beim Lesen aus STDIN: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "opus_encode_float() fehlgeschlagen: %s. Abbruch\n" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "pa_stream_peek() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "Signal erhalten, wird abgebrochen.\n" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 msgid "Stream successfully created.\n" msgstr "Datenstrom wurde erfolgreich erzeugt.\n" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "pa_stream_get_buffer_attr() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "Datenstromfehler: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "pa_stream_connect_record() fehlgeschlagen: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 msgid "ogg_stream_init() failed.\n" msgstr "ogg_stream_init() fehlgeschlagen.\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, fuzzy, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, fuzzy, c-format msgid "Could not open line, port %s already in use!\n" msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 msgid "Could not start record audio helper\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, c-format msgid "PHONE version %u not supported\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 msgid "Could not start playback audio helper.\n" msgstr "" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 #, fuzzy msgid "fresh connection" msgstr "# verbundener Freunde" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 #, fuzzy msgid "key received" msgstr "# empfangene Ergebnisse" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 #, fuzzy msgid "connection established" msgstr " Verbindung fehlgeschlagen\n" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "# verbundener Freunde" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 msgid "Connection to CORE service lost (reconnecting)" msgstr "" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "Unbekannter Fehler" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, fuzzy, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "%24s: %-17s %4s (%u Verbindungen insgesamt)\n" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, c-format msgid "Invalid command line argument `%s'\n" msgstr "Ungültiges Befehlszeilenargument »%s«\n" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 #, fuzzy msgid "Failed to connect to CORE service!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 msgid "provide information about all current connections (continuously)" msgstr "" -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 msgid "Print information about connected peers." msgstr "Informationen über verbundene Knoten ausgeben." -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 #, fuzzy msgid "# send requests dropped (disconnected)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, fuzzy, c-format msgid "# bytes of messages of type %u received" msgstr "# Bytes Rauschen empfangen" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 msgid "# messages discarded (session disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, fuzzy, c-format msgid "# messages of type %u discarded (client busy)" msgstr "# Bytes Rauschen empfangen" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, fuzzy, c-format msgid "Core service of `%s' ready.\n" msgstr "Dienst »%s« wird neu gestartet.\n" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "# Bytes verschlüsselt" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "# Bytes entschlüsselt" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 #, fuzzy msgid "# PING messages transmitted" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 #, fuzzy msgid "# duplicate ephemeral keys ignored" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 #, fuzzy msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 #, fuzzy msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 #, fuzzy msgid "# valid ephemeral keys received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 #, fuzzy msgid "# PING messages received" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 #, fuzzy msgid "# PONG messages created" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 #, fuzzy msgid "# keepalive messages sent" msgstr "# Klartext PING Nachrichten gesendet" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 #, fuzzy msgid "# PONG messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 #, fuzzy msgid "# PONG messages decrypted" msgstr "# PING Nachrichten erstellt" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# Knotenankündigungen empfangen" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# Bytes empfangen über TCP" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 #, fuzzy msgid "# rekey operations confirmed via PONG" msgstr "# Knotenankündigungen empfangen" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 #, fuzzy msgid "# bytes dropped (duplicates)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 #, fuzzy msgid "# bytes dropped (out of sequence)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 #, fuzzy msgid "# bytes dropped (ancient message)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 #, fuzzy msgid "# bytes of payload decrypted" msgstr "# Bytes entschlüsselt" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 msgid "# peers connected" msgstr "# verbundener Knoten" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 #, fuzzy msgid "# type map refreshes sent" msgstr "# p2p Trace-Antworten gesendet" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 #, fuzzy msgid "# outdated typemap confirmations received" msgstr "# Bytes empfangen über TCP" -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 #, fuzzy msgid "# valid typemap confirmations received" msgstr "# Bytes empfangen über TCP" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 #, fuzzy msgid "# type maps received" msgstr "# Bytes empfangen über TCP" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, fuzzy, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, fuzzy, c-format msgid "Ego `%s' not known to identity service\n" msgstr "`%s': unbekannter Dienst: %s\n" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, fuzzy, c-format msgid "Issuer public key not well-formed\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, fuzzy, c-format msgid "ego required\n" msgstr "Gültiger Typ ist erforderlich\n" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, fuzzy, c-format msgid "Issuer ego required\n" msgstr "Gültiger Typ ist erforderlich\n" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 #, fuzzy msgid "The public key of the subject to lookup the credential for" msgstr "Die Priorität des Inhalts angeben" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 msgid "The public key of the authority to verify the credential against" msgstr "" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 msgid "The ego to use" msgstr "" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 #, fuzzy msgid "GNUnet credential resolver tool" msgstr "GNUnet Netzwerk Topologie tracen." -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, fuzzy, c-format msgid "Failed to connect to namestore\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 #, fuzzy msgid "GNS REST API initialized\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 msgid "# bytes stored" msgstr "# gespeicherte Bytes" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 msgid "# items stored" msgstr "# gespeicherte Objekte" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 msgid "# requests received" msgstr "# Anfragen empfangen" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 #, fuzzy msgid "# requests for random value received" msgstr "# Anfragen empfangen" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 #, fuzzy msgid "# proximity search requests received" msgstr "# Klartext PONG Nachrichten empfangen" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "# verbundener Freunde" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "# verbundener Knoten" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 #, fuzzy msgid "# queue entries created" msgstr "# PING Nachrichten erstellt" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 msgid "# status messages received" msgstr "# empfangene Statusmeldungen" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 msgid "# Results received" msgstr "# empfangene Ergebnisse" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 msgid "# datastore connections (re)created" msgstr "" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 #, fuzzy msgid "# PUT requests executed" msgstr "# dht Anfragen weitergeleitet" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 #, fuzzy msgid "# RESERVE requests executed" msgstr "# dht Anfragen weitergeleitet" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 #, fuzzy msgid "# REMOVE requests executed" msgstr "# dht Anfragen weitergeleitet" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 msgid "# GET requests executed" msgstr "# ausgeführte GET-Anfragen" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 #, fuzzy msgid "Error queueing datastore GET operation\n" msgstr "Fehler beim Anlegen des Benutzers" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, c-format msgid "Failed to store item: %s, aborting\n" msgstr "Objekt konnte nicht gespeichert werden: %s, Abbruch\n" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, c-format msgid "Inserted % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 #, fuzzy msgid "Error queueing datastore PUT operation\n" msgstr "Fehler beim Anlegen des Benutzers" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 #, fuzzy msgid "Failed connecting to the datastore.\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 msgid "Dump all records from the datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 #, fuzzy msgid "Insert records into the datastore" msgstr "# bytes in der Datenbank" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 #, fuzzy msgid "Manipulate GNUnet datastore" msgstr "sqlite Datenspeicher" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 msgid "# bytes expired" msgstr "# abgelaufene Bytes" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "# gefundene Ergebnisse" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " "%llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " "bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 #, fuzzy msgid "# GET requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 #, fuzzy msgid "# GET KEY requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 msgid "# requests filtered by bloomfilter" msgstr "" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 #, fuzzy msgid "# GET REPLICATION requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 #, fuzzy msgid "# GET ZERO ANONYMITY requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 msgid "Content not found" msgstr "Kein Inhalt gefunden" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 #, fuzzy msgid "# REMOVE requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, fuzzy, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, fuzzy, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "# bytes erlaubt in der Datenbank" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "# Kontingent" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "# Zwischenspeichergröße" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, fuzzy, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 msgid "Failed to initialize bloomfilter.\n" msgstr "Bloomfilter konnte nicht initialisiert werden.\n" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 msgid "Heap database running\n" msgstr "Heap-Datenbank läuft\n" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 #, fuzzy msgid "Data too large" msgstr "Anzahl der Werte" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, fuzzy, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "MySQL-Datenbank läuft\n" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 #, fuzzy msgid "Failed to drop table from database.\n" msgstr "Fehler beim Binden an UDP Port %d.\n" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "PostgreSQL-Datenbank läuft\n" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, fuzzy, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 msgid "Sqlite database running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, c-format msgid "Result %d, type %d:\n" msgstr "" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 msgid "Failed to connect to DHT service!\n" msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, c-format msgid "Exiting as the number of peers is %u\n" msgstr "" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 #, fuzzy msgid "number of peers to start" msgstr "Anzahl an Durchläufen" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 msgid "Measure quality and performance of the DHT service." msgstr "" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 #, fuzzy msgid "# GET requests from clients injected" msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 #, fuzzy msgid "# PUT requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 #, fuzzy msgid "# GET requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 msgid "# GET requests given to datacache" msgstr "" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 msgid "# HELLOs obtained from peerinfo" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 #, fuzzy msgid "# FIND PEER messages initiated" msgstr "# PING Nachrichten erstellt" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 #, fuzzy msgid "# requests TTL-dropped" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 #, fuzzy msgid "# Peer selection failed" msgstr " Verbindung fehlgeschlagen\n" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 #, fuzzy msgid "# PUT requests routed" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 msgid "# PUT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 msgid "# P2P messages dropped due to full queue" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 #, fuzzy msgid "# GET requests routed" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 msgid "# GET messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 msgid "# RESULT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 #, fuzzy msgid "# P2P PUT requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 #, fuzzy msgid "# P2P PUT bytes received" msgstr "# Bytes empfangen über TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 #, fuzzy msgid "# P2P GET requests received" msgstr "# Client Trace-Anfragen empfangen" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 #, fuzzy msgid "# P2P GET bytes received" msgstr "# Bytes empfangen über TCP" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 msgid "# P2P FIND PEER requests processed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 #, fuzzy msgid "# P2P GET requests ONLY routed" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 msgid "# P2P RESULTS received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 #, fuzzy msgid "# P2P RESULT bytes received" msgstr "# Bytes empfangen über TCP" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 #, fuzzy msgid "# Network size estimates received" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 #, fuzzy msgid "# DHT requests combined" msgstr "# dht Anfragen weitergeleitet" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Kein Transport des Typs %d bekannt.\n" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, c-format msgid "Sent DNS request to %s\n" msgstr "" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 msgid "need a valid IPv4 or IPv6 address\n" msgstr "" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 #, fuzzy msgid "Print information about DV state" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# Bytes gesendet über TCP" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 #, fuzzy msgid "# Bytes received from CADET" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# Client Trace-Anfragen empfangen" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# PING Nachrichten erstellt" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# Bytes des Typs %d übertragen" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 #, fuzzy msgid "# Packets received from TUN" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 #, fuzzy msgid "# Bytes received from TUN" msgstr "# Bytes empfangen über TCP" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "Muss eine Zahl sein" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 #, fuzzy msgid "# fragments received" msgstr "# verworfener Nachrichten" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 #, fuzzy msgid "# duplicate fragments received" msgstr "# Bytes empfangen über TCP" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "# defragmentierter Nachrichten" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 #, fuzzy msgid "# fragments transmitted" msgstr "# Selbstbekanntmachungen übertragen" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 #, fuzzy msgid "# fragments retransmitted" msgstr "# Selbstbekanntmachungen übertragen" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 #, fuzzy msgid "# fragments wrap arounds" msgstr "# verworfener Nachrichten" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "# fragmentierter Nachrichten" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 #, fuzzy msgid "# fragment acknowledgements received" msgstr "# Knotenankündigungen empfangen" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 #, fuzzy msgid "# fragmentation transmissions completed" msgstr "# Klartext PONG Nachrichten empfangen" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, fuzzy, c-format msgid "Could not open file `%s': %s" msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, fuzzy, c-format msgid "Could not read file `%s': %s" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, fuzzy, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, fuzzy, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, fuzzy, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, fuzzy, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, fuzzy, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 #, fuzzy msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 #, fuzzy msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 msgid "internal error decoding tree" msgstr "" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 #, fuzzy msgid "Invalid URI" msgstr "Ungültiger Parameter: `%s'\n" -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " "`unknown' instead.\n" msgstr "" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, fuzzy, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, fuzzy, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, fuzzy, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, fuzzy, c-format msgid "Failed to write `%s': %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, fuzzy, c-format msgid "Failed to read `%s': %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 #, fuzzy msgid "Failed to connect to datastore." msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, fuzzy, c-format msgid "Publishing failed: %s" msgstr "" "\n" "Fehler beim Uploaden der Datei: %s\n" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, fuzzy, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "Indizieren der Datei `%s' schlug fehl. Versuch Datei einzufügen...\n" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 #, fuzzy msgid "error on index-start request to `fs' service" msgstr "Anfrage an den Transportdienst konnte nicht gestellt werden\n" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 msgid "filename too long" msgstr "Dateiname zu lang" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 #, fuzzy msgid "could not connect to `fs' service" msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, fuzzy, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, fuzzy, c-format msgid "Recursive upload failed at `%s': %s" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, fuzzy, c-format msgid "Recursive upload failed: %s" msgstr "" "\n" "Fehler beim Uploaden der Datei: %s\n" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 #, fuzzy msgid "needs to be an actual file" msgstr "`%s' ist keine normale Datei.\n" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr "Verbindung fehlgeschlagen: %s\n" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 #, fuzzy msgid "Could not connect to datastore." msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 #, fuzzy msgid "Internal error." msgstr "Unbekannter Fehler.\n" -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 #, fuzzy msgid "Failed to read file" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 #, fuzzy msgid "Error communicating with `fs' service." msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 #, fuzzy msgid "Failed to connect to FS service for unindexing." msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 #, fuzzy msgid "Failed to get KSKs from directory scan." msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, fuzzy, c-format msgid "Internal error scanning `%s'.\n" msgstr "Absicherung fehlgeschlagen bei %s:%d.\n" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, fuzzy, c-format msgid "Failed to remove UBlock: %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 #, fuzzy msgid "Failed to connect to `datastore' service." msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 #, fuzzy msgid "Failed to open file for unindexing." msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 #, fuzzy msgid "Failed to compute hash of file." msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden." -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 #, fuzzy msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "Ungültiges Argument »%s«\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "Keine Schlüsselwörter angegeben!\n" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, fuzzy, c-format msgid "Failed to load state: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, fuzzy, c-format msgid "Failed to save state to file %s\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, c-format msgid "Publishing `%s'\n" msgstr "" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, fuzzy, c-format msgid "Failed to run `%s'\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, fuzzy, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "Die Priorität des Inhalts angeben" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 msgid "Automatically publish files from a directory on GNUnet" msgstr "" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, fuzzy, c-format msgid "Directory `%s' meta data:\n" msgstr "==> Verzeichnis `%s':\n" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, fuzzy, c-format msgid "Directory `%s' contents:\n" msgstr "==> Verzeichnis `%s':\n" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 #, fuzzy msgid "You must specify a filename to inspect.\n" msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, fuzzy, c-format msgid "Failed to read directory `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, fuzzy, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 #, fuzzy msgid "Display contents of a GNUnet directory" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Collection `%s' begonnen.\n" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 #, fuzzy msgid "" msgstr "Unbekannter Fehler" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Fehler beim Download: %s\n" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Dateien aus dem GNUnet herunterladen." -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Datei `%s' hat URI: %s\n" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 msgid "set the desired LEVEL of receiver-anonymity" msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "Die Datei in DATEINAME schreiben" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 #, fuzzy msgid "Special file-sharing operations" msgstr "Alle Optionen anzeigen" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, fuzzy, c-format msgid "Error publishing: %s.\n" msgstr "Fehler beim Download: %s\n" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, fuzzy, c-format msgid "URI is `%s'.\n" msgstr "Ich bin Peer `%s'.\n" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, fuzzy, c-format msgid "Namespace URI is `%s'.\n" msgstr "Ich bin Peer `%s'.\n" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 #, fuzzy msgid "Starting cleanup after abort\n" msgstr "`%s' Startvorgang abgeschlossen.\n" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 #, fuzzy msgid "Cleanup after abort completed.\n" msgstr "`%s' Startvorgang abgeschlossen.\n" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 #, fuzzy msgid "Cleanup after abort failed.\n" msgstr "`%s' Startvorgang abgeschlossen.\n" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, fuzzy, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "Daten des Moduls `%s' werden aktualisiert\n" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, fuzzy, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "Schlüsselwörter für Datei `%s':\n" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 #, fuzzy msgid "Could not publish\n" msgstr "`%s': Kann nicht senden.\n" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 #, fuzzy msgid "Could not start publishing.\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, fuzzy, c-format msgid "Scanning directory `%s'.\n" msgstr "==> Verzeichnis `%s':\n" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, fuzzy, c-format msgid "Scanning file `%s'.\n" msgstr "Binde Konfigurationsdatei `%s' ein\n" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 #, fuzzy msgid "Preprocessing complete.\n" msgstr "GNUnet wurde erfolgreich heruntergefahren.\n" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 #, fuzzy msgid "Internal error scanning directory.\n" msgstr "=\tFehler beim Lesen des Verzeichnisses.\n" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, fuzzy, c-format msgid "Failed to access `%s': %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "Sie dürfen nur eine einzige Datei zum Einfügen angeben.\n" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, fuzzy, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, fuzzy, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3568,7 +3568,7 @@ msgstr "" "Liste der extrahierten Schlüsselworte, die verwendet werden würden, " "ausgeben, aber keinen Upload durchführen" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3576,13 +3576,13 @@ msgstr "" "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der " "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE " "setzen" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3590,7 +3590,7 @@ msgstr "" "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in " "verschlüsselter Form in der GNUnet-Datenbank)" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3598,2066 +3598,2066 @@ msgstr "" "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht " "werden soll. (nur für das Einfügen in Namensräume)" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in " "einem Namensraum)" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in " "Namensräume)" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, fuzzy, c-format msgid "Error searching: %s.\n" msgstr "Fehler beim Verlassen der DHT.\n" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 msgid "Could not create keyword URI from arguments.\n" msgstr "" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 #, fuzzy msgid "Could not start searching.\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 msgid "Search GNUnet for files that were published on GNUnet" msgstr "" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 msgid "# client searches active" msgstr "" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 #, fuzzy msgid "# replies received for local clients" msgstr "Empfangene Client-Nachricht ist ungültig.\n" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 msgid "# Loopback routes suppressed" msgstr "" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 #, fuzzy msgid "# client searches received" msgstr "# Klartext PONG Nachrichten empfangen" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 #, fuzzy msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "GNUnet Konfiguration" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 #, fuzzy msgid "# replies received via cadet" msgstr "# Bytes empfangen über TCP" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 #, fuzzy msgid "# replies received via cadet dropped" msgstr "# Bytes empfangen über TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 #, fuzzy msgid "# queries received via CADET not answered" msgstr "# Bytes empfangen über TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 msgid "# Blocks transferred via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 #, fuzzy msgid "# queries received via cadet" msgstr "# Bytes empfangen über TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 #, fuzzy msgid "# cadet client connections rejected" msgstr "# Sitzungsschlüssel abgelehnt" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr " Verbindung fehlgeschlagen\n" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 #, fuzzy msgid "# migration stop messages received" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 msgid "# replies dropped due to type mismatch" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 #, fuzzy msgid "# replies received for other peers" msgstr "# Bytes des Typs %d empfangen" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 msgid "# requests done for free (low load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 #, fuzzy msgid "# request dropped, priority insufficient" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 msgid "# requests done for a price (normal load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 msgid "# requests dropped due to higher-TTL request" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 #, fuzzy msgid "# requests dropped due to missing reverse route" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 #, fuzzy msgid "# migration stop messages sent" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, fuzzy, c-format msgid "Could not open `%s'.\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, fuzzy, c-format msgid "Error writing `%s'.\n" msgstr "Fehler beim Anlegen des Benutzers" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, fuzzy, c-format msgid "Failed to delete bogus block: %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, fuzzy, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 #, fuzzy msgid "not indexed" msgstr "Deindizierung schlug fehl." -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, fuzzy, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " "anyway.\n" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 msgid "# average retransmission delay (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 msgid "# delay heap timeout (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query plans executed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 msgid "# query messages sent to other peers" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 #, fuzzy msgid "# requests merged" msgstr "# dht Anfragen weitergeleitet" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 #, fuzzy msgid "# requests refreshed" msgstr "# dht Anfragen weitergeleitet" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 #, fuzzy msgid "# Pending requests created" msgstr "# dht Anfragen weitergeleitet" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 #, fuzzy msgid "# Pending requests active" msgstr "# Client Trace-Anfragen empfangen" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 #, fuzzy msgid "# replies received and matched" msgstr "# Bytes empfangen über TCP" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 #, fuzzy msgid "# irrelevant replies discarded" msgstr "# verworfener Nachrichten" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 msgid "# results found locally" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 #, fuzzy msgid "# storage requests dropped due to high load" msgstr "# Knotenankündigungen empfangen" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 #, fuzzy msgid "# Replies received from DHT" msgstr "# Bytes empfangen über HTTP" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 #, fuzzy msgid "# Replies received from CADET" msgstr "# Bytes empfangen über HTTP" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 #, fuzzy msgid "# GAP PUT messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, fuzzy, c-format msgid "Error unindexing: %s.\n" msgstr "" "\n" "Fehler beim Deindizieren der Datei: %s\n" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 #, fuzzy msgid "Unindexing done.\n" msgstr "Dateien deindizieren." -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, fuzzy, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 #, fuzzy msgid "Could not start unindex operation.\n" msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, fuzzy, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "Ungültige Parameter. Abbruch.\n" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, fuzzy, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, fuzzy, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, fuzzy, c-format msgid "Received malformed DNS request from %s\n" msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, fuzzy, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 #, fuzzy msgid "No DNS server specified!\n" msgstr "Keine Schlüsselwörter angegeben!\n" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 #, fuzzy msgid "Specify the type of the record to lookup" msgstr "Die Priorität des Inhalts angeben" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 #, fuzzy msgid "GNUnet GNS resolver tool" msgstr "GNUnet Netzwerk Topologie tracen." -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, fuzzy, c-format msgid "Failed to connect to identity service\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, fuzzy, c-format msgid "Unable to import certificate from `%s'\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 #, fuzzy msgid "Properly base32-encoded public key required" msgstr "# Bytes empfangen über TCP" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "Fehler beim Konvertieren von Parametern in URI!\n" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, fuzzy, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, fuzzy, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, fuzzy, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, fuzzy, c-format msgid "Unable to parse MX record `%s'\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, fuzzy, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, fuzzy, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, fuzzy, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, fuzzy, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, fuzzy, c-format msgid "Error accessing file `%s': %s\n" msgstr "" "\n" "Fehler beim Deindizieren der Datei: %s\n" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, fuzzy, c-format msgid "Error opening file `%s': %s\n" msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, fuzzy, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, fuzzy, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 #, fuzzy msgid "Failed to parse HELLO message: malformed\n" msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, fuzzy, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, fuzzy, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 msgid "advertise our hostlist to other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 msgid "enable learning about hostlist servers from other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 msgid "provide a hostlist server" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 #, fuzzy msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# Hellos per HTTP heruntergeladen" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 #, fuzzy msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# Hellos per HTTP heruntergeladen" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 #, fuzzy msgid "# active connections" msgstr "GNUnet Konfiguration" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 #, fuzzy msgid "bytes in hostlist" msgstr "# bytes in der Datenbank" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, fuzzy, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 msgid "hostlist requests refused (not HTTP GET)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 msgid "hostlist requests refused (upload data)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 msgid "hostlist requests refused (not ready)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 msgid "Received request for our hostlist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 #, fuzzy msgid "hostlist requests processed" msgstr "# dht Anfragen weitergeleitet" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 #, fuzzy msgid "# hostlist advertisements send" msgstr "# Bekanntmachungen von anderen übertragen" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 #, fuzzy msgid "Could not access PEERINFO service. Exiting.\n" msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, fuzzy, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "Ungültige Parameter. Abbruch.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, fuzzy, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, fuzzy, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, fuzzy, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, fuzzy, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, fuzzy, c-format msgid "Failed to create ego: %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, fuzzy, c-format msgid "Failed to set default ego: %s\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, fuzzy, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, fuzzy, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, fuzzy, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, fuzzy, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 #, fuzzy msgid "Ego is required\n" msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 #, fuzzy msgid "Requesting party key is required!\n" msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 #, fuzzy msgid "Identity Provider REST API initialized\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, fuzzy, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "Versuchen, Datei »%s« für MySQL-Konfiguration zu verwenden.\n" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, fuzzy, c-format msgid "Could not access file `%s': %s\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, fuzzy, c-format msgid "No records found for `%s'" msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, fuzzy, c-format msgid "You must specify which zone should be accessed\n" msgstr "Gibt an, welcher TRANSPORT getestet werden soll" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, fuzzy, c-format msgid "You must specify a name\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 #, fuzzy msgid "spezifies the public key of the zone to look in" msgstr "Die Priorität des Inhalts angeben" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet Konfiguration" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 #, fuzzy msgid "Error communicating with namecache service" msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 #, fuzzy msgid "flat plugin running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Unbekannte Operation `%s'\n" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, fuzzy, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "%s: Symbolwert `%s' ist ungültig für %s\n" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Ungültiger Parameter: `%s'\n" -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 msgid "set the desired nick name for the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 msgid "monitor changes in the namestore" msgstr "" -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 msgid "determine our name for the given PKEY" msgstr "" -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, fuzzy, c-format msgid "Unsupported form value `%s'\n" msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, fuzzy, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, fuzzy, c-format msgid "Failed to create page for `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, fuzzy, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 #, fuzzy msgid "Failed to start HTTP server\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 #, fuzzy msgid "Failed to connect to identity\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 #, fuzzy msgid "flat file database running\n" msgstr "Sqlite-Datenbank läuft\n" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 #, fuzzy msgid "Namestore REST API initialized\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 #, fuzzy msgid "Suggested configuration changes:\n" msgstr "" "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, fuzzy, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "# Freunde in Konfiguration" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 msgid "write configuration file (for autoconfiguration)" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 msgid "GNUnet NAT traversal autoconfiguration" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 #, fuzzy msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 #, fuzzy msgid "NAT test failed to start NAT library\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 #, fuzzy msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 msgid "Testing connection reversal with ICMP server.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, fuzzy, c-format msgid "Detected external IP `%s'\n" msgstr "Ungültiger RPC `%s' empfangen.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, c-format msgid "Detected internal network address `%s'.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 #, fuzzy msgid "upnpc not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 #, fuzzy msgid "`upnpc` command not found" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 #, fuzzy msgid "Failed to run `upnpc` command" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 msgid "`upnpc' command took too long, process killed" msgstr "" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 msgid "`external-ip' command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 #, fuzzy msgid "Failed to run `external-ip` command" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 #, fuzzy msgid "`external-ip' command output invalid" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 #, fuzzy msgid "Could not determine interface with internal/local network address" msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 msgid "No functioning gnunet-helper-nat-server installation found" msgstr "" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 msgid "No working gnunet-helper-nat-client installation found" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 #, fuzzy msgid "Connection reversal request failed\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, fuzzy, c-format msgid "Failed to start %s\n" msgstr "Fehler beim Starten der Collection.\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 #, fuzzy msgid "`external-ip' command not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 #, fuzzy msgid "`upnpc' command not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 msgid "Show network size estimates from NSE service." msgstr "" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 msgid "Measure quality and performance of the NSE service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, fuzzy, c-format msgid "Removing expired address of transport `%s'\n" msgstr "Verfügbare(r) Transport(e): %s\n" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" @@ -5665,990 +5665,994 @@ msgstr "" "Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. " "Die Datei wurde entfernt.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, fuzzy, c-format msgid "Scanning directory `%s'\n" msgstr "==> Verzeichnis `%s':\n" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, fuzzy, c-format msgid "Still no peers found in `%s'!\n" msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, fuzzy, c-format msgid "Cleaning up directory `%s'\n" msgstr "==> Verzeichnis `%s':\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 #, fuzzy msgid "Failed to receive response from `PEERINFO' service." msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, fuzzy, c-format msgid "%sPeer `%s'\n" msgstr "Ich bin Peer `%s'.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, fuzzy, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, fuzzy, c-format msgid "Failure: Received invalid %s\n" msgstr "Ungültiger RPC `%s' empfangen.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "Ich bin Knoten »%s«.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 msgid "list all known peers" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 #, fuzzy msgid "Print information about peers." msgstr "Informationen über andere GNUnet Knoten ausgeben." -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, fuzzy, c-format msgid "Starting transport plugins `%s'\n" msgstr "Teste Transport(e) %s\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, fuzzy, c-format msgid "Loading `%s' transport plugin\n" msgstr "Teste Transport(e) %s\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, fuzzy, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 msgid "Unexpected iteration response, this should not happen.\n" msgstr "" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 #, fuzzy msgid "Received a malformed response from service." msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, fuzzy, c-format msgid "Unable to create indices: %s.\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, fuzzy, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 #, fuzzy msgid "Failed to store membership information!\n" msgstr "Fehler beim Speichern der Konfiguration!" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 #, fuzzy msgid "Failed to test membership!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "Ungültiges Argument »%s«\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 #, fuzzy msgid "Failed to get fragment!\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 #, fuzzy msgid "Failed to get message!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 #, fuzzy msgid "Failed to get message fragment!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 #, fuzzy msgid "Failed to get master counters!\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 #, fuzzy msgid "Failed to end modifying state!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 #, fuzzy msgid "Failed to begin synchronizing state!\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 #, fuzzy msgid "Failed to end synchronizing state!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 #, fuzzy msgid "Failed to reset state!\n" msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 #, fuzzy msgid "Failed to get state variable!\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 #, fuzzy msgid "SQLite database running\n" msgstr "SQL Datenbank beschädigt, Ergebnis wird ignoriert.\n" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 msgid "Failed to pack DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 msgid "# DNS requests mapped to VPN" msgstr "" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 #, fuzzy msgid "# DNS replies intercepted" msgstr "# Bytes empfangen über TCP" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 #, fuzzy msgid "Failed to parse DNS request. Dropping.\n" msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 #, fuzzy msgid "# DNS requests dropped (timeout)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 #, fuzzy msgid "# DNS requests intercepted" msgstr "# dht Anfragen weitergeleitet" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 #, fuzzy msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 #, fuzzy msgid "# DNS requests dropped (malformed)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 #, fuzzy msgid "# DNS replies received" msgstr "# Bytes empfangen über TCP" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 msgid "# DNS replies dropped (too late?)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "" "Es konnte keine Verbindung mit dem %s-Dienst hergestellt werden. Abbruch\n" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 msgid "No configuration file given. Exiting\n" msgstr "Keine Konfigurationsdatei angegeben. Abbruch\n" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, c-format msgid "No files found in `%s'\n" msgstr "Keine Dateien in »%s« gefunden\n" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 msgid "Error loading search strings. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 msgid "name of the file for writing statistics" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 msgid "name of file with input strings" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 msgid "name of file with hosts' names" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 msgid "name of the table to write DFAs" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, c-format msgid "Regex `%s' is too long!\n" msgstr "" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, fuzzy, c-format msgid "Search string `%s' is too long!\n" msgstr "Dienst »%s« läuft nicht\n" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 #, fuzzy msgid "GNUnet REST server" msgstr "GNUnet Netzwerk Topologie tracen." -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, c-format msgid "Key `%s' is valid\n" msgstr "Schlüssel »%s« ist gültig\n" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, c-format msgid "Key `%s' has been revoked\n" msgstr "Schlüssel »%s« wurde widerrufen\n" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 msgid "Internal error\n" msgstr "Interner Fehler\n" -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 msgid "Revocation failed (!)\n" msgstr "Widerruf fehlgeschlagen (!)\n" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, fuzzy, c-format msgid "Ego `%s' not found.\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, c-format msgid "Public key `%s' malformed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 msgid "No filename to store revocation certificate given.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, fuzzy, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 #, fuzzy msgid "No action specified. Nothing to do.\n" msgstr "Keine Kommandos angegeben.\n" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 msgid "# unsupported revocations received via set union" msgstr "" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 #, fuzzy msgid "# revocation messages received via set union" msgstr "# verschlüsselter PING Nachrichten empfangen" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 #, fuzzy msgid "# revocation set unions failed" msgstr " Verbindung fehlgeschlagen\n" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 #, fuzzy msgid "# revocation set unions completed" msgstr "# Klartext PONG Nachrichten empfangen" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 #, fuzzy msgid "Could not open revocation database file!" msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n" -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +msgid "Measure quality and performance of the RPS service." +msgstr "" + +#: src/scalarproduct/gnunet-scalarproduct.c:215 #, fuzzy msgid "You must specify at least one message ID to check!\n" msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Verbindung fehlgeschlagen\n" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n" -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 #, fuzzy msgid "number of element in set A-B" msgstr "Anzahl an Durchläufen" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 #, fuzzy msgid "number of element in set B-A" msgstr "Anzahl an Durchläufen" -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 #, fuzzy msgid "--place missing or invalid.\n" msgstr "Ungültige Antwort auf `%s'.\n" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 #, fuzzy msgid "name or public key of ego" msgstr "Ungültiger Parameter: `%s'\n" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 msgid "wait for incoming messages" msgstr "" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 msgid "GNS name" msgstr "" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 msgid "method name" msgstr "" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "Anzahl an Durchläufen" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "" "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, fuzzy, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "Dateien aus dem GNUnet herunterladen." -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, fuzzy, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "Dateien aus dem GNUnet herunterladen." -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 #, fuzzy msgid "Failed to obtain statistics.\n" msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, fuzzy, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, c-format msgid "No subsystem or name given\n" msgstr "" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, fuzzy, c-format msgid "Failed to initialize watch routine\n" msgstr "`%s' Dienst konnte nicht initialisiert werden.\n" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, c-format msgid "Invalid argument `%s'\n" msgstr "Ungültiges Argument »%s«\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, c-format msgid "A port is required to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "Statistiken der GNUnet-Aktivitäten ausgeben." -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 msgid "Could not save some persistent statistics\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 #, fuzzy msgid "Need at least 2 arguments\n" msgstr "Sie müssen einen Empfänger angeben!\n" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, fuzzy, c-format msgid "Invalid topology: %s\n" msgstr "Ungültige Antwort auf `%s'.\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, fuzzy, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, fuzzy, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6672,83 +6676,83 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, c-format msgid "%s is stopped" msgstr "%s wurde gestoppt" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, c-format msgid "%s is starting" msgstr "%s startet" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "%s wird gestoppt" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, c-format msgid "%s is starting already" msgstr "%s ist bereits gestartet" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "%s wird bereits gestoppt" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "%s ist bereits gestartet" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "%s ist bereits gestoppt" -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, c-format msgid "%s service is not known to ARM" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, c-format msgid "%s service failed to start" msgstr "%s-Dienst konnte nicht gestartet werden" -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, c-format msgid "%.s Unknown result code." msgstr "" @@ -6765,176 +6769,176 @@ msgstr "" msgid "Spawning process `%s'\n" msgstr "Ungültige Antwort auf `%s'.\n" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, fuzzy, c-format msgid "Hosts file %s not found\n" msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, c-format msgid "Hosts file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 #, fuzzy msgid "Cannot start the master controller" msgstr "GNUnet testbed Controller starten." -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, c-format msgid "Topology file %s not found\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, c-format msgid "Topology file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, c-format msgid "Topology file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, fuzzy, c-format msgid "Failed to read peer index from toology file: %s" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, fuzzy, c-format msgid "Failed to read peer index from topology file: %s" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 #, fuzzy msgid "create unique configuration files" msgstr "" "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" msgstr "" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 msgid "configuration template" msgstr "Konfigurationsvorlage" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" @@ -6942,1394 +6946,1394 @@ msgstr "" msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, c-format msgid "Key number %u does not exist\n" msgstr "" -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " "precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, fuzzy, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, fuzzy, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, fuzzy, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, fuzzy, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, c-format msgid "Failed to start `%s': %s\n" msgstr "»%s« konnte nicht gestartet werden: %s\n" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, c-format msgid "Failed to load configuration from %s\n" msgstr "Konfiguration konnte nicht aus %s geladen werden\n" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# geschlossener Verbindungen (HANGUP gesendet)" -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 #, fuzzy msgid "# HELLO messages gossipped" msgstr "# ausgehender Nachrichten verworfen" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 msgid "# friends connected" msgstr "# verbundener Freunde" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr " gconfig\tGTK Konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 msgid "# friends in configuration" msgstr "# Freunde in Konfiguration" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 msgid "# HELLO messages received" msgstr "# HELLO-Meldungen empfangen" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 msgid "# messages dropped due to slow client" msgstr "" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 msgid "# bytes payload discarded due to not connected peer" msgstr "" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 msgid "# bytes total received" msgstr "# Bytes insgesamt empfangen" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 msgid "# bytes payload received" msgstr "# Bytes Nutzdaten empfangen" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, fuzzy, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 #, fuzzy msgid "# session creation failed" msgstr " Verbindung fehlgeschlagen\n" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 msgid "# DISCONNECT messages sent" msgstr "# DISCONNECT-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 #, fuzzy msgid "# bytes in message queue for other peers" msgstr "# Bytes ausgehender Nachrichten verworfen" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# Bytes des Typs %d übertragen" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 #, fuzzy msgid "# bandwidth quota violations by other peers" msgstr "Verfolgt die Bandbreitennutzung von gnunetd" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 #, fuzzy msgid "# SYN messages sent" msgstr "# DISCONNECT-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 #, fuzzy msgid "# SYN messages received" msgstr "# PING Nachrichten erstellt" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# SESSION_ACK-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 #, fuzzy msgid "# ACK messages received" msgstr "# CONNECT_ACK-Meldungen empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 #, fuzzy msgid "# unexpected ACK messages" msgstr "# verschlüsselter PONG Nachrichten gesendet" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# gap Anfragen verworfen: Kollision in RT" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 #, fuzzy msgid "# QUOTA messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 msgid "# disconnected from peer upon explicit request" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, fuzzy, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, fuzzy, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 msgid "# Addresses in validation map" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 #, fuzzy msgid "# validations running" msgstr "Sqlite-Datenbank läuft\n" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 #, fuzzy msgid "# address records discarded (timeout)" msgstr "# verworfener Adressdatensätze" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 #, fuzzy msgid "# address records discarded (blacklist)" msgstr "# verworfener Adressdatensätze" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 msgid "# PINGs for address validation sent" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 #, fuzzy msgid "# PING message for different peer received" msgstr "# PING Nachrichten erstellt" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " "having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 msgid "# validations succeeded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, fuzzy, c-format msgid "Failed to connect to `%s'\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, fuzzy, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 #, fuzzy msgid "Failed to list connections, timeout occured\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, c-format msgid "Transmitting %u bytes\n" msgstr "" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " "blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "%24s: %-17s %4s (%u Verbindungen insgesamt)\n" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 msgid "Connected to" msgstr "Verbunden mit" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 msgid "Disconnected from" msgstr "" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, fuzzy, c-format msgid "Received %u bytes\n" msgstr "Dateien aus dem GNUnet herunterladen." -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, c-format msgid "Peer `%s': %s %s\n" msgstr "Knoten »%s«: %s %s\n" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 #, fuzzy msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " "%s, %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 #, fuzzy msgid "Failed to connect to transport service for disconnection\n" msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 msgid "Failed to connect to transport service\n" msgstr "Verbindung zum Transportdienst konnte nicht hergestellt werden\n" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 #, fuzzy msgid "print information for all peers (instead of only connected peers)" msgstr "Informationen über verbundene Knoten ausgeben." -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 msgid "disconnect from a peer" msgstr "Verbindung zu einem Knoten trennen" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 msgid "provide information about all current connections (once)" msgstr "" -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "" -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 msgid "do not resolve hostnames" msgstr "Keine Rechnernamen auflösen" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 msgid "monitor plugin sessions" msgstr "" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 msgid "Direct access to transport service." msgstr "Direkter Zugriff auf den Transportdienst" -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 #, fuzzy msgid "receive data from peer" msgstr "# Bytes des Typs %d empfangen" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 msgid "iterations" msgstr "" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "Anzahl an Durchläufen" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 msgid "message size to use" msgstr "" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, fuzzy, c-format msgid "Shutting down plugin `%s'\n" msgstr "Collection `%s' begonnen.\n" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, fuzzy, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "GNUnet wurde erfolgreich heruntergefahren.\n" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, fuzzy, c-format msgid "Maximum number of requests is %u\n" msgstr "Maximale Anzahl der Verbindungen ist %u\n" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " "size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 msgid "Require valid port number for service in configuration!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" "Weder IPv4 noch IPv6 sind aktiviert! Bearbeiten Sie die Konfiguration\n" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 msgid "Port is required! Fix in configuration\n" msgstr "Port ist erforderlich! Bearbeiten Sie die Konfiguration\n" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, c-format msgid "Using port %u\n" msgstr "Port %u wird verwendet\n" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, c-format msgid "Using external hostname `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, fuzzy, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "Teste Transport(e) %s\n" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, c-format msgid "Maximum number of connections is %u\n" msgstr "Maximale Anzahl der Verbindungen ist %u\n" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 msgid "Unable to compile URL regex\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, fuzzy, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "" "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n" -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 #, fuzzy msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n" -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "SMTP-Filterzeichenkette zu lang, wurde auf »%s« abgeschnitten\n" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "SMTP: »%s« fehlgeschlagen: %s.\n" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "" "Keine E-Mail-Adresse angegeben, SMTP-Übertragung kann nicht gestartet " "werden.\n" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 msgid "# bytes received via SMTP" msgstr "# Bytes empfangen über SMTP" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 msgid "# bytes sent via SMTP" msgstr "# Bytes gesendet über SMTP" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 msgid "# bytes dropped by SMTP (outgoing)" msgstr "# Bytes verworfen von SMTP (ausgehend)" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 msgid "# TCP sessions active" msgstr "# aktive TCP-Sitzungen" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 msgid "# bytes currently in TCP buffers" msgstr "# Bytes derzeit in TCP-Puffern" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 msgid "# bytes discarded by TCP (disconnect)" msgstr "# Bytes verworfen von TCP (unterbrochen)" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 msgid "# bytes discarded by TCP (timeout)" msgstr "# Bytes verworfen von TCP (Zeitüberschreitung)" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 msgid "# bytes transmitted via TCP" msgstr "# Bytes über TCP übertragen" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "# Bytes empfangen über TCP" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr " Verbindung fehlgeschlagen\n" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 #, fuzzy msgid "# TCP server connect events" msgstr "# verbundener Knoten" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 msgid "Failed to start service.\n" msgstr "Fehler beim Starten des Dienstes.\n" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "TCP-Transportdienst wartet auf Port %llu\n" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 #, fuzzy msgid "# Multicast HELLO beacons received via UDP" msgstr "# Bytes empfangen über TCP" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, fuzzy, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 msgid "Failed to open UDP sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, c-format msgid "Cannot create path to `%s'\n" msgstr "Pfad zu »%s« kann nicht erstellt werden\n" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, fuzzy, c-format msgid "Cannot bind to `%s'\n" msgstr "Pfad zu »%s« kann nicht erstellt werden\n" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 #, fuzzy msgid "Failed to open UNIX listen socket\n" msgstr "Datei wurde als `%s' gespeichert.\n" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 msgid "# ACKs sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 #, fuzzy msgid "# Messages defragmented" msgstr "# defragmentierter Nachrichten" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 #, fuzzy msgid "# Sessions allocated" msgstr "# Sitzungsschlüssel akzeptiert" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 #, fuzzy msgid "# message fragments sent" msgstr "# fragmentierter Nachrichten" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 #, fuzzy msgid "# messages pending (with fragmentation)" msgstr "# defragmentierter Nachrichten" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 #, fuzzy msgid "# MAC endpoints allocated" msgstr "# Sitzungsschlüssel akzeptiert" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 #, fuzzy msgid "# ACKs received" msgstr "# Bytes empfangen über TCP" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 msgid "# DATA messages discarded due to CRC32 error" msgstr "" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 #, fuzzy msgid "# HELLO beacons sent" msgstr "# Bytes gesendet über TCP" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 #, fuzzy msgid "# DATA messages received" msgstr "# verschlüsselter PONG Nachrichten empfangen" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 #, fuzzy msgid "# DATA messages processed" msgstr "# PING Nachrichten erstellt" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 #, fuzzy msgid "# sessions allocated" msgstr "# Sitzungsschlüssel akzeptiert" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, fuzzy, c-format msgid "XT transport listening on port %llu\n" msgstr "TCP-Transportdienst wartet auf Port %llu\n" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 #, fuzzy msgid "XT transport not listening on any port (client only)\n" msgstr "TCP-Transportdienst wartet auf Port %llu\n" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, fuzzy, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "TCP-Transportdienst wartet auf Port %llu\n" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "# aktive TCP-Sitzungen" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " "network configuration\n" msgstr "" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 msgid "" "XU could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "UDP-Sockets können nicht geöffnet werden\n" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, c-format msgid "Access denied to `%s'\n" msgstr "Zugriff verweigert auf »%s«\n" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "" -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, fuzzy, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, fuzzy, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, fuzzy, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, c-format msgid "Unknown address family %d\n" msgstr "" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, fuzzy, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, c-format msgid "Service `%s' runs at %s\n" msgstr "Dienst »%s« läuft auf %s\n" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, fuzzy, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "GNUnet Konfiguration" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Fehler beim Anlegen des Benutzers" -#: src/util/bio.c:191 +#: src/util/bio.c:186 msgid "End of file" msgstr "Dateiende" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "DEBUG" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "WARNUNG" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "FEHLER" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "Unbekannte Adresse" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "Ungültige Adresse" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis " "angeben, in dem FS Daten gespeichert werden.\n" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8337,114 +8341,114 @@ msgstr "" "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis " "angeben, in dem FS Daten gespeichert werden.\n" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, fuzzy, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "" "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, fuzzy, c-format msgid "Expected `%s' to be a directory!\n" msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n" @@ -8514,11 +8518,11 @@ msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Unbekannte Operation `%s'\n" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8526,119 +8530,119 @@ msgstr "" "Argumente, die für lange Optionen zwingend sind, sind auch für kurze " "Optionen zwingend.\n" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "" "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, fuzzy, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Konfiguration konnte nicht aus %s geladen werden\n" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 #, fuzzy msgid "print available configuration sections" msgstr "GNUnet Konfiguration" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 msgid "Manipulate GNUnet configuration files" msgstr "GNUnet-Konfigurationsdateien bearbeiten" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, c-format msgid "Failed to open `%s': %s\n" msgstr "»%s« kann nicht geöffnet werden: %s\n" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, c-format msgid "Generating %u keys like %s, please wait" msgstr "" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, c-format msgid "" "\n" @@ -8647,7 +8651,7 @@ msgstr "" "\n" "Schreiben in »%s« nicht möglich: %s\n" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, c-format msgid "" "\n" @@ -8656,213 +8660,213 @@ msgstr "" "\n" "Abgeschlossen!\n" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "Kommando `%s' wurde nicht gefunden!\n" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 msgid "Manipulate GNUnet private ECC key files" msgstr "" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, fuzzy, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "Das Parsen des Hello von `%s' schlug fehl.\n" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 msgid "Manipulate GNUnet proof of work files" msgstr "" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, fuzzy, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "IP des Hosts »%s« konnte nicht ermittelt werden: %s\n" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "URL beginnt nicht mit »%s«\n" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, c-format msgid "Error reading from `%s': %s\n" msgstr "Fehler beim Lesen von »%s«: %s\n" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, fuzzy, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, fuzzy, c-format msgid "Error writing to `%s': %s\n" msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "Initialisierung des Plugin-Mechanismus fehlgeschlagen: %s!\n" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, fuzzy, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "" "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, fuzzy, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 #, fuzzy msgid "Could not determine plugin installation path.\n" msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -8871,360 +8875,360 @@ msgstr "" "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine " "positive Zahl angeben.\n" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 #, fuzzy msgid "Resolver not configured correctly.\n" msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "`%s' konnte nicht aufgelöst werden: %s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVICE_client_continue' after %s\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, fuzzy, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "Aufruf von `%s' gibt %d zurück.\n" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "b" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "µs" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "0 ms" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "ms" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "s" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "m" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "h" -#: src/util/strings.c:739 +#: src/util/strings.c:734 msgid "day" msgstr "Tag" -#: src/util/strings.c:741 +#: src/util/strings.c:736 msgid "days" msgstr "Tage" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "IPv6-Adresse beginnt nicht mit »[«\n" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Ungültige Antwort auf `%s' von `%s'\n" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "Port außerhalb des Bereichs\n" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, c-format msgid "Malformed port policy `%s'\n" msgstr "" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Ungültiges Format für IP: »%s«\n" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)." -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Ungültiges Format für IP: `%s'\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Falsches Format `%s' für Netzmaske: %s\n" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Falsches Format `%s' für Netzwerk: %s\n" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 msgid "# Active channels" msgstr "# aktive Kanäle" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 #, fuzzy msgid "# Messages dropped in cadet queue (overflow)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 #, fuzzy msgid "# ICMP packets received from cadet" msgstr "# Bytes empfangen über TCP" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 #, fuzzy msgid "# UDP packets received from cadet" msgstr "# Bytes empfangen über TCP" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 #, fuzzy msgid "# TCP packets received from cadet" msgstr "# Bytes empfangen über TCP" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 #, fuzzy msgid "# Cadet channels created" msgstr "# PING Nachrichten erstellt" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 #, fuzzy msgid "# Packets dropped (channel not yet online)" msgstr "# Bytes verworfen von TCP (ausgehend)" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 #, fuzzy msgid "# Packets received from TUN interface" msgstr "" "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, " "schlug fehl." -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 #, fuzzy msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 msgid "# Active destinations" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 msgid "Must specify valid IPv6 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 msgid "Must specify valid IPv4 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 msgid "Error creating tunnel\n" msgstr "Fehler beim Anlegen des Tunnels\n" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "Option »%s« ergibt keinen Sinn mit der Option »%s«.\n" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "Option »%s« oder »%s« ergibt keinen Sinn mit der Option »%s«.\n" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "»%s« ist kein gültiger Knoten-Bezeichner.\n" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, c-format msgid "`%s' is not a valid IP address.\n" msgstr "»%s« ist keine gültige IP-Adresse.\n" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "Ziel-IP des Tunnels" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "Name des Dienstes, auf den zugegriffen werden soll" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 msgid "service is offered via TCP" msgstr "Dienst wird über TCP angeboten" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 msgid "service is offered via UDP" msgstr "Dienst wird über UDP angeboten" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "Tunnel über VPN einrichten." -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n" -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, fuzzy, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, fuzzy, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n" diff --git a/po/es.po b/po/es.po index 1fdd8f54d9..82ffaf10ce 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.9.5a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2013-02-23 17:50+0100\n" "Last-Translator: Miguel Ángel Arruga Vivas \n" "Language-Team: Spanish \n" @@ -17,62 +17,62 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, c-format msgid "Failed to remove configuration file %s\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 #, fuzzy msgid "Message was sent successfully" msgstr "El almacén de nombres añadió el registro satisfactoriamente" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 #, fuzzy msgid "We disconnected from ARM before we could send a request" msgstr "# desconexiones del par debido a una petición explícita" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 #, fuzzy msgid "Unknown request status" msgstr "Usuario desconocido «%s»\n" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "# elementos almacenados" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 #, fuzzy msgid "is starting" msgstr "'%s' comenzando\n" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 #, fuzzy msgid "is stopping" msgstr "# elementos almacenados" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 #, fuzzy msgid "is starting already" msgstr "'%s' comenzando\n" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 #, fuzzy msgid "is stopping already" msgstr "'%s' comenzando\n" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 #, fuzzy msgid "is started already" msgstr "'%s' comenzando\n" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 #, fuzzy msgid "is stopped already" msgstr "'%s' comenzando\n" @@ -80,161 +80,161 @@ msgstr "'%s' comenzando\n" # Miguel: ¿Debería cambiar las siglas de ARM? # De momento las he mantenido con una traducción en # otro mensaje. -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 #, fuzzy msgid "service is not known to ARM" msgstr "El servicio «%s» es desconocido para el ARM.\n" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "El proceso del servicio no devolvió un estado\n" # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»? -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 #, fuzzy msgid "service cannot be manipulated because ARM is shutting down" msgstr "Petición ignorada porque el ARM se está apagando.\n" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "Código de respuesta del ARM desconocido.\n" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "Error fatal al inicializar la API del ARM.\n" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, fuzzy, c-format msgid "Failed to start the ARM service: %s\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, fuzzy, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, fuzzy, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "Fichero almacenado en '%s'.\n" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, fuzzy, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, fuzzy, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, fuzzy, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "Se produjo un fallo al escribir «%s»: %s\n" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, fuzzy, c-format msgid "Failed to request a list of services: %s\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 msgid "Error communicating with ARM. ARM not running?\n" msgstr "Error al comunicar con el ARM. ¿Está el ARM ejecutándose?\n" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 msgid "Running services:\n" msgstr "Servicios en ejecución:\n" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, fuzzy, c-format msgid "Starting %s...\n" msgstr "Iniciando descarga «%s».\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, fuzzy, c-format msgid "Unknown status %u for service %s.\n" msgstr "Solicitando incio del servicio «%s».\n" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 msgid "stop all GNUnet services" msgstr "detiene todos los servicios de GNUnet" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "inicia un servicio particular" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "detiene un servicio particular" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 msgid "start all GNUnet default services" msgstr "inicia todos los servicios predeterminados de GNUnet" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 msgid "stop and start all GNUnet default services" msgstr "detiene e inicia todos los servicios predeterminados de GNUnet" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "borrar el directorio y el fichero de configuración al salir" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "no imprime mensajes de estado" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 msgid "list currently running services" msgstr "lista de servicios actualmente en ejecución" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "no permite heredar la salida estándar a «gnunet-service-arm»" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "no permite heredar la salida de error estándar a «gnunet-service-arm»" # Miguel: ARM se mantiene en todo el texto, aquí está la traducción. -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" @@ -242,42 +242,42 @@ msgstr "" "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un " "fallo al crear un «socket» IPv6: %s\n" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" "¡Se requiere un número de puerto válido para el servicio «%s» en la " "configuración!\n" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, c-format msgid "Using `%s' instead\n" msgstr "Usando «%s» en su defecto\n" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " @@ -286,50 +286,50 @@ msgstr "" "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio " "«%s», no se pudo crear un «socket» UNIX: %s\n" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero " "uno es necesario\n" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, c-format msgid "Failed to resolve `%s': %s\n" msgstr "Se produjo un fallo al resolver «%s»: %s\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "No se encontró la dirección %s para «%s».\n" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, c-format msgid "Failed to start service `%s'\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, c-format msgid "Starting service `%s'\n" msgstr "Iniciando el servicio «%s»\n" # Miguel: ¿Alguna idea para "socket"? -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" @@ -340,53 +340,53 @@ msgstr "" # no es exactamente lo mismo que el texto en inglés, pero # es fiel a la realidad puesto que el ARM reinicia # las conexiones cuando se caen. -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, c-format msgid "Preparing to stop `%s'\n" msgstr "Preparando para parar «%s»\n" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, c-format msgid "Restarting service `%s'.\n" msgstr "Reiniciando el servicio «%s»\n" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "salida" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "señal" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 msgid "unknown" msgstr "desconocido" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, c-format msgid "Service `%s' took %s to terminate\n" msgstr "El servicio «%s» tardó %s en finalizar\n" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, fuzzy, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, fuzzy, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "Iniciando apagado bajo petición del cliente.\n" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " @@ -395,7 +395,7 @@ msgstr "" "No se pudieron cargar las cuotas para la red «%s»: «%s», asignando el ancho " "de banda predeterminado %llu\n" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " @@ -404,7 +404,7 @@ msgstr "" "No hay configurada una cuota de salida para la red «%s», asignando el ancho " "de banda predeterminado %llu\n" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " @@ -413,30 +413,30 @@ msgstr "" "No hay configurada una cuota de salida para la red «%s», asignando el ancho " "de banda predeterminado %llu\n" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 #, fuzzy msgid "solver to use" msgstr "valor a establecer" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 #, fuzzy msgid "print logging" msgstr "Iniciando descarga «%s».\n" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, fuzzy, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " @@ -446,12 +446,12 @@ msgstr "" "de banda predeterminado %llu\n" # Miguel: "Inbound" lo he traducido como entrada en todo el texto. -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, fuzzy, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "La cuota de entrada configurada para la red «%s» es %llu\n" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, fuzzy, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" @@ -459,42 +459,42 @@ msgstr "" "No hay configurada una cuota de salida para la red «%s», asignando el ancho " "de banda predeterminado %llu\n" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, fuzzy, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "¡No se puede inicializar el resolvedor!\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, fuzzy, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, fuzzy, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, fuzzy, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " @@ -503,7 +503,7 @@ msgstr "" "No hay configurada una cuota de salida para la red «%s», asignando el ancho " "de banda predeterminado %llu\n" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, fuzzy, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " @@ -513,44 +513,44 @@ msgstr "" "ancho de banda predeterminado (%llu)\n" # Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, fuzzy, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "La cuota de salida configurada para la red «%s» es %llu\n" # Miguel: "Outbound" lo he traducido como salida en todo el texto. -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, fuzzy, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "La cuota de salida configurada para la red «%s» es %llu\n" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, fuzzy, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Fallo al conectar a gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 msgid "Stop logging\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, fuzzy, c-format msgid "Start logging `%s'\n" msgstr "Iniciando descarga «%s».\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " @@ -561,19 +561,19 @@ msgstr "" # Son difíciles de no calcar, puesto que no conozco como expresar # el concepto de obtener una dirección a partir de un nombre # en castellano sin la palabra resolver. :-) -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "%u resoluciones de dirección pasaron de plazo\n" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, fuzzy, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "El ATS devolvió resultados para %u direcciones\n" # Miguel: "Plugin" está traducido como módulo en todo el texto # puesto que no hay módulos fijos en contraposición a cargables. -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" @@ -582,532 +582,532 @@ msgstr "" "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u " "Bytes/s, %s\n" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, fuzzy, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "Eliminando dirección de transporte «%s»\n" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, fuzzy, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 msgid "Cannot connect to ATS service, exiting...\n" msgstr "No se puede conectar al servicio ATS, saliendo...\n" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 msgid "Cannot issue request to ATS service, exiting...\n" msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 #, fuzzy msgid "No preference type given!\n" msgstr "establece las preferencias para el par dado" -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 #, fuzzy msgid "No peer given!\n" msgstr "No se han proporcionado opciones\n" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 #, fuzzy msgid "Valid type required\n" msgstr "Tipo requerido\n" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "obtiene una lista de direcciones activas usadas actualmente" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "obtiene una lista de todas las direcciones activas" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "conectar a un par" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 msgid "do not resolve IP addresses to hostnames" msgstr "no resuelve direcciones IP a nombres de máquina" # Miguel: Aquí he dejado monitorización porque esto es # del servicio de traducción de direcciones. -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "modo de monitorización" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 msgid "set preference for the given peer" msgstr "establece las preferencias para el par dado" -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "imprime todas las cuotas configuradas" # Miguel: He preferido extender id a identificación por claridad. -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "identificación del par" # Miguel: No me he encontrado esta opción todavía, # pero creo que son palabras clave. -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de " "banda)" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "valor de preferencia" # Miguel: ¿Algo menos forzado que "salida prolija"? -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "salida prolija (incluye las propiedades de direcciones del ATS)" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 msgid "Print information about ATS state" msgstr "Imprime información acerca del estado del ATS" -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 #, fuzzy msgid "public auction outcome" msgstr "_Opciones" -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 msgid "help text" msgstr "texto de ayuda" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, fuzzy, c-format msgid "Invalid peer ID `%s'\n" msgstr "URI no válida: «%s»\n" -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, fuzzy, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "Formato de tiempo no válido «%s»\n" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, fuzzy, c-format msgid "Invalid target `%s'\n" msgstr "Parámetro no válido «%s»\n" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 #, fuzzy msgid "No action requested\n" msgstr "Colección detenida.\n" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 #, fuzzy msgid "Provide information about a particular connection" msgstr "proveer información acerca de un túnel en particular" -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 #, fuzzy msgid "Provide information about a patricular peer" msgstr "proveer información acerca de un túnel en particular" -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 #, fuzzy msgid "Provide information about all peers" msgstr "proveer información acerca de un túnel en particular" -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 #, fuzzy msgid "Provide information about a particular tunnel" msgstr "proveer información acerca de un túnel en particular" -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 #, fuzzy msgid "Provide information about all tunnels" msgstr "proveer información acerca de un túnel en particular" -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 msgid "number of peers in consensus" msgstr "número de pares en consenso" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 #, fuzzy msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "¿cuántos pares reciben un valor?" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 msgid "number of values" msgstr "número de valores" # Miguel: "timeout" lo he traducido como plazo, pero no se # si hay alguna palabra que lo describa mejor. -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 msgid "consensus timeout" msgstr "plazo de consenso" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 #, fuzzy msgid "write statistics to file" msgstr "imprime el valor de las estadísticas" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 #, fuzzy msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" "El cliente se desconectó del servicio principal, tratando de reconectar.\n" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "'%s' falló en %s: %d con error: '%s'.\n" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Se produjo un fallo al resolver «%s»: %s\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, c-format msgid "Unknown command `%s'\n" msgstr "Comando desconocido «%s»\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "Detectada dirección de la red interna «%s».\n" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Par «%s»\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 #, fuzzy msgid "Use `/status' to print status information" msgstr "ser prolijo (imprime información de progreso)" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Use «/quit» para finalizar «gnunet-chat»" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "Use «/help comando» para obtener ayuda sobre un comando específico" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "El pseudónimo '%s' fue borrado.\n" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Debes especificar un fichero a inspeccionar.\n" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1115,15 +1115,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1133,779 +1133,779 @@ msgstr "" msgid "pa_stream_write() failed: %s\n" msgstr "stadísticas (%s) falló: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 #, fuzzy msgid "Connection established.\n" msgstr "Colección detenida.\n" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, fuzzy, c-format msgid "pa_stream_new() failed: %s\n" msgstr "stadísticas (%s) falló: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, fuzzy, c-format msgid "Connection failure: %s\n" msgstr "'%s' falló en %s: %d con error: '%s'.\n" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 #, fuzzy msgid "Wrong Spec\n" msgstr "Servicio principal (CORE) erróneo\n" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 #, fuzzy msgid "pa_mainloop_new() failed.\n" msgstr "La operación ha fallado.\n" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 #, fuzzy msgid "pa_context_new() failed.\n" msgstr "La operación ha fallado.\n" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, fuzzy, c-format msgid "pa_context_connect() failed: %s\n" msgstr "# reconexiones rápidas fallidas" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 #, fuzzy msgid "pa_mainloop_run() failed.\n" msgstr "La operación ha fallado.\n" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, fuzzy, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "# reconexiones rápidas fallidas" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, fuzzy, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "stadísticas (%s) falló: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 #, fuzzy msgid "Stream successfully created.\n" msgstr "Conectado satisfactoriamente a «%s»\n" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, fuzzy, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "stadísticas (%s) falló: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, fuzzy, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "Conectado a %s.\n" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, fuzzy, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "No se pudo borrar el registro: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 #, fuzzy msgid "ogg_stream_init() failed.\n" msgstr "stadísticas (%s) falló: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, fuzzy, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "" "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n" -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, fuzzy, c-format msgid "Could not open line, port %s already in use!\n" msgstr "¡No se pudo conectar al servicio %s!\n" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 #, fuzzy msgid "Could not start record audio helper\n" msgstr "No se pudo empezar la operación de desindexado.\n" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, fuzzy, c-format msgid "PHONE version %u not supported\n" msgstr "Protocolo %u no soportado, omitiendo\n" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, fuzzy, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "No se pudo procesar el registro PKEY «%s»\n" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 #, fuzzy msgid "Could not start playback audio helper.\n" msgstr "No se pudo empezar a publicar.\n" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 #, fuzzy msgid "fresh connection" msgstr "# amigos conectados" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 #, fuzzy msgid "key received" msgstr "# claves de sesión recibidas" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 #, fuzzy msgid "connection established" msgstr "Colección detenida.\n" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "Desconectado de" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 #, fuzzy msgid "Connection to CORE service lost (reconnecting)" msgstr "" "El cliente se desconectó del servicio principal, tratando de reconectar.\n" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, fuzzy, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "%24s: %-17s %4s (%u conexiones en total)\n" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, c-format msgid "Invalid command line argument `%s'\n" msgstr "Parámetro no válido «%s» en la línea de comandos\n" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 #, fuzzy msgid "Failed to connect to CORE service!\n" msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n" # Miguel: ¿Quizá continuamente fuese mejor? -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 msgid "provide information about all current connections (continuously)" msgstr "" "provee información sobre todas las conexiones actuales (de forma continua)" -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 msgid "Print information about connected peers." msgstr "Imprime información sobre los pares conectados." -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 msgid "# send requests dropped (disconnected)" msgstr "# peticiones de envío descartadas (desconectado)" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, c-format msgid "# bytes of messages of type %u received" msgstr "# bytes de mensajes del tipo %u recibidos" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 msgid "# messages discarded (session disconnected)" msgstr "# mensajes descartados (sesión desconectada)" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, fuzzy, c-format msgid "# messages of type %u discarded (client busy)" msgstr "# bytes de mensajes del tipo %u recibidos" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" "Al servicio principal le falta la configuración de la clave de máquina " "(HOSTKEY). Saliendo.\n" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, fuzzy, c-format msgid "Core service of `%s' ready.\n" msgstr "El servicio principal de «%4s» está listo.\n" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "# bytes cifrados" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "# bytes descifrados" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "# intercambio de claves iniciados" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "# intercambio de claves parados" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 #, fuzzy msgid "# PING messages transmitted" msgstr "# mensajes PONG creados" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 #, fuzzy msgid "# duplicate ephemeral keys ignored" msgstr "# mapas de tipos recibidos" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 #, fuzzy msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "# mensajes «SET_KEY» descifrados" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 #, fuzzy msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# mensajes «SET_KEY» descifrados" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 #, fuzzy msgid "# valid ephemeral keys received" msgstr "# mapas de tipos recibidos" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 msgid "# PING messages received" msgstr "# mensajes PING recibidos" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 msgid "# PONG messages created" msgstr "# mensajes PONG creados" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 msgid "# sessions terminated by timeout" msgstr "# sesiones terminadas por plazo de expiración" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 msgid "# keepalive messages sent" msgstr "# mensajes «keepalive» enviados" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 msgid "# PONG messages received" msgstr "# mensajes PONG recibidos" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# mensajes PONG recibidos" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 msgid "# PONG messages decrypted" msgstr "# mensajes PONG descifrados" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 msgid "# session keys confirmed via PONG" msgstr "# claves de sesión confirmadas vía PONG" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# bytes recibidos vía TCP" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 msgid "# rekey operations confirmed via PONG" msgstr "# operaciones de cambio de clave confirmadas vía PONG" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 #, fuzzy msgid "# DATA message dropped (out of order)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 #, fuzzy msgid "# sessions terminated by key expiration" msgstr "# sesiones terminadas por plazo de expiración" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 msgid "# bytes dropped (duplicates)" msgstr "# bytes omitidos (duplicados)" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 msgid "# bytes dropped (out of sequence)" msgstr "# bytes omitidos (fuera de secuencia)" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 msgid "# bytes dropped (ancient message)" msgstr "# bytes omitidos (mensaje antiguo)" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 msgid "# bytes of payload decrypted" msgstr "# bytes de «payload» descifrados" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 msgid "# peers connected" msgstr "# pares conectados" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 msgid "# type map refreshes sent" msgstr "# envíos de refrescos del mapa de tipos" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 #, fuzzy msgid "# outdated typemap confirmations received" msgstr "Se produjo un fallo al encolar una confirmación de recepción\n" -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 #, fuzzy msgid "# valid typemap confirmations received" msgstr "Se produjo un fallo al encolar una confirmación de recepción\n" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 msgid "# type maps received" msgstr "# mapas de tipos recibidos" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "# actualizaciones de mi mapa de tipos" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, fuzzy, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, fuzzy, c-format msgid "Ego `%s' not known to identity service\n" msgstr "'%s': servicio desconocido: %s\n" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, fuzzy, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "El bloque del tipo %u está mal formado\n" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, fuzzy, c-format msgid "Issuer public key not well-formed\n" msgstr "El bloque del tipo %u está mal formado\n" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, fuzzy, c-format msgid "ego required\n" msgstr "Tipo requerido\n" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, fuzzy, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "El bloque del tipo %u está mal formado\n" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, fuzzy, c-format msgid "Issuer ego required\n" msgstr "Tipo requerido\n" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 #, fuzzy msgid "The public key of the subject to lookup the credential for" msgstr "Especificar el tipo del registro a buscar" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 #, fuzzy msgid "The public key of the authority to verify the credential against" msgstr "Especificar el tipo del registro a buscar" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 #, fuzzy msgid "The ego to use" msgstr "tamaño del mensaje" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 #, fuzzy msgid "GNUnet credential resolver tool" msgstr "Herramienta de acceso GNUnet GNS" -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, c-format msgid "Failed to connect to GNS\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, c-format msgid "Failed to connect to namestore\n" msgstr "Se produjo un fallo al conectar con el almacén de nombres\n" -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 #, fuzzy msgid "GNS REST API initialized\n" msgstr "Conexión fallida\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 msgid "# bytes stored" msgstr "# bytes almacenados" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 msgid "# items stored" msgstr "# elementos almacenados" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "Cargando el módulo de la cache de datos «%s»\n" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" "Se produjo un fallo al cargar el módulo de la cache de datos para «%s»\n" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 msgid "# requests received" msgstr "# peticiones recibidas" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "# peticiones filtradas por el «bloomfilter»" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 #, fuzzy msgid "# requests for random value received" msgstr "# peticiones recibidas" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 #, fuzzy msgid "# proximity search requests received" msgstr "# búsquedas de clientes recibidas" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 msgid "Heap datacache running\n" msgstr "Caché de datos de montículo (heap) ejecutándose\n" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "«%s» falló en %s: %d con el error: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "Desconectado de" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "# reconexiones al almacén de datos (DATASTORE)" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "# desbordamientos de la cola" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 msgid "# queue entries created" msgstr "# entradas creadas en la cola" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 msgid "# status messages received" msgstr "# mensajes de estado recibidos" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 msgid "# Results received" msgstr "# Resultados recibidos" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 msgid "# datastore connections (re)created" msgstr "# conexiones a almacenes de datos (re)creadas" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 msgid "# PUT requests executed" msgstr "# peticiones «PUT» ejecutadas" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 msgid "# RESERVE requests executed" msgstr "# peticiones «RESERVE» ejecutadas" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "# Peticiones «RELEASE RESERVE» ejecutadas" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 msgid "# REMOVE requests executed" msgstr "# peticiones «REMOVE» ejecutadas" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "# peticiones «GET REPLICATION» ejecutadas" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 msgid "# GET requests executed" msgstr "# peticiones «GET» ejecutadas" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 #, fuzzy msgid "Error queueing datastore GET operation\n" msgstr "Error leyendo «%s»: %s" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, fuzzy, c-format msgid "Failed to store item: %s, aborting\n" msgstr "Se produjo un fallo al abrir «%s» para escritura" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, fuzzy, c-format msgid "Inserted % records\n" msgstr "establece registros de clase A" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 #, fuzzy msgid "Error queueing datastore PUT operation\n" msgstr "Error leyendo «%s»: %s" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 #, fuzzy msgid "Failed connecting to the datastore.\n" msgstr "Se produjo un fallo al conectar con el almacén de datos." -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, fuzzy, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 #, fuzzy msgid "Dump all records from the datastore" msgstr "Buscar el registro para el nombre dado" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 #, fuzzy msgid "Insert records into the datastore" msgstr "# bytes mandados al almacén de datos" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 #, fuzzy msgid "Manipulate GNUnet datastore" msgstr "Manipular ficheros de configuración de GNUnet" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 msgid "# bytes expired" msgstr "# bytes expirados" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "# bytes purgados (baja prioridad)" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "# resultados encontrados" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, fuzzy, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " @@ -1914,7 +1914,7 @@ msgstr "" "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la " "petición «%s» de %llu bytes\n" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " @@ -1923,7 +1923,7 @@ msgstr "" "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu " "bytes)\n" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" @@ -1931,62 +1931,62 @@ msgstr "" "Espacio insuficiente para satisfacer la petición y la cantidad pedida es " "mayor que el tamaño de la caché" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "Espacio insuficiente para satisfacer la petición" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "# reservado" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "No se pudo encontrar una reserva coincidente" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" "Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 msgid "# GET requests received" msgstr "# peticiones «GET» recibidas" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 #, fuzzy msgid "# GET KEY requests received" msgstr "# peticiones «GET» recibidas" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 msgid "# requests filtered by bloomfilter" msgstr "# peticiones filtradas por el «bloomfilter»" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 msgid "# GET REPLICATION requests received" msgstr "# peticiones «GET REPLICATION» recibidas" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 msgid "# GET ZERO ANONYMITY requests received" msgstr "# peticiones «GET ZERO ANONYMITY» recibidas" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 msgid "Content not found" msgstr "Contenido no encontrado" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "# bytes eliminados (petición explícita)" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 msgid "# REMOVE requests received" msgstr "# peticiones «REMOVE» recibidas" # Miguel: ¿Cómo traducir «payload»? ¿Código cargado? -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, fuzzy, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" @@ -1994,136 +1994,136 @@ msgstr "" "El «payload» del almacén de datos es impreciso (%lld < %lld). Intentando " "repararlo.\n" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "Cargando el módulo del almacén de datos «%s»\n" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "" "Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "Construcción de «bloomfilter» completa.\n" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "Reconstruyendo «bloomfilter». Por favor, tenga paciencia.\n" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "# bytes usados en el almacén de ficheros compartidos «%s»" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "# cuota" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "# tamaño de la caché" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" "No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "" "Se produjo un fallo al borrar el fichero de configuración defectuoso de " "«bloomfilter» «%s»:\n" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 msgid "Failed to initialize bloomfilter.\n" msgstr "Se produjo un fallo al inicializar «bloomfilter».\n" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 msgid "Heap database running\n" msgstr "Base de datos de montículo ejecutándose\n" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 #, fuzzy msgid "Data too large" msgstr "número de valores" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "«%s» para «%s» falló en %s: %d con error: %s\n" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "Base de datos Mysql ejecutándose\n" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 msgid "Failed to drop table from database.\n" msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "Base de datos Postgres ejecutándose\n" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "«%s» falló en %s:%u con el error: %s" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Imposible inicializar SQLite: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" # to should be too, i think -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" "la versión de sqlite es muy antigua para determinar el tamaño, se asume " "cero\n" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " @@ -2132,18 +2132,18 @@ msgstr "" "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu " "páginas de %llu bytes de tamaño)\n" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 msgid "Sqlite database running\n" msgstr "Base de datos sqlite ejecutándose\n" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "Base de datos de plantilla ejecutándose\n" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" @@ -2152,661 +2152,661 @@ msgstr "" "Resultado %d, tipo %d:\n" "%.*s\n" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, fuzzy, c-format msgid "Result %d, type %d:\n" msgstr "" "Resultado %d, tipo %d:\n" "%.*s\n" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "¡Se debe proveer una clave para el «GET» DHT!\n" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 msgid "Failed to connect to DHT service!\n" msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "Enviando un «GET» DHT con clave" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "la clave de búsqueda" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "cuantas peticiones paralelas (réplicas) crear" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "el tipo de datos a buscar" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "opción para usar el demultiplexado de la DHT siempre" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados." -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "cuanto tiempo debe ejecutarse el comando de monitorización" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "ser prolijo (imprime información de progreso)" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "Imprime todos los paquetes que pasan por la DHT." -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, fuzzy, c-format msgid "Exiting as the number of peers is %u\n" msgstr "El número máximo de conexiones es %u\n" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 msgid "number of peers to start" msgstr "número de pares para empezar" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" "nombre del fichero con la información de acceso usada para la batería de " "pruebas" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 #, fuzzy msgid "Measure quality and performance of the DHT service." msgstr "Medir la calidad y rendimiento del servicio NSE." -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "¡No se pudo conectar al servicio %s!\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "los datos a insertar bajo la clave" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "cuantas réplicas crear" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 #, fuzzy msgid "use DHT's record route option" msgstr "opción para usar el demultiplexado de la DHT siempre" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "el tipo de datos a insertar" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo " "«KEY»." -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 msgid "# GET requests from clients injected" msgstr "# peticiones «GET» inyectadas de clientes" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 msgid "# PUT requests received from clients" msgstr "# peticiones «PUT» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 msgid "# GET requests received from clients" msgstr "# peticiones «GET» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 msgid "# GET STOP requests received from clients" msgstr "# peticiones «GET STOP» recibidas de clientes" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del " "cliente (CLIENT)" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 msgid "# RESULTS queued for clients" msgstr "# Resultados (RESULTS) encolados para clientes" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "# Elementos (ITEMS) almacenados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 msgid "# GET requests given to datacache" msgstr "# Peticiones «GET» realizadas a la caché de datos" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 msgid "# HELLOs obtained from peerinfo" msgstr "# «HELLO» obtenidos de «peerinfo»" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 msgid "# FIND PEER messages initiated" msgstr "# mensajes «FIND PEER» iniciados" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 #, fuzzy msgid "# requests TTL-dropped" msgstr "# peticiones unidas" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 msgid "# Peer selection failed" msgstr "# Selecciones de pares fallidas" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 msgid "# PUT requests routed" msgstr "# Peticiones «PUT» encaminadas" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 msgid "# PUT messages queued for transmission" msgstr "# mensajes «PUT» encolados para transmisión" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 msgid "# P2P messages dropped due to full queue" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 msgid "# GET requests routed" msgstr "# Peticiones «GET» encaminadas" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 msgid "# GET messages queued for transmission" msgstr "# Mensajes «GET» encolados para transmisión" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 msgid "# RESULT messages queued for transmission" msgstr "# Mensajes «RESULT» encolados para transmisión" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 msgid "# P2P PUT requests received" msgstr "# Peticiones «PUT» P2P recibidas" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 #, fuzzy msgid "# P2P PUT bytes received" msgstr "# Peticiones «PUT» P2P recibidas" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 msgid "# P2P GET requests received" msgstr "# Peticiones «GET» P2P recibidas" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 #, fuzzy msgid "# P2P GET bytes received" msgstr "# Peticiones «GET» P2P recibidas" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 msgid "# P2P FIND PEER requests processed" msgstr "# Peticiones «FIND PEER» P2P procesadas" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 msgid "# P2P GET requests ONLY routed" msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 msgid "# P2P RESULTS received" msgstr "# Resultados (RESULTS) P2P recibidos" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 #, fuzzy msgid "# P2P RESULT bytes received" msgstr "# Resultados (RESULTS) P2P recibidos" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 msgid "# Network size estimates received" msgstr "# Estimaciones del tamaño de red recibidas" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" "# Respuestas (REPLIES) no soportadas encontradas en la tabla de " "encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "# Entradas eliminadas de la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "# Entradas añadidas a la tabla de encaminamiento" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 msgid "# DHT requests combined" msgstr "# Peticiones a la DHT combinadas" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, c-format msgid "Block not of type %u\n" msgstr "El bloque no es del tipo %u\n" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "Discrepancias de tamaños para el bloque\n" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "El bloque del tipo %u está mal formado\n" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: " "%s\n" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS " "IDNA: %s\n" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, c-format msgid "Could not bind to any port: %s\n" msgstr "No se pudo asociar con ningún puerto: %s\n" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, c-format msgid "Sent DNS request to %s\n" msgstr "Petición DNS enviada a %s\n" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "sólo monitorizar consultas DNS" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "Monitorizar consultas DNS." -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "establece registros de clase A" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "establece registros de clase AAAA" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "Cambiar las respuestas DNS apuntando a cualquier otro lado." -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "# Peticiones DNS contestadas vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 msgid "# DNS requests received via TUN interface" msgstr "# Peticiones DNS recibidas vía interfaz TUN" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 msgid "need a valid IPv4 or IPv6 address\n" msgstr "se necesita una dirección IPv4 o IPv6 válida\n" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, fuzzy, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 #, fuzzy msgid "Print information about DV state" msgstr "Imprime información acerca del estado del ATS" -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 msgid "# TCP packets sent via TUN" msgstr "# Paquetes TCP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 msgid "# ICMP packets sent via TUN" msgstr "# Paquetes ICMP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 msgid "# UDP packets sent via TUN" msgstr "# Paquetes UDP enviados vía TUN" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 #, fuzzy msgid "# Bytes received from CADET" msgstr "# Bytes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# Peticiones de salida IP por UDP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# Peticiones de servicio UDP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 msgid "# TCP DATA requests dropped (no session)" msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# Peticiones de datos TCP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# Peticiones de servicio ICMP recibidas vía mesh" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# Túneles interiores MESH creados" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "Hay registros de servicios duplicados para «%s:%u»\n" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# Bytes transmitidos vía túneles MESH" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "# Paquetes ICMP omitidos (tipo no permitido)" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 msgid "# Packets received from TUN" msgstr "# Paquetes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 msgid "# Bytes received from TUN" msgstr "# Bytes recibidos de TUN" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "Opciones de paquete IPv4 recibidas. Ignoradas.\n" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" "Recibido paquete IPv4 con cabecera «next» no soportada %u. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" "Recibido paquete IPv6 con cabecera «next» no soportada %d. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "Recibido paquete de protocolo desconocido %u. Ignorado.\n" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Las opción «%s» o «%s» es necesaria.\n" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio " "«%s»!\n" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" "¡No se encontraron direcciones IP para el nombre de máquina «%s» del " "servicio «%s»!\n" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" @@ -2814,7 +2814,7 @@ msgstr "" "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque " "estén habilitadas en la configuración\n" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" @@ -2822,7 +2822,7 @@ msgstr "" "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque " "estén habilitadas en la configuración\n" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" @@ -2830,7 +2830,7 @@ msgstr "" "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz " "TUN, se usará ENABLE_IPv4=YES\n" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" @@ -2838,156 +2838,156 @@ msgstr "" "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz " "TUN, se usará ENABLE_IPv6=YES\n" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, fuzzy, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "Ningún servicio útil habilitado. Saliendo.\n" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "# reconocimientos enviados por framentos" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 msgid "# fragments received" msgstr "# fragmentos recibidos" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 msgid "# duplicate fragments received" msgstr "# fragmentos duplicados recibidos" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "# mensajes defragmentados" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 msgid "# fragments transmitted" msgstr "# fragmentos transmitidos" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 msgid "# fragments retransmitted" msgstr "# fragmentos retransmitidos" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 msgid "# fragments wrap arounds" msgstr "# encajes de fragmentos" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "# mensajes fragmentados" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "# tamaño total de los mensajes fragmentados" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 msgid "# fragment acknowledgements received" msgstr "# reconocimientos de fragmentos recibidos" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "# bits eliminados de reconocimientos de fragmentos" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 msgid "# fragmentation transmissions completed" msgstr "# transmisiones de fragmentos completadas" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, c-format msgid "Could not open file `%s': %s" msgstr "No se pudo abrir el fichero «%s»: %s" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, c-format msgid "Could not read file `%s': %s" msgstr "No se pudo leer el fichero «%s»: %s" # Short read?? -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "¡Lectura corta leyendo del fichero «%s»!" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: " "%s\n" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el " "fichero «%s»\n" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda " "en pausa\n" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" "Se produjo un fallo mientras se retomaba de la operación de descarga «%s»: " "%s\n" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "No hay coincidencia con «MAGIC». Esto no es un directorio GNUnet.\n" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" @@ -2995,12 +2995,12 @@ msgstr "" "Las descargas recursivas de directorios mayores de 4GB no están soportadas " "en sistemas de 32 bits\n" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" "Directorio demasiado grande para el espacio de direccionamiento del sistema\n" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" @@ -3008,19 +3008,19 @@ msgstr "" "Se produjo un fallo al crear el directorio para la descarga recursiva de " "«%s»\n" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, c-format msgid "Failed to open file `%s' for writing" msgstr "Se produjo un fallo al abrir «%s» para escritura" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" "Se produjo un fallo al crear el directorio para la descarga recursiva de " "«%s»\n" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " @@ -3029,37 +3029,37 @@ msgstr "" "Error interno o URI de descarga defectuosa (se esperaban %u bytes a " "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "error interno descifrando el contenido" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "" "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento " "%llu del fichero «%s»: %s" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 msgid "internal error decoding tree" msgstr "error interno decodificando árbol" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 msgid "Invalid URI" msgstr "URI no válida" -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " @@ -3070,304 +3070,304 @@ msgstr "" # Miguel: "Failed to receive" también aquí está traducido como # "no se obtuvo respuesta" por claridad. -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "" "No se obtuvo respuesta del servicio de información de pares (PEERINFO)." -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "Se produjo un fallo al conectar con el servicio «%s».\n" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, c-format msgid "Failed to write `%s': %s\n" msgstr "Se produjo un fallo al escribir «%s»: %s\n" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, fuzzy, c-format msgid "Failed to read `%s': %s\n" msgstr "Se produjo un fallo al escribir «%s»: %s\n" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 msgid "Failed to connect to datastore." msgstr "Se produjo un fallo al conectar con el almacén de datos." -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, c-format msgid "Publishing failed: %s" msgstr "Publicación fallida: %s" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "No se pudo indexar el fichero «%s»: %s. Se intentará insertar.\n" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 #, fuzzy msgid "error on index-start request to `fs' service" msgstr "" "expiración del plazo en la petición de inicio de indexado (index-start) al " "servicio «fs»" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "se produjo un fallo al calcular el hash" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 msgid "filename too long" msgstr "nombre de fichero demasiado largo" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 msgid "could not connect to `fs' service" msgstr "no se pudo conectar con el servicio «fs»" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "" "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, c-format msgid "Recursive upload failed at `%s': %s" msgstr "La subida recursiva falló en «%s»: %s" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, c-format msgid "Recursive upload failed: %s" msgstr "Subida recursiva fallida: %s" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 msgid "needs to be an actual file" msgstr "tiene que ser un fichero de verdad" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr "# «PUT» en el almacén de datos fallidos" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 msgid "Could not connect to datastore." msgstr "No se pudo conectar con el almacén de datos." -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 msgid "Internal error." msgstr "Error interno." -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Se produjo un fallo al procesar la URI: %s\n" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" "Se obtuvo un resultado con un tipo desconocido de bloque «%d», ignorándolo" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "Se produjo un fallo al buscar la posición dada en el fichero" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 msgid "Failed to read file" msgstr "No se pudo leer el fichero" # Miguel: ¿Conectar y conexión? -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 #, fuzzy msgid "Error communicating with `fs' service." msgstr "Error al comunicar con el servicio ARM.\n" -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 msgid "Failed to connect to FS service for unindexing." msgstr "" "Se produjo un fallo al conectar con el servicio «FS» para el desindexado." -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 msgid "Failed to get KSKs from directory scan." msgstr "Se produjo un fallo al obtener KSKs de la búsqueda de directorios." -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, c-format msgid "Internal error scanning `%s'.\n" msgstr "Error interno escaneando «%s».\n" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, fuzzy, c-format msgid "Failed to remove UBlock: %s\n" msgstr "Se produjo un fallo al eliminar el KBlock: %s\n" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 msgid "Failed to connect to `datastore' service." msgstr "" "Se produjo un fallo al conectar con el servicio de almacenamiento de datos " "(datastore)." -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 msgid "Failed to open file for unindexing." msgstr "Se produjo un fallo al abrir el fichero para desindexado." -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 msgid "Failed to compute hash of file." msgstr "Se produjo un fallo al calcular el hash del fichero." # Cadena erronea, corregida en SVN. -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "'%' debe ser seguido por un número hexadecimal" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 #, fuzzy msgid "Malformed SKS URI (wrong syntax)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 #, fuzzy msgid "Malformed CHK URI (wrong syntax)" msgstr "URI CHK mal formada" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 #, fuzzy msgid "LOC URI malformed (wrong syntax)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 #, fuzzy msgid "LOC URI malformed (no CHK)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 #, fuzzy msgid "LOC URI malformed (missing LOC)" msgstr "URI SKS mal formada" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 #, fuzzy msgid "LOC URI malformed (wrong syntax for public key)" msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 #, fuzzy msgid "LOC URI malformed (could not decode public key)" msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 #, fuzzy msgid "LOC URI malformed (could not find signature)" msgstr "URI SKS mal formada (no se pudo encontrar la firma)" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 #, fuzzy msgid "LOC URI malformed (wrong syntax for signature)" msgstr "URI SKS mal formada (no se pudo encontrar la firma)" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 #, fuzzy msgid "LOC URI malformed (could not decode signature)" msgstr "URI SKS mal formada (no se pudo decodificar la firma)" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 #, fuzzy msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 #, fuzzy msgid "LOC URI malformed (could not parse expiration time)" msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 #, fuzzy msgid "LOC URI malformed (signature failed validation)" msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "Parámetro no válido «%s»\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "Tipo de URI no reconocido" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "¡Ninguna palabra clave especificada!\n" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "¡Número de comillas dobles no balanceado!\n" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, c-format msgid "Failed to load state: %s\n" msgstr "Se produjo un fallo al cargar el estado: %s\n" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, c-format msgid "Failed to save state to file %s\n" msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "Publicación de «%s» finalizada\n" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, c-format msgid "Publishing `%s'\n" msgstr "Publicando «%s»\n" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, c-format msgid "Failed to run `%s'\n" msgstr "Se produjo un fallo al ejecutar «%s»\n" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" @@ -3375,78 +3375,78 @@ msgstr "" "Debes especificar uno y solo un nombre de directorio para publicación " "automática.\n" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "establece el nivel LEVEL deseado de anonimato del emisor" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" "deshabilitar añadir tiempo de creación a los metadatos del fichero subido" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "no usar libextractor para añadir palabras clave o metadatos" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "especificar la prioridad del contenido" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "establece el nivel LEVEL deseado de replicación" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 msgid "Automatically publish files from a directory on GNUnet" msgstr "Publicar automáticamente ficheros de un directorio en GNUnet" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "Demonio para medir el rendimiento de usar compartición de archivos." -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "\t\n" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, c-format msgid "Directory `%s' meta data:\n" msgstr "Metadatos del directorio «%s»:\n" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, c-format msgid "Directory `%s' contents:\n" msgstr "Contenidos del directorio «%s»:\n" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 msgid "You must specify a filename to inspect.\n" msgstr "Debes especificar un fichero a inspeccionar.\n" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, c-format msgid "Failed to read directory `%s'\n" msgstr "Se produjo un fallo al leer el directorio «%s»\n" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "«%s» no es un directorio GNUnet\n" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 msgid "Display contents of a GNUnet directory" msgstr "Muestra los contenidos de un directorio GNUnet" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, c-format msgid "Starting download `%s'.\n" msgstr "Iniciando descarga «%s».\n" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 msgid "" msgstr "" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " @@ -3455,74 +3455,74 @@ msgstr "" "Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en " "descargarse\n" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, c-format msgid "Error downloading: %s.\n" msgstr "Error descargando: %s.\n" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Finalizada descarga «%s» (%s/s).\n" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, c-format msgid "Unexpected status: %d\n" msgstr "Estado inesperado: %d\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 msgid "You need to specify a URI argument.\n" msgstr "Tiene que especificar una URI como parámetro.\n" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, c-format msgid "Failed to parse URI: %s\n" msgstr "Se produjo un fallo al procesar la URI: %s\n" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "Sólo URI «CHK» o «LOC» soportadas.\n" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "El nombre de fichero de destino debe ser especificado.\n" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "No se pudo inicializar el subsistema «%s».\n" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 msgid "set the desired LEVEL of receiver-anonymity" msgstr "establece el nivel LEVEL deseado de anonimato del receptor" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C=" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "únicamente buscar en el par local (no buscar en la red P2P)" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 msgid "set the maximum number of parallel downloads that is allowed" msgstr "establece el número máximo de descargas paralelas permitido" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "establece el número máximo de peticiones de bloque paralelas permitido" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "descarga un directorio de GNUnet recursivamente" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" @@ -3530,135 +3530,135 @@ msgstr "" "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/" "chk/...)" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "imprimir una lista de todos los ficheros indexados" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 msgid "Special file-sharing operations" msgstr "Operaciones especiales de compartición de ficheros" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "ejecuta el experimento con «COUNT» pares" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" "especifica el nombre de un fichero con las máquinas (HOSTS) que la batería " "de pruebas debería usar" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "termina el experimento automáticamente despues de «DELAY»" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" "ejecuta una batería de pruebas para medir el rendimiento de la compartición " "de ficheros" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, c-format msgid "Error publishing: %s.\n" msgstr "Error publicando: %s.\n" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "Publicación «%s» finalizada.\n" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, c-format msgid "URI is `%s'.\n" msgstr "La URI es «%s».\n" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, fuzzy, c-format msgid "Namespace URI is `%s'.\n" msgstr "La URI es «%s».\n" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 #, fuzzy msgid "Starting cleanup after abort\n" msgstr "Limpieza completada\n" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 #, fuzzy msgid "Cleanup after abort completed.\n" msgstr "Limpieza completada\n" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 #, fuzzy msgid "Cleanup after abort failed.\n" msgstr "Limpieza completada\n" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "Metadatos para el fichero «%s» (%s)\n" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "Palabras clave para el fichero «%s» (%s)\n" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 msgid "Could not publish\n" msgstr "No se pudo publicar\n" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 msgid "Could not start publishing.\n" msgstr "No se pudo empezar a publicar.\n" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, c-format msgid "Scanning directory `%s'.\n" msgstr "Escaneando directorio «%s».\n" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, c-format msgid "Scanning file `%s'.\n" msgstr "Escaneando fichero «%s».\n" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 msgid "Preprocessing complete.\n" msgstr "Preprocesado completo.\n" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "Extracción de metadatos del fichero «%s» completa.\n" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "La extracción de metadatos ha finalizado.\n" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 msgid "Internal error scanning directory.\n" msgstr "Error interno escaneando directorio.\n" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, fuzzy, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "Espacio de nombres «%s» desconocido.\n" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, c-format msgid "Failed to access `%s': %s\n" msgstr "Se produjo un fallo al acceder «%s»: %s\n" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" @@ -3666,33 +3666,33 @@ msgstr "" "Se produjo un fallo al iniciar el meta-escáner de directorios. ¿Está " "«gnunet-helper-publish-fs» instalado?\n" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "¡No se pueden extraer metadatos de una URI!\n" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "No se puede especificar una URI y un nombre de fichero.\n" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3700,7 +3700,7 @@ msgstr "" "imprimir una lista de las palabras clave extraídas que podrían ser usadas, " "pero sin realizar la subida" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3708,11 +3708,11 @@ msgstr "" "añadir una palabra clave adicional para el fichero del nivel más alto o el " "directorio (esta opción puede ser especificada varias veces)" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3720,7 +3720,7 @@ msgstr "" "no indexar, hacer inserciones totales (almacena el fichero entero de forma " "cifrada en la base de datos de GNUnet)" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3728,13 +3728,13 @@ msgstr "" "especificar la ID de una versión actualizada para ser publicada en el futuro " "(para inserciones en el espacio de nombres únicamente)" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el " "espacio)" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" @@ -3742,14 +3742,14 @@ msgstr "" "únicamente simular el proceso pero no publicar nada realmente (útil para " "calcular URI)" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "establece la ID de esta versión de la publicación (para inserciones en el " "espacio únicamente)" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" @@ -3757,237 +3757,237 @@ msgstr "" "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir " "claves con el fichero con la URI respectiva)" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "Publicar un fichero o un directorio en GNUnet" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, c-format msgid "Error searching: %s.\n" msgstr "Error buscando: %s.\n" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 msgid "Could not create keyword URI from arguments.\n" msgstr "No se pudo crear URI de palabra clave a partir de los parámetros.\n" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 msgid "Could not start searching.\n" msgstr "No se pudo empezar a buscar.\n" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "escribir resultados de búsqueda al fichero que empiecen por «PREFIX»" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "terminar búsqueda automáticamente después de «DELAY»" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "terminar búsqueda después de «VALUE» resultados encontrados" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 msgid "Search GNUnet for files that were published on GNUnet" msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 msgid "# client searches active" msgstr "# búsquedas de clientes activas" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 msgid "# replies received for local clients" msgstr "# respuestas recibidas de clientes locales" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "# latencia media de P2P en ejecución (ms)" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 msgid "# Loopback routes suppressed" msgstr "# Rutas en bucle local eliminadas" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 msgid "# client searches received" msgstr "# búsquedas de clientes recibidas" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" "# búsquedas de clientes actualizadas (contenido unido visto en la lista)" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, fuzzy, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" "Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 #, fuzzy msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" "Al servicio principal le falta la configuración de la clave de máquina " "(HOSTKEY). Saliendo.\n" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Se produjo un fallo al conectar con el servicio «%s».\n" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 #, fuzzy msgid "# replies received via cadet" msgstr "# respuestas recibidas vía «stream»" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 #, fuzzy msgid "# replies received via cadet dropped" msgstr "# respuestas recibidas omitidas vía «stream»" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 #, fuzzy msgid "# queries received via CADET not answered" msgstr "# consultas recibidas vía «stream»" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 #, fuzzy msgid "# Blocks transferred via cadet" msgstr "# Bloques transferidos vía «stream»" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 #, fuzzy msgid "# queries received via cadet" msgstr "# consultas recibidas vía «stream»" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 #, fuzzy msgid "# cadet client connections rejected" msgstr "# conexiones de clientes «stream» rechazadas" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr "# conexiones «stream» activas" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 msgid "# migration stop messages received" msgstr "# mensajes de detención de migración recibidos" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "Migración de contenido al par «%s» bloqueada durante %s\n" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "# busquedas P2P activas" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "# retardos artificiales introducidos (ms)" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 msgid "# replies dropped due to type mismatch" msgstr "# respuestas omitidas debido a incompatibilidad de tipos" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 msgid "# replies received for other peers" msgstr "# respuestas recibidas de otros pares" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "# búsquedas P2P destruidas debido a respuesta definitiva" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 msgid "# requests done for free (low load)" msgstr "# peticiones realizadas gratuitamente (baja carga)" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 msgid "# request dropped, priority insufficient" msgstr "# peticiones omitidas, prioridad insuficiente" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 msgid "# requests done for a price (normal load)" msgstr "# peticiones realizadas por un precio (carga normal)" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 msgid "# requests dropped due to higher-TTL request" msgstr "# peticiones omitidas debido a una petición de mayor TTL" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "# peticiones «GET» recibidas (de otros pares)" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 msgid "# requests dropped due to missing reverse route" msgstr "# peticiones omitidas debido a falta de ruta inversa" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# Mensajes P2P omitidos debido a saturación de la cola" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 msgid "# requests dropped due TTL underflow" msgstr "# peticiones omitidas debido a expiración del TTL" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 msgid "# P2P query messages received and processed" msgstr "# mensajes de búsqueda P2P recibidos y procesados" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 msgid "# migration stop messages sent" msgstr "# mensajes de detención de migración enviados" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, c-format msgid "Could not open `%s'.\n" msgstr "No se pudo abrir «%s».\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, c-format msgid "Error writing `%s'.\n" msgstr "Error escribiendo «%s».\n" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, c-format msgid "Failed to delete bogus block: %s\n" msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "# bloques de índice eliminados: fichero original inaccesible" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "" "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: " "%s\n" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 msgid "not indexed" msgstr "no indexado" -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " @@ -3996,668 +3996,668 @@ msgstr "" "La petición de indexado recibida para el fichero «%s» ya está indexada como " "«%s». Se permite de todos modos.\n" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 msgid "# average retransmission delay (ms)" msgstr "# retardo de retransmisión medio (ms)" # ??? -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 #, fuzzy msgid "# delay heap timeout (ms)" msgstr "# plazo del retraso del montículo" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query plans executed" msgstr "# planes de búsqueda ejecutados" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 msgid "# query messages sent to other peers" msgstr "# mensajes de búsqueda enviados a otros pares" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 msgid "# requests merged" msgstr "# peticiones unidas" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 msgid "# requests refreshed" msgstr "# peticiones refrescadas" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "# entradas de planes de búsqueda" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 msgid "# Pending requests created" msgstr "# Peticiones pendientes creadas" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 msgid "# Pending requests active" msgstr "# Peticiones pendientes activas" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 msgid "# replies received and matched" msgstr "# respuestas recibidas y asociadas" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "# respuestas duplicadas descartadas (bloomfilter)" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 msgid "# irrelevant replies discarded" msgstr "# respuestas irrelevantes descartadas" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 msgid "# results found locally" msgstr "# resultados hallados localmente" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "# «PUT» en el almacén de datos fallidos" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 msgid "# storage requests dropped due to high load" msgstr "# peticiones de almacenamiento omitidas debido a alta carga" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 msgid "# Replies received from DHT" msgstr "# Respuestas recibidas de la DHT" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 #, fuzzy msgid "# Replies received from CADET" msgstr "# Respuestas recibidas de la DHT" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "¡La búsqueda en el almacén de datos toma %s!\n" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "¡La búsqueda en bajo demanda toma %s!\n" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "# peticiones asociadas de bloques bajo demanda" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "# búsquedas satisfactorias de bloques bajo demanda" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "# búsquedas fallidas de bloques bajo demanda" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" "# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "# Búsquedas en el almacén de datos iniciadas" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 msgid "# GAP PUT messages received" msgstr "# Mensajes «GAP PUT» recibidos" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "se requiere tiempo, publicación de contenido deshabilitada" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "Desindexado en %llu/%llu (quedan %s)\n" -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, c-format msgid "Error unindexing: %s.\n" msgstr "Error desindexando: %s.\n" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 msgid "Unindexing done.\n" msgstr "Desindexado finalizado.\n" -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "Se debe especificar uno y solo un fichero para desindexar.\n" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 msgid "Could not start unindex operation.\n" msgstr "No se pudo empezar la operación de desindexado.\n" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»." -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, fuzzy, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "Número de puerto %llu no válido. Saliendo.\n" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, fuzzy, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "Servicio de listas de máquinas arranca en %s:%llu\n" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, fuzzy, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "" "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "No se puede procesar la petición DNS de %s\n" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "Recibida petición DNS mal formada de %s\n" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Recibida petición DNS no soportada de %s\n" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 #, fuzzy msgid "No DNS server specified!\n" msgstr "¡Ninguna palabra clave especificada!\n" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "IP del resolvedor recursivo DNS a usar (requerido)" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 #, fuzzy msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: " "53" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 #, fuzzy msgid "how long to wait for an answer" msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "Buscar el registro para el nombre dado" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 msgid "Specify the type of the record to lookup" msgstr "Especificar el tipo del registro a buscar" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "Sin salida innecesaria" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 #, fuzzy msgid "GNUnet GNS resolver tool" msgstr "Herramienta de acceso GNUnet GNS" -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, fuzzy, c-format msgid "Failed to connect to identity service\n" msgstr "Fallo al conectar a gnunetd.\n" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "%s falló en %s:%d: «%s».\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "¡No se puede inicializar el resolvedor!\n" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Tipo no soportado «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "No se pudo importar la clave privada del fichero «%s»\n" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, fuzzy, c-format msgid "Unable to import certificate from `%s'\n" msgstr "No se pudo importar el certificado %s\n" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Tipo de bloque %u no soportado\n" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "escuchar en el puerto especificado (predeterminado: 7777)" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "fichero pem para usar como autoridad de certificación (CA)" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "Proxy GNUnet GNS" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 #, fuzzy msgid "Properly base32-encoded public key required" msgstr "Tipo requerido\n" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 msgid "Could not connect to DHT!\n" msgstr "¡No se pudo conectar a la DHT!\n" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, fuzzy, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "Módulo «%s» no encontrado\n" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Se produjo un fallo al mandar la petición DNS a %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "No se pudo procesar el registro PKEY «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "No se pudo procesar el registro SOA «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "No se pudo procesar la cadena de registro VPN «%s»\n" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "No se pudo procesar la dirección IPv4 «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, fuzzy, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, fuzzy, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, fuzzy, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "No se pudo procesar el registro SOA «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, fuzzy, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, fuzzy, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, c-format msgid "Unable to parse MX record `%s'\n" msgstr "No se pudo procesar el registro MX «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, fuzzy, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, fuzzy, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "No se pudo procesar el registro SOA «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, fuzzy, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "" "Se produjo un fallo al escribir el directorio con los resultados de búsqueda " "de «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "No se pudo procesar dirección IPv4 «%s»\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "Llamar con el nombre del fichero «HELLO» para modificar.\n" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, c-format msgid "Error accessing file `%s': %s\n" msgstr "Error accediendo al fichero «%s»: %s\n" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "El fichero «%s» es demasiado grande para ser un «HELLO»\n" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "El fichero «%s» es demasiado pequeño para ser un «HELLO»\n" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, c-format msgid "Error opening file `%s': %s\n" msgstr "Error abriendo fichero «%s»: %s\n" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "No se encontró un «HELLO» bien formado en el fichero «%s»\n" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "" "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de " "expiración\n" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "" "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no " "válido\n" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 msgid "Failed to parse HELLO message: malformed\n" msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "" "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de " "transporte\n" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, fuzzy, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "Módulo «%s» no encontrado\n" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "El módulo «%s» no soporta URI todavía\n" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "" "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" @@ -4665,11 +4665,11 @@ msgstr "" "Ninguna de las funciones para el demonio de listas de máquinas fue " "activada. ¡No tengo razón para ejecutarme!\n" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 msgid "advertise our hostlist to other peers" msgstr "anuncia nuestra lista de máquinas a otros pares" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" @@ -4677,49 +4677,49 @@ msgstr "" "realizar inicialización usando listas de máquinas (es altamente recomendable " "que siempre se use esta opción)" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 msgid "enable learning about hostlist servers from other peers" msgstr "" "habilitar aprendizaje de servidores de listas de máquinas de otros pares" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 msgid "provide a hostlist server" msgstr "proveer un servidor de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "Servidor y cliente GNUnet de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 msgid "# bytes downloaded from hostlist servers" msgstr "# bytes descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "# URI de listas de máquinas anunciadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "# URI anunciadas «%s» descargadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " @@ -4728,120 +4728,120 @@ msgstr "" "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI " "anunciada es descartada.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "Límite de descarga de %u bytes superado, parando descarga\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "Descarga de lista de máquinas «%s» completada.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "Inicializando usando lista de máquinas en «%s».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "# descargas de listas de máquinas iniciadas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "# milisegundos entre descargas de listas de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" "Hay %u/%u conexiones. Se considerará descargar una lista de máquinas en %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 msgid "# active connections" msgstr "# conexiones activas" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "El fichero de listas de máquinas «%s» no existe\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de " "máquinas: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "%u URI de listas de máquinas cargadas del fichero\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 msgid "# hostlist URIs read from file" msgstr "# URI de listas de máquinas leídas de fichero" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas " "de máquinas: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 msgid "# hostlist URIs written to file" msgstr "# URI de listas de máquinas escritas a fichero" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "El aprendizaje está habilitado en este par\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "El aprendizaje no está habilitado en este par\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" @@ -4849,1006 +4849,1006 @@ msgstr "" "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está " "habilitado en este par\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 msgid "bytes in hostlist" msgstr "bytes en la lista de máquinas" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "direcciones expiradas encontradas" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" "Error en la comunicación con el servicio de información de pares (PEERINFO): " "%s\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "«HELLO» sin dirección encontrados (ignorados)" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 msgid "hostlist requests refused (not HTTP GET)" msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 msgid "hostlist requests refused (upload data)" msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" "No se pudo manejar una petición de lista de máquinas debido a que no hay una " "respuesta todavía\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 msgid "hostlist requests refused (not ready)" msgstr "Peticiones de listas de máquinas rechazadas (no preparados)" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 msgid "Received request for our hostlist\n" msgstr "Peticiones recibidas de nuestra lista de máquinas\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 msgid "hostlist requests processed" msgstr "Peticiones de lista de máquinas procesadas" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 msgid "# hostlist advertisements send" msgstr "# anuncios de listas de máquinas enviados" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 msgid "Could not access PEERINFO service. Exiting.\n" msgstr "" "No se pudo acceder al servicio de información de pares (PEERINFO). " "Saliendo.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "Número de puerto %llu no válido. Saliendo.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "Servicio de listas de máquinas arranca en %s:%llu\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "Dirección para obtener la lista de máquinas: «%s»\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, fuzzy, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, fuzzy, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, fuzzy, c-format msgid "Failed to create ego: %s\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, fuzzy, c-format msgid "Failed to set default ego: %s\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 #, fuzzy msgid "delete ego NAME " msgstr "borrar un nombre de espacio de nombres (NAME)" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 #, fuzzy msgid "display all egos" msgstr "mostrar registros" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" # Miguel: Aquí he dejado monitorización porque esto es # del servicio de traducción de direcciones. -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 #, fuzzy msgid "run in monitor mode egos" msgstr "modo de monitorización" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, fuzzy, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "" "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 #, fuzzy msgid "target name already exists" msgstr "El registro ya existía en el almacén de nombres" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, fuzzy, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, fuzzy, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, fuzzy, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "Se produjo un fallo al leer el directorio «%s»\n" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 #, fuzzy msgid "Identity REST API initialized\n" msgstr "Conexión fallida\n" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 #, fuzzy msgid "Ego is required\n" msgstr "Las opción «%s» o «%s» es necesaria.\n" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 #, fuzzy msgid "Requesting party key is required!\n" msgstr "el parámetro --section es necesario\n" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "El almacén de nombres no pudo añadir el registro\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 #, fuzzy msgid "Identity Provider REST API initialized\n" msgstr "Conexión fallida\n" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, fuzzy, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "«%s» falló en %s: %d con el error: %s\n" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "Intentando usar el fichero «%s» para la configuración de MySQL.\n" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, c-format msgid "Could not access file `%s': %s\n" msgstr "No se pudo acceder al fichero «%s»: %s\n" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, fuzzy, c-format msgid "No records found for `%s'" msgstr "No se han encontrado ficheros en «%s»\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "\tRegistro corrupto o no soportado del tipo %u\n" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, fuzzy, c-format msgid "You must specify which zone should be accessed\n" msgstr "Se debe especificar un apodo\n" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "Parámetro no válido «%s»\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, fuzzy, c-format msgid "You must specify a name\n" msgstr "¡Debes especificar un receptor!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "nombre del registro a añadir/borrar/mostrar" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 #, fuzzy msgid "spezifies the public key of the zone to look in" msgstr "Especificar el tipo del registro a buscar" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 msgid "GNUnet zone manipulation tool" msgstr "Herramienta de manipulación de zona de GNUnet" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 #, fuzzy msgid "Namecache failed to cache block" msgstr "El almacén de nombres no pudo añadir el registro" # Miguel: ¿Conectar y conexión? -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 #, fuzzy msgid "Error communicating with namecache service" msgstr "Error al comunicar con el servicio ARM.\n" -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Imposible inicializar SQLite: %s.\n" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 #, fuzzy msgid "flat plugin running\n" msgstr "Base de datos sqlite ejecutándose\n" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, c-format msgid "Adding record failed: %s\n" msgstr "No se pudo añadir el registro: %s\n" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "No se pudo borrar el registro: %s\n" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "No se pudo borrar el registro: %s\n" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, c-format msgid "No options given\n" msgstr "No se han proporcionado opciones\n" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "añadir" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, c-format msgid "Unsupported type `%s'\n" msgstr "Tipo no soportado «%s»\n" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "Valor «%s» no válido para el tipo de registro «%s»\n" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, c-format msgid "Invalid time format `%s'\n" msgstr "Formato de tiempo no válido «%s»\n" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "borrar" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Parámetro no válido «%s»\n" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, c-format msgid "Invalid URI `%s'\n" msgstr "URI no válida: «%s»\n" -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "URI no válida: «%s»\n" -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, fuzzy, c-format msgid "No default ego configured in identity service\n" msgstr "'%s': servicio desconocido: %s\n" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "¡No se pudo conectar al servicio %s!\n" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "añadir registro" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "borrar registro" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "mostrar registros" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" "tiempo de expiración del registro a usar (únicamente para añadir), nunca " "(\"never\") es posible" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 #, fuzzy msgid "set the desired nick name for the zone" msgstr "establece el nivel LEVEL deseado de replicación" -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 #, fuzzy msgid "monitor changes in the namestore" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 #, fuzzy msgid "determine our name for the given PKEY" msgstr "establece las preferencias para el par dado" -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "tipo del registro a añadir/borrar/mostrar" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "URI a importar a nuestra zona" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "valor del registro a añadir/borrar" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "crear o listar registros públicos" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 #, fuzzy msgid "name of the ego controlling the zone" msgstr "nombre de la sección a la que acceder" # form?? -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, c-format msgid "Unsupported form value `%s'\n" msgstr "Forma de valor no soportada «%s»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "Encontrado nombre «%s» para la clave dada\n" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "Encontrados %u registros para el dominio «%s»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, c-format msgid "Failed to create page for `%s'\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "El nombre de dominio no puede contener «.»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "El nombre de dominio no puede contener «+»\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 msgid "Failed to start HTTP server\n" msgstr "Se produjo un fallo al iniciar el servidor HTTP\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 #, fuzzy msgid "Failed to connect to identity\n" msgstr "Se produjo un fallo al conectar con GNS\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 #, fuzzy msgid "GNU Name System First Come First Serve name registration service" msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 #, fuzzy msgid "Namestore failed to store record\n" msgstr "El almacén de nombres no pudo añadir el registro\n" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 #, fuzzy msgid "flat file database running\n" msgstr "Base de datos de plantilla ejecutándose\n" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "Se produjo un fallo al inciar «%s» en «%s»\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 #, fuzzy msgid "Namestore REST API initialized\n" msgstr "Conexión fallida\n" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 #, fuzzy msgid "Suggested configuration changes:\n" msgstr "Configuración de GNUnet" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "Se produjo un fallo al guardar la nueva configuración al disco" -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, fuzzy, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "No se pudo acceder al fichero de configuración «%s»\n" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "Configuración de GNUnet" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 #, fuzzy msgid "write configuration file (for autoconfiguration)" msgstr "¡Ninguna aplicación definida en la configuración!\n" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 #, fuzzy msgid "GNUnet NAT traversal autoconfiguration" msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para " "pruebas NAT: %s\n" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 #, fuzzy msgid "NAT test failed to start NAT library\n" msgstr "El almacén de nombres no pudo añadir el registro\n" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 #, fuzzy msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "comando «upnpc» no encontrado\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "Recorrido NAT con servidor ICMP fallido.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 msgid "Testing connection reversal with ICMP server.\n" msgstr "Probando conexión inversa con el servidor ICMP.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, c-format msgid "Detected external IP `%s'\n" msgstr "Detectada IP externa «%s»\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, c-format msgid "Detected internal network address `%s'.\n" msgstr "Detectada dirección de la red interna «%s».\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "«upnpc» encontrado, habilitando su uso\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 msgid "upnpc not found\n" msgstr "«upnpc» no encontrado\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 #, fuzzy msgid "`upnpc` command not found" msgstr "comando «upnpc» no encontrado\n" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 #, fuzzy msgid "Failed to run `upnpc` command" msgstr "Se produjo un fallo al ejecutar «%s»\n" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 #, fuzzy msgid "`upnpc' command took too long, process killed" msgstr "comando «upnpc» no encontrado\n" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 #, fuzzy msgid "`external-ip' command not found" msgstr "comando «external-ip» no encontrado\n" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 #, fuzzy msgid "Failed to run `external-ip` command" msgstr "Se produjo un fallo al ejecutar «%s»\n" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 #, fuzzy msgid "`external-ip' command output invalid" msgstr "comando «external-ip» no encontrado\n" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 #, fuzzy msgid "Could not determine interface with internal/local network address" msgstr "No se pudo determinar la ruta de instalación de los módulos.\n" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 #, fuzzy msgid "No functioning gnunet-helper-nat-server installation found" msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 #, fuzzy msgid "No working gnunet-helper-nat-client installation found" msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "¡Se produjo un fallo al buscar la opción %s en la sección %s!\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "" "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para " "pruebas NAT: %s\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 #, fuzzy msgid "watch for connection reversal requests" msgstr "# pares desconectados debido a petición externa" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 #, fuzzy msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, fuzzy, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" "Puerto inválido \"%s\" en la especificación de la lista local, probando el " "puerto %d.\n" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Colección detenida.\n" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "«gnunet-helper-nat-server» generó la dirección mal formada «%s»\n" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, c-format msgid "Failed to start %s\n" msgstr "Se produjo un fallo al arrancar %s\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 msgid "`external-ip' command not found\n" msgstr "comando «external-ip» no encontrado\n" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 msgid "`upnpc' command not found\n" msgstr "comando «upnpc» no encontrado\n" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 #, fuzzy msgid "Show network size estimates from NSE service." msgstr "# Estimaciones del tamaño de red recibidas" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" "nombre del fichero para escribir información y estadísticas de la conexión" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "nombre del fichero en el que escribir los resultados principales" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "Número de pares a ejecutar en cada ronda, separados por comas" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "retraso entre rondas" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 msgid "Measure quality and performance of the NSE service." msgstr "Medir la calidad y rendimiento del servicio NSE." -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, c-format msgid "Removing expired address of transport `%s'\n" msgstr "Eliminando dirección de transporte «%s»\n" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "# pares conocidos" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" @@ -5856,1008 +5856,1013 @@ msgstr "" "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. " "Eliminado.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, fuzzy, c-format msgid "Scanning directory `%s'\n" msgstr "Escaneando directorio «%s».\n" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "¡Aún no se han encontrado pares en «%s»!\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, fuzzy, c-format msgid "Cleaning up directory `%s'\n" msgstr "Escaneando directorio «%s».\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "Importando HELLO de «%s»\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" # Miguel: "Failed to receive" también aquí está traducido como # "no se obtuvo respuesta" por claridad. -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 msgid "Failed to receive response from `PEERINFO' service." msgstr "" "No se obtuvo respuesta del servicio de información de pares (PEERINFO)." -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, fuzzy, c-format msgid "%sPeer `%s'\n" msgstr "Par «%s»\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, fuzzy, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, fuzzy, c-format msgid "Failure: Received invalid %s\n" msgstr "recibido mensaje '%s' no válido: %s.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, fuzzy, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "Yo soy el par «%s».\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "no resolver nombres de máquina" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "mostrar únicamente las cadenas de identidad" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "muestra únicamente nuestra propia identidad" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 msgid "list all known peers" msgstr "mostrar todos los pares conocidos" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "también mostrar las URI de «HELLO»" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "añade la URI de «HELLO» dada a la base de datos" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 msgid "Print information about peers." msgstr "Imprimir información sobre los pares." -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, c-format msgid "Starting transport plugins `%s'\n" msgstr "Iniciando los módulos de transporte «%s»\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, c-format msgid "Loading `%s' transport plugin\n" msgstr "Cargando el módulo de transporte «%s»\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "No se pudo leer el fichero de la lista negra «%s»\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 #, fuzzy msgid "Unexpected iteration response, this should not happen.\n" msgstr "El formato de salida es desconocido, ésto no debería pasar.\n" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 #, fuzzy msgid "Received a malformed response from service." msgstr "Recibida petición DNS mal formada de %s\n" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, fuzzy, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "Error abriendo fichero «%s»: %s\n" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, fuzzy, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "Error leyendo de «%s»: %s\n" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, fuzzy, c-format msgid "Unable to create indices: %s.\n" msgstr "Se produjo un fallo al crear los índices\n" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, fuzzy, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "«%s» para «%s» falló en %s: %d con error: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 #, fuzzy msgid "Failed to store membership information!\n" msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 #, fuzzy msgid "Failed to test membership!\n" msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "Parámetro no válido «%s»\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "Se produjo un fallo al iniciar el demonio: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 #, fuzzy msgid "Failed to get fragment!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 #, fuzzy msgid "Failed to get message!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 #, fuzzy msgid "Failed to get message fragment!\n" msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 #, fuzzy msgid "Failed to get master counters!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "Se produjo un fallo al cargar el estado: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "Se produjo un fallo al cargar el estado: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 #, fuzzy msgid "Failed to end modifying state!\n" msgstr "Se produjo un fallo al cargar el estado: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 #, fuzzy msgid "Failed to begin synchronizing state!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 #, fuzzy msgid "Failed to end synchronizing state!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 #, fuzzy msgid "Failed to reset state!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 #, fuzzy msgid "Failed to get state variable!\n" msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "Imposible inicializar SQLite: %s.\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "Se produjo un fallo al preparar la sentencia «%s»\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "«%s» falló en %s: %d con el error: %s\n" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 #, fuzzy msgid "SQLite database running\n" msgstr "Base de datos sqlite ejecutándose\n" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 msgid "Failed to pack DNS request. Dropping.\n" msgstr "Se produjo un fallo al empaquetar la petición DNS. Omitiendo.\n" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 msgid "# DNS requests mapped to VPN" msgstr "# Peticiones DNS asociadas a la VPN" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "# Registros DNS modificados" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 msgid "# DNS replies intercepted" msgstr "# Respuestas DNS interceptadas" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 msgid "Failed to parse DNS request. Dropping.\n" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 msgid "# DNS requests dropped (timeout)" msgstr "# Peticiones DNS omitidas (expiradas)" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 msgid "# DNS requests intercepted" msgstr "# Peticiones DNS interceptadas" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 #, fuzzy msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 msgid "# DNS requests dropped (malformed)" msgstr "# Peticiones DNS omitidas (mal formadas)" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 msgid "# DNS replies received" msgstr "# Respuestas DNS recibidas" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 msgid "# DNS replies dropped (too late?)" msgstr "# Respuestas DNS (¿demasiado tarde?)" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "Se produjo un fallo al conectar con el servicio %s. Saliendo.\n" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "" "El servicio %s carece de opciones de configuración de clave (%s). " "Saliendo.\n" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 #, fuzzy msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "Demonio para anunciar expresiones regulares para el par usando mesh." -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 msgid "No configuration file given. Exiting\n" msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" "No se ha especificado una política de directorios en la línea de comandos. " "Saliendo.\n" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, c-format msgid "No files found in `%s'\n" msgstr "No se han encontrado ficheros en «%s»\n" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 msgid "Error loading search strings. Exiting.\n" msgstr "Error cargando cadenas de búsqueda. Saliendo.\n" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 msgid "name of the file for writing statistics" msgstr "nombre del fichero para escribir las estadísticas" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 #, fuzzy msgid "wait TIMEOUT before ending the experiment" msgstr "" "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como " "fallida" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 #, fuzzy msgid "name of file with input strings" msgstr "nombre del fichero para escribir las estadísticas" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 #, fuzzy msgid "name of file with hosts' names" msgstr "nombre del fichero para escribir las estadísticas" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "Perfilador para expresiones regulares." -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 msgid "name of the table to write DFAs" msgstr "nombre de la tabla para escribir los DFA" # WTF??? -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "longitud de la máxima compresión de rutas" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, fuzzy, c-format msgid "Regex `%s' is too long!\n" msgstr "El servicio «%s» no está ejecutandose\n" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, fuzzy, c-format msgid "Search string `%s' is too long!\n" msgstr "El servicio «%s» no está ejecutandose\n" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 #, fuzzy msgid "listen on specified port (default: 7776)" msgstr "escuchar en el puerto especificado (predeterminado: 7777)" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 #, fuzzy msgid "GNUnet REST server" msgstr "Herramienta de acceso GNUnet GNS" -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, fuzzy, c-format msgid "Key `%s' is valid\n" msgstr "Formato del pseudónimo '%s' no es válido.\n" # Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»? # Esto también es aplicable a las siguientes traducciones. -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, fuzzy, c-format msgid "Key `%s' has been revoked\n" msgstr "El servicio «%s» se ha parado.\n" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 #, fuzzy msgid "Internal error\n" msgstr "Error interno." -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 #, fuzzy msgid "Revocation failed (!)\n" msgstr "La operación ha fallado.\n" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, fuzzy, c-format msgid "Ego `%s' not found.\n" msgstr "Módulo «%s» no encontrado\n" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, fuzzy, c-format msgid "Public key `%s' malformed\n" msgstr "El bloque del tipo %u está mal formado\n" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 #, fuzzy msgid "No filename to store revocation certificate given.\n" msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, fuzzy, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 #, fuzzy msgid "No action specified. Nothing to do.\n" msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 #, fuzzy msgid "# unsupported revocations received via set union" msgstr "Opciones de paquete IPv4 recibidas. Ignoradas.\n" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 #, fuzzy msgid "# revocation messages received via set union" msgstr "# mensajes «DATA» recibidos vía WLAN" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 #, fuzzy msgid "# revocation set unions failed" msgstr "# sesiones wlan creadas" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 #, fuzzy msgid "# revocation set unions completed" msgstr "# transmisiones de fragmentos completadas" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 #, fuzzy msgid "Could not open revocation database file!" msgstr "No se pudo conectar con el almacén de datos." -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +#, fuzzy +msgid "Measure quality and performance of the RPS service." +msgstr "Medir la calidad y rendimiento del servicio NSE." + +#: src/scalarproduct/gnunet-scalarproduct.c:215 #, fuzzy msgid "You must specify at least one message ID to check!\n" msgstr "Debes especificar un fichero a inspeccionar.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, fuzzy, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "No se pudo conectar al servicio %s.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 #, fuzzy msgid "Connect to CADET failed\n" msgstr "Conexión fallida (¿bug?)\n" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "¡No se pudo conectar al servicio %s!\n" # Miguel: Conjunto resta. -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 msgid "number of element in set A-B" msgstr "número de elementos en el conjunto A-B" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 msgid "number of element in set B-A" msgstr "número de elementos en el conjunto B-A" # Miguel: Conjunto unión. -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "número de elementos comunes en A y B" # Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena? -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "número de hash" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "tamaño ibf" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 #, fuzzy msgid "--place missing or invalid.\n" msgstr "Parámetro no válido «%s»\n" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 #, fuzzy msgid "name or public key of ego" msgstr "Parámetro no válido «%s»\n" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 #, fuzzy msgid "wait for incoming messages" msgstr "Falló al entregar el mensaje '%s'.\n" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 #, fuzzy msgid "GNS name" msgstr "Mostrar el _nombre" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 #, fuzzy msgid "method name" msgstr "Mostrar el _nombre" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "número de mensajes a usar por iteración" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "«%s» falló al resolver el método «%s» con error: %s\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "Escritos %llu bytes de estadísticas a «%s»\n" -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "Cargando %llu bytes de estadísticas de «%s»\n" -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 msgid "Failed to obtain statistics.\n" msgstr "Se produjo un fallo al obtener las estadísticas.\n" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "" "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "Falta el parámetro: subsistema\n" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "Falta el argumento: nombre\n" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, c-format msgid "No subsystem or name given\n" msgstr "No se proporcionó un subsistema o un nombre\n" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, c-format msgid "Failed to initialize watch routine\n" msgstr "Se produjo un fallo al inicializar la rutina de visualización\n" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, c-format msgid "Invalid argument `%s'\n" msgstr "Parámetro no válido «%s»\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, c-format msgid "A port is required to connect to host `%s'\n" msgstr "Se necesita un puerto para conectar con la máquina «%s»\n" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "limita la salida de estadísticas para el nombre (NAME) dado" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "hacer el valor persistente" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "límite de salida para el subsistema (SUBSYSTEM) dado" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "imprime el valor de las estadísticas" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "visualiza el valor continuamente" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "conectar a equipo remoto" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "puerto del equipo remoto" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "Imprime estadísticas acerca de las operaciones de GNUnet." -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 msgid "Could not save some persistent statistics\n" msgstr "No se pudieron guardar algunas estadísticas persistentes\n" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 #, fuzzy msgid "Need at least 2 arguments\n" msgstr "Tiene que especificar una URI como parámetro.\n" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 #, fuzzy msgid "Topology string missing\n" msgstr "falta una opción" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, fuzzy, c-format msgid "Invalid topology: %s\n" msgstr "Parámetro no válido «%s»\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, fuzzy, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "Parámetro no válido «%s»\n" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, fuzzy, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "¡Falló mientras se esperaba la configuración topológica!\n" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, fuzzy, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "Argumento no válido para '%s' en %s:%d.\n" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "crea «COUNT» número de pares" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6881,63 +6886,63 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "El fichero de máquinas no tiene el formato correcto: %s\n" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, fuzzy, c-format msgid "%s is stopped" msgstr "# elementos almacenados" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, fuzzy, c-format msgid "%s is starting" msgstr "'%s' comenzando\n" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, fuzzy, c-format msgid "%s is starting already" msgstr "'%s' comenzando\n" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "" @@ -6945,23 +6950,23 @@ msgstr "" # Miguel: ¿Debería cambiar las siglas de ARM? # De momento las he mantenido con una traducción en # otro mensaje. -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, fuzzy, c-format msgid "%s service is not known to ARM" msgstr "El servicio «%s» es desconocido para el ARM.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, fuzzy, c-format msgid "%s service failed to start" msgstr "El proceso del servicio no devolvió un estado\n" # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»? -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, fuzzy, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "Petición ignorada porque el ARM se está apagando.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, fuzzy, c-format msgid "%.s Unknown result code." msgstr "Código de respuesta del ARM desconocido.\n" @@ -6976,167 +6981,167 @@ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n" msgid "Spawning process `%s'\n" msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, c-format msgid "Adding host %u failed with error: %s\n" msgstr "No se pudo añadir la máquina %u por el error: %s\n" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, c-format msgid "Hosts file %s not found\n" msgstr "El fichero de máquinas %s no fue encontrado\n" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, c-format msgid "Hosts file %s has no data\n" msgstr "El archivo de máquinas %s no tiene datos\n" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "El archivo de máquinas %s no puede leerse\n" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "Los controladores de enlazado fallaron. Saliendo" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "El registro de máquinas falló para una máquina. Error: %s\n" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "La máquina %s no puede comenzar la batería de pruebas\n" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "La batería de pruebas no se puede iniciar en localhost\n" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 msgid "Cannot start the master controller" msgstr "No se puede iniciar el controlador maestro" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 #, fuzzy msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" "La topología especificada debe estar soportada por la batería de pruebas" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, c-format msgid "Topology file %s not found\n" msgstr "El fichero de topología %s no fue encontrado\n" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, c-format msgid "Topology file %s has no data\n" msgstr "El fichero de topología %s no tiene datos\n" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, c-format msgid "Topology file %s cannot be read\n" msgstr "El fichero de topología %s no puede ser leido\n" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, c-format msgid "Failed to read peer index from toology file: %s" msgstr "" "Se produjo un fallo al leer el índice de pares del archivo de topología: %s" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, c-format msgid "Failed to read peer index from topology file: %s" msgstr "" "Se produjo un fallo al leer índice de pares del fichero de topología: %s" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "El fichero de topología necesita más pares que los dados\n" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "Ignorando conexión del par %u al par %u\n" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "" "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado " "grande?)\n" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 msgid "create unique configuration files" msgstr "crear ficheros de configuración únicos" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" "extraer los ficheros de claves de máquinas de una lista pre-computada de " "claves de máquinas" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" @@ -7144,15 +7149,15 @@ msgstr "" "número de ficheros de configuración únicos o claves de máquina a crear, o el " "número de claves de máquina a extraer" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 msgid "configuration template" msgstr "plantilla de configuración" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" "Herramienta de línea de comandos para acceder a la biblioteca de pruebas" @@ -7162,19 +7167,19 @@ msgstr "" msgid "list COUNT number of keys" msgstr "crea «COUNT» número de pares" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "El fichero de máquinas no fue encontrado: %s\n" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, c-format msgid "Key number %u does not exist\n" msgstr "El número de clave %u no existe\n" # Miguel: "testbed" lo he traducido como batería de pruebas, pero # no es una traducción muy literal. -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " @@ -7183,107 +7188,107 @@ msgstr "" "Se ha intentado crear una batería de pruebas con más de %u máquinas. Por " "favor, pre-compute más claves de máquinas primero.\n" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "" "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 #, fuzzy msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "" "Se produjo un fallo al crear la configuración para el par (¿no hay " "suficientes puertos libres?)\n" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, fuzzy, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "No se pudo abrir el fichero de claves de máquina: %s\n" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "" "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n" -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "" "Se produjo un fallo al escribir el fichero de configuración «%s» para el par " "%u: %s\n" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, c-format msgid "Failed to start `%s': %s\n" msgstr "Se produjo un fallo al arrancar «%s»: %s\n" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, c-format msgid "Failed to load configuration from %s\n" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" "Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, " "omitiendo bytes «%s».\n" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, fuzzy, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "# pares en la lista negra" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# peticiones de conexión requeridas al servicio de transporte" # gossiped?? -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 msgid "# HELLO messages gossipped" msgstr "# Mensajes «HELLO» rumoreados" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 msgid "# friends connected" msgstr "# amigos conectados" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" "¡Se produjo un fallo al conectar con el servicio principal, no se puede " "gestionar la topología!\n" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, c-format msgid "Found friend `%s' in configuration\n" msgstr "Encontrado amigo «%s» en la configuración\n" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 msgid "# friends in configuration" msgstr "# amigos en configuración" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" @@ -7291,376 +7296,376 @@ msgstr "" "Menos amigos especificados que los requeridos por el contador mínimo de " "amigos. Sólo me conectaré a amigos.\n" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" "Más conexiones amistosas requeridas que el número objetivo total de " "conexiones.\n" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 msgid "# HELLO messages received" msgstr "# mensajes «HELLO» recibidos" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 msgid "# messages dropped due to slow client" msgstr "# mensajes omitidos debido a un cliente lento" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 #, fuzzy msgid "# bytes payload discarded due to not connected peer" msgstr "# bytes de «payload» descartados debido a par no conectado" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 msgid "# bytes total received" msgstr "# total de bytes recibidos" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 msgid "# bytes payload received" msgstr "# bytes de «payload» recibidos" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "# desconexiones debido a la lista negra" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, fuzzy, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, fuzzy, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 #, fuzzy msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" "El servicio de transporte carece de opciones de configuración de clave. " "Saliendo.\n" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "# refrescos de mi «HELLO»" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 #, fuzzy msgid "# session creation failed" msgstr "# sesiones wlan creadas" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 msgid "# DISCONNECT messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "# desconexiones debido a una cuota de 0" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 msgid "# bytes in message queue for other peers" msgstr "# bytes en la cola de mensajes para otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 msgid "# messages transmitted to other peers" msgstr "# mensajes transmitidos a otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 msgid "# transmission failures for messages to other peers" msgstr "# fallos de transmisión en mensajes a otros pares" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "# mensajes expirados mientras estaban en la cola de transporte" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 msgid "# KEEPALIVE messages discarded (no session)" msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 msgid "# messages discarded due to lack of neighbour record" msgstr "# mensajes descartados debido a la falta de registro vecinal" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 msgid "# bandwidth quota violations by other peers" msgstr "# violaciones de la cuota de ancho de banda por otros pares" # throttling? -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "# ms de impulso sugeridos" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "" "Se produjo un fallo al procesar el mensaje interno del programa auxiliar " "«%s»\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 #, fuzzy msgid "# SYN messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Se produjo un fallo al procesar la petición DNS. Omitiendo.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# Mensajes «DISCONNECT» enviados" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 #, fuzzy msgid "# SYN messages received" msgstr "# mensajes PING recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# mensajes SET QUOTA recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 #, fuzzy msgid "# ACK messages received" msgstr "# mensajes «REQUEST CONNECT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 #, fuzzy msgid "# unexpected ACK messages" msgstr "# Mensajes «SESSION ACK» inesperados" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# mensajes de desconexión ignorados (formato antiguo)" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 #, fuzzy msgid "# QUOTA messages received" msgstr "# Mensajes «GAP PUT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 #, fuzzy msgid "# disconnect messages ignored (malformed)" msgstr "# mensajes de desconexión ignorados (formato antiguo)" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# mensajes «REQUEST CONNECT» recibidos" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "# mensajes de desconexión ignorados (marca temporal)" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 msgid "# disconnected from peer upon explicit request" msgstr "# desconexiones del par debido a una petición explícita" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, fuzzy, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, fuzzy, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 #, fuzzy msgid "# Addresses in validation map" msgstr "# revalidaciones de direcciones iniciadas" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 #, fuzzy msgid "# validations running" msgstr "Base de datos sqlite ejecutándose\n" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 #, fuzzy msgid "# address records discarded (timeout)" msgstr "# registros de direcciones descartados" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 #, fuzzy msgid "# address records discarded (blacklist)" msgstr "# registros de direcciones descartados" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 #, fuzzy msgid "# PINGs for address validation sent" msgstr "# revalidaciones de direcciones iniciadas" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "# revalidaciones de direcciones iniciadas" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 msgid "# PING message for different peer received" msgstr "# Mensajes PING recibidos para un par diferente" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, fuzzy, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener " "esa dirección.\n" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, fuzzy, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " @@ -7669,69 +7674,69 @@ msgstr "" "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener " "esa dirección.\n" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, fuzzy, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "# unicast de PONG vía transporte confiable" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "# multicast de PONG a todas las direcciones disponibles" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "# PONG omitidos, no hay una validación pendiente coincidente" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "# Mensajes PONG omitidos, firma expirada" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 #, fuzzy msgid "# validations succeeded" msgstr "# revalidaciones de direcciones iniciadas" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 #, fuzzy msgid "# HELLOs given to peerinfo" msgstr "# «HELLO» obtenidos de «peerinfo»" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, c-format msgid "Failed to connect to `%s'\n" msgstr "Se produjo un fallo al conectar con «%s»\n" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n" # Miguel: La traducción no es literal, pero me parece más correcta # en castellano. -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 msgid "Failed to list connections, timeout occured\n" msgstr "No se pudieron listar las conexiones, expiró el plazo\n" -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, fuzzy, c-format msgid "Transmitting %u bytes\n" msgstr "Transmitiendo %u bytes a %s\n" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " @@ -7740,46 +7745,46 @@ msgstr "" "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en " "bloques de %u Kb\n" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "Desconectado del par «%s» mientras probaba\n" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "%24s: %-17s %4s (%u conexiones en total)\n" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 msgid "Connected to" msgstr "Conectado a" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 msgid "Disconnected from" msgstr "Desconectado de" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, fuzzy, c-format msgid "Received %u bytes\n" msgstr "Recibidos %u bytes de %s\n" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, c-format msgid "Peer `%s': %s %s\n" msgstr "Par «%s»: %s %s\n" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 #, fuzzy msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "" "El cliente se desconectó del servicio principal, tratando de reconectar.\n" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, fuzzy, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " @@ -7788,7 +7793,7 @@ msgstr "" "Múltiples operaciones introducidas. Por favor, seleccione únicamente una " "operación: %s, %s, %s, %s, %s, %s\n" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, fuzzy, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" @@ -7796,136 +7801,136 @@ msgstr "" "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, " "%s, %s, %s, %s, %s\n" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 #, fuzzy msgid "Failed to connect to transport service for disconnection\n" msgstr "Se produjo un fallo al conectar con el servicio de transporte\n" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 msgid "Failed to connect to transport service\n" msgstr "Se produjo un fallo al conectar con el servicio de transporte\n" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "Empezando a recibir datos de prueba\n" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 #, fuzzy msgid "print information for all peers (instead of only connected peers)" msgstr "Imprime información sobre los pares conectados." -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 #, fuzzy msgid "disconnect from a peer" msgstr "conectar a un par" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 msgid "provide information about all current connections (once)" msgstr "provee información sobre todas las conexiones actuales (una vez)" -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "" "provee información sobre todas los eventos de conexión y desconexión " "(continuamente)" -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 msgid "do not resolve hostnames" msgstr "no resolver nombres de máquinas" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "identidad del par" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 #, fuzzy msgid "monitor plugin sessions" msgstr "# sesiones wlan pendientes" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "enviar data para prueba a otro par (hasta CTRL-C)" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 msgid "Direct access to transport service." msgstr "Acceso directo al servicio de transporte." -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 #, fuzzy msgid "receive data from peer" msgstr "# respuestas recibidas de otros pares" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 #, fuzzy msgid "iterations" msgstr "Otras configuraciones" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "número de mensajes a usar por iteración" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 #, fuzzy msgid "message size to use" msgstr "tamaño del mensaje" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el " "módulo %s!\n" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, c-format msgid "Shutting down plugin `%s'\n" msgstr "Finalizando el módulo «%s»\n" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "Finalización del módulo «%s» completa\n" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, fuzzy, c-format msgid "Maximum number of requests is %u\n" msgstr "El número máximo de conexiones es %u\n" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " @@ -7934,12 +7939,12 @@ msgstr "" "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de " "los datos de subida %u\n" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "Aceptando conexión (%u de %u) desde «%s»\n" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" @@ -7947,7 +7952,7 @@ msgstr "" "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando " "nueva conexión\n" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" @@ -7955,273 +7960,273 @@ msgstr "" "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-" "certificate-creation» no pudo ser iniciado!\n" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, fuzzy, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear " "uno!\n" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 msgid "Require valid port number for service in configuration!\n" msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n" -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "El soporte IPv4 es %s\n" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "El soporte IPv6 es %s\n" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 msgid "Port is required! Fix in configuration\n" msgstr "¡El puerto es necesario! Corrija la configuración\n" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, c-format msgid "Using port %u\n" msgstr "Usando puerto %u\n" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es " "válida!\n" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es " "válida!\n" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, c-format msgid "Using external hostname `%s'\n" msgstr "Usando nombre de máquina externo «%s»\n" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, c-format msgid "Maximum number of connections is %u\n" msgstr "El número máximo de conexiones es %u\n" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 #, fuzzy msgid "Unable to compile URL regex\n" msgstr "¡Imposible obtener «HELLO» del par!\n" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "Mensaje mal formado recibido vía %s. Ignorado.\n" -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "La cadena de filtrado SMTP no es válida, carece de «: »\n" # to should be too -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "La cadena de filtrado SMTP es demasiado larga, recortada a «%s»\n" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "SMTP: «%s» falló: %s.\n" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "" "No se ha especificado una dirección de correo, no se puede iniciar el " "transporte SMTP.\n" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 msgid "# bytes received via SMTP" msgstr "# bytes recibidos vía SMTP" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 msgid "# bytes sent via SMTP" msgstr "# bytes enviados vía SMTP" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 msgid "# bytes dropped by SMTP (outgoing)" msgstr "# bytes omitidos por SMTP (salientes)" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Longitud de dirección inesperada: %u bytes\n" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 msgid "# TCP sessions active" msgstr "# Sesiones TCP activas" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 msgid "# bytes currently in TCP buffers" msgstr "# bytes actualmente en los buffer TCP" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 msgid "# bytes discarded by TCP (disconnect)" msgstr "# bytes descartados por TCP (desconectado)" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 msgid "# bytes discarded by TCP (timeout)" msgstr "# bytes omitidos por TCP (expirados)" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 msgid "# bytes transmitted via TCP" msgstr "# bytes recibidos vía TCP" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "# peticiones de desconexión del servicio de transporte por TCP" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 msgid "# TCP WELCOME messages received" msgstr "# Mensajes «WELCOME» TCP recibidos" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "# bytes recibidos vía TCP" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr "# conexiones «stream» activas" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 #, fuzzy msgid "# TCP server connect events" msgstr "# Pares conectados" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "# eventos de desconexión TCP a nivel de red" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 msgid "Failed to start service.\n" msgstr "Se produjo un fallo al iniciar el servicio.\n" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "Transporte TCP escuchando en el puerto %llu\n" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "El transporte TCP anuncia que está en el puerto %llu\n" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 #, fuzzy msgid "# Multicast HELLO beacons received via UDP" msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el " "«socket» en el puerto %d\n" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " @@ -8230,7 +8235,7 @@ msgstr "" "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " "compruebe su configuración de red\n" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 #, fuzzy msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " @@ -8240,152 +8245,152 @@ msgstr "" "configuración de red y deshabilite IPv6 si su conexión carece de una " "dirección IPv6 global\n" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 #, fuzzy msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 msgid "Failed to open UDP sockets\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Se produjo un fallo al crear una nueva firma" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" msgstr "Se produjo un fallo al crear la página para «%s»\n" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, fuzzy, c-format msgid "Cannot bind to `%s'\n" msgstr "Imposible hallar el hash de '%s'.\n" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 #, fuzzy msgid "Failed to open UNIX listen socket\n" msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 #, fuzzy msgid "# ACKs sent" msgstr "# ACK WLAN enviados" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 #, fuzzy msgid "# Messages defragmented" msgstr "# mensajes defragmentados" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 #, fuzzy msgid "# Sessions allocated" msgstr "# sesiones WLAN alojadas" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 #, fuzzy msgid "# message fragments sent" msgstr "# fragmentos de mensaje WLAN enviados" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 #, fuzzy msgid "# messages pending (with fragmentation)" msgstr "# mensajes WLAN pendientes (con fragmentación)" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 #, fuzzy msgid "# MAC endpoints allocated" msgstr "# MAC de destino WLAN alojadas" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 #, fuzzy msgid "# ACKs received" msgstr "# ACK recibidos vía WLAN" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 #, fuzzy msgid "# DATA messages discarded due to CRC32 error" msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 #, fuzzy msgid "# HELLO beacons sent" msgstr "# «beacons HELLO» enviados vía WLAN" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 #, fuzzy msgid "# DATA messages received" msgstr "# Mensajes «GAP PUT» recibidos" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 #, fuzzy msgid "# DATA messages processed" msgstr "# mensajes «DATA» WLAN procesados" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede " "ejecutar el transporte WLAN\n" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 #, fuzzy msgid "# sessions allocated" msgstr "# sesiones WLAN alojadas" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, fuzzy, c-format msgid "XT transport listening on port %llu\n" msgstr "Transporte TCP escuchando en el puerto %llu\n" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 #, fuzzy msgid "XT transport not listening on any port (client only)\n" msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, fuzzy, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "El transporte TCP anuncia que está en el puerto %llu\n" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "# Sesiones TCP activas" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, fuzzy, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " @@ -8394,7 +8399,7 @@ msgstr "" "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, " "compruebe su configuración de red\n" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 #, fuzzy msgid "" "XU could not transmit IPv6 message! Please check your network configuration " @@ -8404,48 +8409,48 @@ msgstr "" "configuración de red y deshabilite IPv6 si su conexión carece de una " "dirección IPv6 global\n" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "Se produjo un fallo al abrir los «sockets» UDP\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "Se produjo un fallo al crear una nueva firma" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, c-format msgid "Access denied to `%s'\n" msgstr "Acceso denegado a «%s»\n" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "Aceptando conexión desde «%s»: %p\n" -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "«%s» falló para el puerto %d (%s).\n" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, fuzzy, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " @@ -8454,191 +8459,191 @@ msgstr "" "El código de procesado para el mensaje del tipo %u no llamó a " "«GNUNET_SERVER_receive_done» después de %s\n" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, c-format msgid "Unknown address family %d\n" msgstr "Familia de direcciones %d desconocida\n" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "Acceso denegado desde «%s» al servicio «%s»\n" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo " "mismo\n" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo " "mismo\n" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "Se produjo un fallo al inciar «%s» en «%s»\n" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, c-format msgid "Service `%s' runs at %s\n" msgstr "El servicio «%s» se ejecuta en %s\n" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "No se pudo inicializar el proceso del servicio\n" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" "No se pudo inicializar la función del servidor en el proceso del servicio\n" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "El proceso del servicio no devolvió un estado\n" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "No existe tal usuario" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "demonizar (desasociar del terminal)" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, c-format msgid "Could not access configuration file `%s'\n" msgstr "No se pudo acceder al fichero de configuración «%s»\n" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, c-format msgid "Error reading `%s': %s" msgstr "Error leyendo «%s»: %s" -#: src/util/bio.c:191 +#: src/util/bio.c:186 msgid "End of file" msgstr "Fin del fichero" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "Se produjo un error leyendo la cadena «%s»" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "Se produjo un fallo al deserializar los metadatos «%s»" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "DEPURACIÓN" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "INFORMACIÓN" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "MENSAJE" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "PELIGRO" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "ERROR" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "NINGUNO" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "NO VÁLIDO" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "dirección desconocida" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "dirección no válida" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" @@ -8646,17 +8651,17 @@ msgstr "" "La configuración especifica un valor no válido en la opción «%s» de la " "sección «%s»: %s\n" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Error decodificando clave %u\n" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " @@ -8665,24 +8670,24 @@ msgstr "" "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro " "de las opciones legales\n" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " @@ -8691,43 +8696,43 @@ msgstr "" "El tamaño del fichero en disco es incorrecto para este «Bloom " "filter» (esperado %llu, tiene %llu)\n" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "No se pudo bloquear el fichero «%s»: %s...\n" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 msgid "Creating a new private key. This may take a while.\n" msgstr "Generando una clave privada nueva. Esto puede tomar un tiempo.\n" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" "Esto puede estar bien si alguien está actualmente generando una clave " "privada.\n" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" @@ -8735,33 +8740,33 @@ msgstr "" "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes " "pero al menos %u son necesarios.\n" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" "Esto puede ser correcto si alguien está actualmente generando una clave de " "máquina.\n" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 #, fuzzy msgid "Could not load peer's private key\n" msgstr "No se pudo acceder a la clave de máquina.\n" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "El firmado ECC falló en %s:%d: %s\n" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, c-format msgid "Expected `%s' to be a directory!\n" msgstr "¡Se esperaba que «%s» fuera un directorio!\n" @@ -8831,11 +8836,11 @@ msgstr "Use %s para obtener una lista de opciones.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Falta la opción «%s» para la operación «%s»\n" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "imprime el número de versión" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8843,119 +8848,119 @@ msgstr "" "Los parámetros obligatorios para las opciones largas también lo son para sus " "versiones cortas.\n" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "imprime esta ayuda" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "crear ficheros de configuración únicos" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Tienes que introducir un número en la opción «%s».\n" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Debes introducir un tiempo relativo en la opción «%s».\n" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Debes introducir un tiempo relativo en la opción «%s».\n" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, fuzzy, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "Tienes que introducir un número en la opción «%s».\n" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Se produjo un fallo al cargar la configuración de %s\n" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, c-format msgid "--section argument is required\n" msgstr "el parámetro --section es necesario\n" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "el parámetro --option es necesario para establecer un valor\n" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" "obtener la opción del valor como un nombre de fichero (con expansión del $)" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "nombre de la sección a la que acceder" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 msgid "name of the option to access" msgstr "nombre de la opción a la que acceder" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "valor a establecer" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 #, fuzzy msgid "print available configuration sections" msgstr "Falta configuración sobre las opciones de claves.\n" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 msgid "Manipulate GNUnet configuration files" msgstr "Manipular ficheros de configuración de GNUnet" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, c-format msgid "Failed to open `%s': %s\n" msgstr "Se produjo un fallo al abrir «%s»: %s\n" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, fuzzy, c-format msgid "Generating %u keys like %s, please wait" msgstr "Generando %u claves, por favor, espere" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "Generando %u claves, por favor, espere" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, c-format msgid "" "\n" @@ -8964,165 +8969,165 @@ msgstr "" "\n" "Se produjo un fallo al escribir en «%s»: %s\n" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, fuzzy, c-format msgid "" "\n" "Finished!\n" msgstr "¡Finalizado!\n" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "El fichero de máquinas %s no fue encontrado\n" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "El archivo de amigos «%s» está vacío.\n" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "¡No se puede leer el fichero de claves de máquina!\n" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "No se ha especificado la clave de máquina en la línea de comandos\n" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 #, fuzzy msgid "print the private key in ASCII format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 #, fuzzy msgid "print the public key in HEX format" msgstr "imprime la clave pública en formato ASCII" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 msgid "Manipulate GNUnet private ECC key files" msgstr "Manipular los ficheros de clave privada ECC de GNUnet" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "realizar una búsqueda inversa" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "Utilizar el resolvedor interno para pruebas de GNUnet" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 #, fuzzy msgid "Manipulate GNUnet proof of work files" msgstr "Manipular los ficheros de clave privada ECC de GNUnet" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "No se pudo resolver «%s» (%s): %s\n" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "No se encontró la IP del host «%s»: %s\n" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "No se ha especificado una URI en la línea de comandos. Saliendo.\n" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "URI no válida: no comienza con «%s»\n" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "URI no válida: falla al especificar el subsistema\n" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "No hay un manejador conocido para el subsistema «%s»\n" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "Realizar las acciones predeterminadas para URI de GNUnet" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, c-format msgid "Error reading from `%s': %s\n" msgstr "Error leyendo de «%s»: %s\n" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "" "Se produjo un fallo al procesar el mensaje interno del programa auxiliar " "«%s»\n" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, c-format msgid "Error writing to `%s': %s\n" msgstr "Error escribiendo a «%s»: %s\n" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" @@ -9130,7 +9135,7 @@ msgstr "" "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con " "CTRL-C)!\n" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " @@ -9139,52 +9144,52 @@ msgstr "" "No se pudo determinar la ruta de instalación de %s. Establezca la variable " "de entorno «%s».\n" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "«%s» falló para el puerto %d (%s).\n" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "«%s» falló al resolver el método «%s» con error: %s\n" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 msgid "Could not determine plugin installation path.\n" msgstr "No se pudo determinar la ruta de instalación de los módulos.\n" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -9193,12 +9198,12 @@ msgstr "" "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en " "la configuración!\n" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n" @@ -9206,24 +9211,24 @@ msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n" # Miguel: He traducido "default" por "predeterminado", la locución # "por defecto" no tiene sentido en sitios como este y he tratado # de ser consistente. -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 #, fuzzy msgid "Resolver not configured correctly.\n" msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "" "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, fuzzy, c-format msgid "" "Processing code for message of type %u did not call " @@ -9232,334 +9237,334 @@ msgstr "" "El código de procesado para el mensaje del tipo %u no llamó a " "«GNUNET_SERVER_receive_done» después de %s\n" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "señal (%d, %p) devolvió %d.\n" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "b" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no " "establecida" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "para siempre" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "0 ms" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "ms" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "s" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "m" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "h" -#: src/util/strings.c:739 +#: src/util/strings.c:734 msgid "day" msgstr "día" -#: src/util/strings.c:741 +#: src/util/strings.c:736 msgid "days" msgstr "días" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "fin del plazo" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "La dirección IPv6 no empezaba con «[»\n" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" "La dirección IPv6 contenía «]» antes de «:» para separar el número de " "puerto\n" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" "La dirección IPv6 contenía un número de puerto válido después del último " "«:»\n" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Dirección IPv6 «%s» no válida: %s\n" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Se produjo un fallo al iniciar el servicio «%s»\n" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Formato no válido para la IP: «%s»\n" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)." -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Formato de tiempo no válido «%s»\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Notación de red no válida (no termina con «;»: «%s»)\n" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Formato «%s» erroneo para máscara de red\n" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, c-format msgid "Wrong format `%s' for network\n" msgstr "Formato «%s» erroneo para red\n" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 #, fuzzy msgid "# Active channels" msgstr "# Túneles activos" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 #, fuzzy msgid "# Messages dropped in cadet queue (overflow)" msgstr "# Bytes omitidos en la cola mesh (desbordamiento)" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 #, fuzzy msgid "# ICMP packets received from cadet" msgstr "# Paquetes ICMP recibidos de mesh" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 #, fuzzy msgid "# UDP packets received from cadet" msgstr "# Paquetes UDP recibidos de mesh" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 #, fuzzy msgid "# TCP packets received from cadet" msgstr "# Paquetes TCP recibidos de mesh" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 #, fuzzy msgid "# Cadet channels created" msgstr "# Túneles mesh creados" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "Protocolo %u no soportado, omitiendo\n" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 #, fuzzy msgid "# Packets dropped (channel not yet online)" msgstr "# Paquetes ICMP omitidos (tipo no permitido)" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "# Paquetes ICMPv4 omitidos (no permitido)" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "# Paquetes ICMPv6 omitidos (no permitido)" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 msgid "# Packets received from TUN interface" msgstr "# Paquetes recibidos de la interfaz TUN" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 msgid "# Active destinations" msgstr "# Destinos activos" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 #, fuzzy msgid "Must specify valid IPv6 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 #, fuzzy msgid "Must specify valid IPv4 address" msgstr "«%s» no es una dirección IP válida.\n" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 msgid "Error creating tunnel\n" msgstr "Error creando el túnel\n" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "La opción «%s» no tiene sentido con la opción «%s».\n" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "Las opción «%s» o «%s» es necesaria.\n" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "Las opción «%s» o «%s» es necesaria cuando se usa la opción «%s».\n" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "«%s» no es un identificador de par válido\n" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, c-format msgid "`%s' is not a valid IP address.\n" msgstr "«%s» no es una dirección IP válida.\n" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "petición cuyo resultado debe ser una dirección IPv4" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "petición cuyo resultado debe ser una dirección IPv6" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "¿cuánto tiempo debe ser válido el mapeado para túneles nuevos?" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "IP de destino para el túnel" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "par que ofrece el servicio al que nos gustaría acceder" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "nombre del servicio al que nos gustaría acceder" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 msgid "service is offered via TCP" msgstr "el servicio es ofrecido vía TCP" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 msgid "service is offered via UDP" msgstr "el servicio es ofrecido vía UDP" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "Configurar túneles vía VPN." -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 msgid "Failed to connect to the namestore!\n" msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n" -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "Aserción fallida en %s:%d.\n" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Violación externa del protocolo detectada en %s:%d.\n" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n" diff --git a/po/fr.po b/po/fr.po index 3541215e8d..6501960339 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.10.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2015-12-24 01:20+0100\n" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -16,1014 +16,1014 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, c-format msgid "Failed to remove configuration file %s\n" msgstr "" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 msgid "Message was sent successfully" msgstr "" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 msgid "We disconnected from ARM before we could send a request" msgstr "" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 msgid "Unknown request status" msgstr "" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "%s est arrêté" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 #, fuzzy msgid "is starting" msgstr "%s est en cours de démarrage" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 #, fuzzy msgid "is stopping" msgstr "%s est en cours d'arrêt" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 #, fuzzy msgid "is starting already" msgstr "%s est déjà en cours de démarrage" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 #, fuzzy msgid "is stopping already" msgstr "%s est déjà arrêté" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 #, fuzzy msgid "is started already" msgstr "%s est déjà démarré" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 #, fuzzy msgid "is stopped already" msgstr "%s est déjà arrêté" -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 msgid "service is not known to ARM" msgstr "" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "Échec du démarrage de %s\n" -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 msgid "service cannot be manipulated because ARM is shutting down" msgstr "" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "%.s Code d'erreur inconnu" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, c-format msgid "Failed to start the ARM service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "Dernier message reçu de %s\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, c-format msgid "Failed to request a list of services: %s\n" msgstr "" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 msgid "Error communicating with ARM. ARM not running?\n" msgstr "" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 msgid "Running services:\n" msgstr "Services en exécution :\n" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "Arrêté %s.\n" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, c-format msgid "Starting %s...\n" msgstr "En cous de démarrage %s…\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "En cour d'arrêt %s…\n" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, c-format msgid "Unknown status %u for service %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 msgid "stop all GNUnet services" msgstr "" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 msgid "start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 msgid "stop and start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 msgid "list currently running services" msgstr "" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, c-format msgid "Using `%s' instead\n" msgstr "" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " "domain socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, c-format msgid "Failed to resolve `%s': %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, c-format msgid "Failed to start service `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, c-format msgid "Starting service `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, c-format msgid "Preparing to stop `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, c-format msgid "Restarting service `%s'.\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "exit" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "signal" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 msgid "unknown" msgstr "inconnu" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, c-format msgid "Service `%s' took %s to terminate\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 msgid "solver to use" msgstr "solveur utilisé" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 msgid "print logging" msgstr "afficher le journal" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "fornat invalide : « %s »\n" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " "%llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " "must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr "fornat invalide : « %s »\n" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 msgid "Stop logging\n" msgstr "Arrêter la journalisation\n" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, c-format msgid "Start logging `%s'\n" msgstr "Démarrer la journalisation « %s »\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " "= %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" "s, %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 msgid "Cannot connect to ATS service, exiting...\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 msgid "Cannot issue request to ATS service, exiting...\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 msgid "No preference type given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 msgid "No peer given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 msgid "Valid type required\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "Connecté à" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 msgid "do not resolve IP addresses to hostnames" msgstr "" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "mode moniteur" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 msgid "set preference for the given peer" msgstr "" -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 msgid "Print information about ATS state" msgstr "" -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 msgid "public auction outcome" msgstr "" -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 msgid "help text" msgstr "" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, c-format msgid "Invalid peer ID `%s'\n" msgstr "" -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, c-format msgid "Invalid target `%s'\n" msgstr "" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 msgid "No action requested\n" msgstr "" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 msgid "Provide information about a particular connection" msgstr "" -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 msgid "Provide information about a patricular peer" msgstr "" -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 msgid "Provide information about all peers" msgstr "" -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 msgid "Provide information about a particular tunnel" msgstr "" -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 msgid "Provide information about all tunnels" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 msgid "number of peers in consensus" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 msgid "number of values" msgstr "nombre de valeurs" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 msgid "consensus timeout" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 msgid "write statistics to file" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 msgid "Failed to setup phone (internal error)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, c-format msgid "Connection established to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, c-format msgid "Failed to resolve `%s'\n" msgstr "Résolution de « %s » échouée\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, fuzzy, c-format msgid "Call to `%s' terminated\n" msgstr "Appel terminé\n" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, c-format msgid "Unknown command `%s'\n" msgstr "Commande « %s » inconnue\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, c-format msgid "#%u: `%s'\n" msgstr "#%u : « %s »\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 msgid "Use `/quit' to terminate gnunet-conversation" msgstr "" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, c-format msgid "Name of our ego changed to `%s'\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, c-format msgid "Our ego `%s' was deleted!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 msgid "You must specify the NAME of an ego to use\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 msgid "Failed to start gnunet-helper-w32-console\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1031,15 +1031,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1049,947 +1049,947 @@ msgstr "" msgid "pa_stream_write() failed: %s\n" msgstr "pa_stream_write() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 msgid "Connection established.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, c-format msgid "pa_stream_new() failed: %s\n" msgstr "pa_stream_new() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "pa_stream_connect_playback() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, c-format msgid "Connection failure: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 msgid "Wrong Spec\n" msgstr "Spécification incorrecte\n" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 msgid "pa_mainloop_new() failed.\n" msgstr "pa_mainloop_new() échoué.\n" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 msgid "pa_context_new() failed.\n" msgstr "pa_context_new() échoué.\n" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, c-format msgid "pa_context_connect() failed: %s\n" msgstr "pa_context_connect() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 msgid "pa_mainloop_run() failed.\n" msgstr "pa_mainloop_run() échoué.\n" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "opus_encode_float() échoué : %s. Annulation\n" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "pa_stream_peek() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 msgid "Stream successfully created.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "pa_stream_get_buffer_attr() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "pa_stream_connect_record() échoué : %s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 msgid "ogg_stream_init() failed.\n" msgstr "ogg_stream_init() échoué.\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "" -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, c-format msgid "Could not open line, port %s already in use!\n" msgstr "" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 msgid "Could not start record audio helper\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, c-format msgid "PHONE version %u not supported\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 msgid "Could not start playback audio helper.\n" msgstr "" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 msgid "fresh connection" msgstr "" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 msgid "key received" msgstr "" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 msgid "connection established" msgstr "" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "Déconnecté de" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 msgid "Connection to CORE service lost (reconnecting)" msgstr "" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "adresse inconnue" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, c-format msgid "Invalid command line argument `%s'\n" msgstr "" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 msgid "Failed to connect to CORE service!\n" msgstr "" -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 msgid "provide information about all current connections (continuously)" msgstr "" -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 msgid "Print information about connected peers." msgstr "" -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 msgid "# send requests dropped (disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, c-format msgid "# bytes of messages of type %u received" msgstr "" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 msgid "# messages discarded (session disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, c-format msgid "# messages of type %u discarded (client busy)" msgstr "" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, c-format msgid "Core service of `%s' ready.\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 msgid "# PING messages transmitted" msgstr "" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 msgid "# duplicate ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 msgid "# valid ephemeral keys received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 msgid "# PING messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 msgid "# PING messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 msgid "# PONG messages created" msgstr "" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 msgid "# keepalive messages sent" msgstr "" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 msgid "# PONG messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 msgid "# PONG messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 msgid "# PONG messages decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 msgid "# session keys confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 msgid "# timeouts prevented via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 msgid "# rekey operations confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 msgid "# bytes dropped (duplicates)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 msgid "# bytes dropped (out of sequence)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 msgid "# bytes dropped (ancient message)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 msgid "# bytes of payload decrypted" msgstr "" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 msgid "# peers connected" msgstr "" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 msgid "# type map refreshes sent" msgstr "" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 msgid "# outdated typemap confirmations received" msgstr "" -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 msgid "# valid typemap confirmations received" msgstr "" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 msgid "# type maps received" msgstr "" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, c-format msgid "Ego `%s' not known to identity service\n" msgstr "" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, c-format msgid "Issuer public key not well-formed\n" msgstr "" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, c-format msgid "ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, c-format msgid "Issuer ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 msgid "The public key of the subject to lookup the credential for" msgstr "" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 msgid "The public key of the authority to verify the credential against" msgstr "" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 msgid "The ego to use" msgstr "" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 msgid "GNUnet credential resolver tool" msgstr "" -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, c-format msgid "Failed to connect to GNS\n" msgstr "" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, c-format msgid "Failed to connect to namestore\n" msgstr "" -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "Résolution de « %s » échouée\n" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 msgid "GNS REST API initialized\n" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 msgid "# bytes stored" msgstr "" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 msgid "# items stored" msgstr "" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 msgid "# requests received" msgstr "" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 msgid "# requests for random value received" msgstr "" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 msgid "# proximity search requests received" msgstr "" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "Déconnecté de" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "Déconnecté de" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 msgid "# queue entries created" msgstr "" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 msgid "# status messages received" msgstr "" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 msgid "# Results received" msgstr "" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 msgid "# datastore connections (re)created" msgstr "" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 msgid "# PUT requests executed" msgstr "" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 msgid "# RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 msgid "# REMOVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 msgid "# GET requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 msgid "Error queueing datastore GET operation\n" msgstr "" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "Résolution de « %s » échouée\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, c-format msgid "Failed to store item: %s, aborting\n" msgstr "" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, c-format msgid "Inserted % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 msgid "Error queueing datastore PUT operation\n" msgstr "" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 msgid "Failed connecting to the datastore.\n" msgstr "" -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 msgid "Dump all records from the datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 msgid "Insert records into the datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 msgid "Manipulate GNUnet datastore" msgstr "" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 msgid "# bytes expired" msgstr "" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "# résultats introuvables" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " "%llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " "bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "# réservé" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 msgid "# GET requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 msgid "# GET KEY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 msgid "# requests filtered by bloomfilter" msgstr "" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 msgid "# GET REPLICATION requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 msgid "# GET ZERO ANONYMITY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 msgid "Content not found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 msgid "# REMOVE requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "# quota" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "# taille du cache" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 msgid "Failed to initialize bloomfilter.\n" msgstr "" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 msgid "Heap database running\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 msgid "Data too large" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 msgid "Failed to drop table from database.\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 msgid "Sqlite database running\n" msgstr "" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" @@ -1998,4385 +1998,4389 @@ msgstr "" "Resultat %d, type %d :\n" "%.*s\n" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, fuzzy, c-format msgid "Result %d, type %d:\n" msgstr "" "Resultat %d, type %d :\n" "%.*s\n" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 msgid "Failed to connect to DHT service!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, c-format msgid "Exiting as the number of peers is %u\n" msgstr "" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 #, fuzzy msgid "number of peers to start" msgstr "nombre de valeurs" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 msgid "Measure quality and performance of the DHT service." msgstr "" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 msgid "# GET requests from clients injected" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 msgid "# PUT requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 msgid "# GET requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 msgid "# GET STOP requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 msgid "# GET requests given to datacache" msgstr "" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 msgid "# HELLOs obtained from peerinfo" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 msgid "# FIND PEER messages initiated" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 msgid "# requests TTL-dropped" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 msgid "# Peer selection failed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 msgid "# PUT requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 msgid "# PUT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 msgid "# P2P messages dropped due to full queue" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 msgid "# GET requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 msgid "# GET messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 msgid "# RESULT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 msgid "# P2P PUT requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 msgid "# P2P PUT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 msgid "# P2P GET requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 msgid "# P2P GET bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 msgid "# P2P FIND PEER requests processed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 msgid "# P2P GET requests ONLY routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 msgid "# P2P RESULTS received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 msgid "# P2P RESULT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 msgid "# Network size estimates received" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 msgid "# DHT requests combined" msgstr "" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, c-format msgid "Block not of type %u\n" msgstr "" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, c-format msgid "Could not bind to any port: %s\n" msgstr "" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, c-format msgid "Sent DNS request to %s\n" msgstr "" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 msgid "need a valid IPv4 or IPv6 address\n" msgstr "" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 msgid "Print information about DV state" msgstr "" -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 msgid "# TCP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 msgid "# ICMP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 msgid "# UDP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 msgid "# Bytes received from CADET" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 msgid "# UDP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 msgid "# UDP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 msgid "# TCP service creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 msgid "# TCP IP-exit creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 msgid "# TCP DATA requests dropped (no session)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 msgid "# TCP data requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 msgid "# ICMP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 msgid "# ICMP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 msgid "# Inbound CADET channels created" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 msgid "# Messages transmitted via cadet channels" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 msgid "# Packets received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 msgid "# Bytes received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "Doit être un nombre" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 msgid "# fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 msgid "# duplicate fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 msgid "# fragments transmitted" msgstr "" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 msgid "# fragments retransmitted" msgstr "" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 msgid "# fragments wrap arounds" msgstr "" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 msgid "# fragment acknowledgements received" msgstr "" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 msgid "# fragmentation transmissions completed" msgstr "" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, c-format msgid "Could not open file `%s': %s" msgstr "" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, c-format msgid "Could not read file `%s': %s" msgstr "" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, c-format msgid "Failed to open file `%s' for writing" msgstr "" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, c-format msgid "Download failed: could not open file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 msgid "internal error decoding tree" msgstr "" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 msgid "Invalid URI" msgstr "URI invalide" -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " "`unknown' instead.\n" msgstr "" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "Dernier message reçu de %s\n" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, c-format msgid "Failed to write `%s': %s\n" msgstr "" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, c-format msgid "Failed to read `%s': %s\n" msgstr "" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 msgid "Failed to connect to datastore." msgstr "" -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, c-format msgid "Publishing failed: %s" msgstr "" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 msgid "error on index-start request to `fs' service" msgstr "" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 msgid "filename too long" msgstr "" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 msgid "could not connect to `fs' service" msgstr "" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, c-format msgid "Recursive upload failed at `%s': %s" msgstr "" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, c-format msgid "Recursive upload failed: %s" msgstr "" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 msgid "needs to be an actual file" msgstr "" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr "pa_stream_new() échoué : %s\n" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 msgid "Could not connect to datastore." msgstr "" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 msgid "Internal error." msgstr "Erreur interne." -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 msgid "Failed to read file" msgstr "" -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 msgid "Error communicating with `fs' service." msgstr "" -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 msgid "Failed to connect to FS service for unindexing." msgstr "" -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 msgid "Failed to get KSKs from directory scan." msgstr "" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, c-format msgid "Internal error scanning `%s'.\n" msgstr "" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, c-format msgid "Failed to remove UBlock: %s\n" msgstr "" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 msgid "Failed to connect to `datastore' service." msgstr "" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 msgid "Failed to open file for unindexing." msgstr "" -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 msgid "Failed to compute hash of file." msgstr "" -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "Argument invalide « %s »\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "Type d’URI non reconnu" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, c-format msgid "Failed to load state: %s\n" msgstr "" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, c-format msgid "Failed to save state to file %s\n" msgstr "" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "Publication de « %s » terminée\n" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, c-format msgid "Publishing `%s'\n" msgstr "Publication de « %s »\n" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, c-format msgid "Failed to run `%s'\n" msgstr "" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" msgstr "" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 msgid "Automatically publish files from a directory on GNUnet" msgstr "" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, c-format msgid "Directory `%s' meta data:\n" msgstr "" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, c-format msgid "Directory `%s' contents:\n" msgstr "" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 msgid "You must specify a filename to inspect.\n" msgstr "" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, c-format msgid "Failed to read directory `%s'\n" msgstr "" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 msgid "Display contents of a GNUnet directory" msgstr "" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, c-format msgid "Starting download `%s'.\n" msgstr "" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 msgid "" msgstr "" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, c-format msgid "Error downloading: %s.\n" msgstr "" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 msgid "You need to specify a URI argument.\n" msgstr "" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, c-format msgid "Failed to parse URI: %s\n" msgstr "" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 msgid "Special file-sharing operations" msgstr "" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, c-format msgid "Error publishing: %s.\n" msgstr "" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "Publication de « %s » terminée.\n" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, c-format msgid "URI is `%s'.\n" msgstr "L’URI est « %s ».\n" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, fuzzy, c-format msgid "Namespace URI is `%s'.\n" msgstr "L’URI est « %s ».\n" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 msgid "Starting cleanup after abort\n" msgstr "" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 msgid "Cleanup after abort completed.\n" msgstr "" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 msgid "Cleanup after abort failed.\n" msgstr "" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 msgid "Could not publish\n" msgstr "" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 msgid "Could not start publishing.\n" msgstr "" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, c-format msgid "Scanning directory `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, c-format msgid "Scanning file `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 msgid "Preprocessing complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 msgid "Internal error scanning directory.\n" msgstr "" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, c-format msgid "Failed to access `%s': %s\n" msgstr "" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, c-format msgid "Error searching: %s.\n" msgstr "" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 msgid "Could not create keyword URI from arguments.\n" msgstr "" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 msgid "Could not start searching.\n" msgstr "" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 msgid "Search GNUnet for files that were published on GNUnet" msgstr "" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 msgid "# client searches active" msgstr "" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 msgid "# replies received for local clients" msgstr "" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 msgid "# Loopback routes suppressed" msgstr "" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 msgid "# client searches received" msgstr "" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, c-format msgid "Failed to connect to `%s' service.\n" msgstr "" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 msgid "# replies received via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 msgid "# replies received via cadet dropped" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 msgid "# queries received via CADET not answered" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 msgid "# Blocks transferred via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 msgid "# queries received via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 msgid "# cadet client connections rejected" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr "# Session TCP active" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 msgid "# migration stop messages received" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 msgid "# replies dropped due to type mismatch" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 msgid "# replies received for other peers" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 msgid "# requests done for free (low load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 msgid "# request dropped, priority insufficient" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 msgid "# requests done for a price (normal load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 msgid "# requests dropped due to higher-TTL request" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 msgid "# requests dropped due to full reply queue" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 msgid "# P2P query messages received and processed" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 msgid "# migration stop messages sent" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, c-format msgid "Could not open `%s'.\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, c-format msgid "Error writing `%s'.\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, c-format msgid "Failed to delete bogus block: %s\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 msgid "not indexed" msgstr "non indexé" -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " "anyway.\n" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 msgid "# average retransmission delay (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 msgid "# delay heap timeout (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query plans executed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 msgid "# query messages sent to other peers" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 msgid "# requests merged" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 msgid "# requests refreshed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 msgid "# Pending requests created" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 msgid "# Pending requests active" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 msgid "# replies received and matched" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 msgid "# irrelevant replies discarded" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 msgid "# results found locally" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 msgid "# storage requests dropped due to high load" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 msgid "# Replies received from DHT" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 msgid "# Replies received from CADET" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 msgid "# GAP PUT messages received" msgstr "" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, c-format msgid "Error unindexing: %s.\n" msgstr "" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 msgid "Unindexing done.\n" msgstr "" -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 msgid "Could not start unindex operation.\n" msgstr "" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 msgid "Failed to pack DNS response into UDP packet!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 msgid "No DNS server specified!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 msgid "Specify the type of the record to lookup" msgstr "" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 msgid "GNUnet GNS resolver tool" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, c-format msgid "Failed to connect to identity service\n" msgstr "" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, c-format msgid "Failed to initialize DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, c-format msgid "Failed to parse DANE record: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, c-format msgid "Unable to import private key from file `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, c-format msgid "Unable to import certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 msgid "Failed to pass client to MHD\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, c-format msgid "Unsupported socks version %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, c-format msgid "Unsupported socks command %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, c-format msgid "Unsupported socks address type %d\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 msgid "Properly base32-encoded public key required" msgstr "" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 msgid "Failed to connect to the namecache!\n" msgstr "" -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 msgid "Could not connect to DHT!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 msgid "Failed to connect to the DNS service!\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 msgid "Failed to parse DNS response\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, c-format msgid "Unable to parse MX record `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, c-format msgid "Error accessing file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, c-format msgid "Error opening file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 msgid "Failed to parse HELLO message: malformed\n" msgstr "" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, fuzzy, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "Extension « %s » introuvable\n" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 msgid "advertise our hostlist to other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 msgid "enable learning about hostlist servers from other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 msgid "provide a hostlist server" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 msgid "# active connections" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 msgid "bytes in hostlist" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 msgid "hostlist requests refused (not HTTP GET)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 msgid "hostlist requests refused (upload data)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 msgid "hostlist requests refused (not ready)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 msgid "Received request for our hostlist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 msgid "hostlist requests processed" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 msgid "# hostlist advertisements send" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 msgid "Could not access PEERINFO service. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, c-format msgid "Failed to create ego: %s\n" msgstr "" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, c-format msgid "Failed to set default ego: %s\n" msgstr "" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 msgid "Ego is required\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 msgid "Requesting party key is required!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "Échec du démarrage de %s\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 msgid "Identity Provider REST API initialized\n" msgstr "" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, c-format msgid "Could not access file `%s': %s\n" msgstr "" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, c-format msgid "No records found for `%s'" msgstr "" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, c-format msgid "You must specify which zone should be accessed\n" msgstr "" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "fornat invalide : « %s »\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, c-format msgid "You must specify a name\n" msgstr "" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 msgid "spezifies the public key of the zone to look in" msgstr "" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 msgid "GNUnet zone manipulation tool" msgstr "" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 msgid "Error communicating with namecache service" msgstr "" -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, c-format msgid "Unable to initialize file: %s.\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, c-format msgid "Unable to get filesize: %s.\n" msgstr "" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Résolution de « %s » échouée\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "ajouter" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, c-format msgid "Unsupported type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, c-format msgid "Invalid time format `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "supprimer" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, c-format msgid "Invalid URI `%s'\n" msgstr "URI invalide « %s »\n" -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, c-format msgid "Invalid nick `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, c-format msgid "Cannot connect to identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "ajouter un enregistrement" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "suprimer un enregistrement" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "afficher les enregistrements" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 msgid "set the desired nick name for the zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 msgid "monitor changes in the namestore" msgstr "" -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 msgid "determine our name for the given PKEY" msgstr "" -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, c-format msgid "Unsupported form value `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, c-format msgid "Failed to create page for `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 msgid "Failed to start HTTP server\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 msgid "Failed to connect to identity\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 msgid "flat file database running\n" msgstr "" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "Échec du démarrage de %s\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 msgid "Namestore REST API initialized\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 msgid "Suggested configuration changes:\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "fornat invalide : « %s »\n" -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "fornat invalide : « %s »\n" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 msgid "write configuration file (for autoconfiguration)" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 msgid "GNUnet NAT traversal autoconfiguration" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 msgid "NAT test failed to start NAT library\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 msgid "Testing connection reversal with ICMP server.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, c-format msgid "Detected external IP `%s'\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, c-format msgid "Detected internal network address `%s'.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 msgid "upnpc not found\n" msgstr "upnpc introuvable\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 msgid "`upnpc` command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 msgid "Failed to run `upnpc` command" msgstr "" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 msgid "`upnpc' command took too long, process killed" msgstr "" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 msgid "`external-ip' command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 msgid "Failed to run `external-ip` command" msgstr "" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 msgid "`external-ip' command output invalid" msgstr "" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 msgid "Could not determine interface with internal/local network address" msgstr "" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 msgid "No functioning gnunet-helper-nat-server installation found" msgstr "" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 msgid "No working gnunet-helper-nat-client installation found" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 msgid "Connection reversal request failed\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, c-format msgid "Failed to start %s\n" msgstr "Échec du démarrage de %s\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 msgid "Show network size estimates from NSE service." msgstr "" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 msgid "Measure quality and performance of the NSE service." msgstr "" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, c-format msgid "Removing expired address of transport `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, c-format msgid "Scanning directory `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, c-format msgid "Cleaning up directory `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 msgid "Failed to receive response from `PEERINFO' service." msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, c-format msgid "%sPeer `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, c-format msgid "Failure: Received invalid %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 msgid "list all known peers" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 msgid "Print information about peers." msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, c-format msgid "Starting transport plugins `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, c-format msgid "Loading `%s' transport plugin\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 msgid "Unexpected iteration response, this should not happen.\n" msgstr "" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 msgid "Received a malformed response from service." msgstr "" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, c-format msgid "Unable to create indices: %s.\n" msgstr "" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 msgid "Failed to store membership information!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 msgid "Failed to test membership!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "Argument invalide « %s »\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "Échec du démarrage de %s\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 msgid "Failed to get fragment!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 msgid "Failed to get message!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 msgid "Failed to get message fragment!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 msgid "Failed to get master counters!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "Échec du démarrage de %s\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "Échec du démarrage de %s\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 msgid "Failed to end modifying state!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 msgid "Failed to begin synchronizing state!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 msgid "Failed to end synchronizing state!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 msgid "Failed to reset state!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 msgid "Failed to get state variable!\n" msgstr "" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "Résolution de « %s » échouée\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "Échec du démarrage de %s\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 msgid "SQLite database running\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 msgid "Failed to pack DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 msgid "# DNS requests mapped to VPN" msgstr "" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 msgid "# DNS replies intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 msgid "Failed to parse DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 msgid "# DNS requests dropped (timeout)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 msgid "# DNS requests intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 msgid "# DNS requests dropped (malformed)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 msgid "# DNS replies received" msgstr "" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 msgid "# DNS replies dropped (too late?)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 msgid "No configuration file given. Exiting\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, c-format msgid "No files found in `%s'\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 msgid "Error loading search strings. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 msgid "name of the file for writing statistics" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 msgid "name of file with input strings" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 msgid "name of file with hosts' names" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 msgid "name of the table to write DFAs" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, c-format msgid "Regex `%s' is too long!\n" msgstr "" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, c-format msgid "Search string `%s' is too long!\n" msgstr "" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 msgid "GNUnet REST server" msgstr "" -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, c-format msgid "Key `%s' is valid\n" msgstr "" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, c-format msgid "Key `%s' has been revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 msgid "Internal error\n" msgstr "" -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 msgid "Revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, c-format msgid "Ego `%s' not found.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, c-format msgid "Public key `%s' malformed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 msgid "No filename to store revocation certificate given.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 msgid "No action specified. Nothing to do.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 msgid "# unsupported revocations received via set union" msgstr "" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 msgid "# revocation messages received via set union" msgstr "" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 msgid "# revocation set unions failed" msgstr "" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 msgid "# revocation set unions completed" msgstr "" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 msgid "Could not open revocation database file!" msgstr "" -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +msgid "Measure quality and performance of the RPS service." +msgstr "" + +#: src/scalarproduct/gnunet-scalarproduct.c:215 msgid "You must specify at least one message ID to check!\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 msgid "Connect to CADET failed\n" msgstr "" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "threshold" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "Impossible d’ouvrir « %s ».\n" -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 msgid "number of element in set A-B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 msgid "number of element in set B-A" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "numéro de hash" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "taille ibz" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 msgid "--place missing or invalid.\n" msgstr "" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 msgid "name or public key of ego" msgstr "" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 msgid "wait for incoming messages" msgstr "" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 msgid "GNS name" msgstr "" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 msgid "method name" msgstr "" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "nombre de valeurs" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "Échec du démarrage de %s\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "" -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 msgid "Failed to obtain statistics.\n" msgstr "" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, c-format msgid "No subsystem or name given\n" msgstr "" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, c-format msgid "Failed to initialize watch routine\n" msgstr "" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, c-format msgid "Invalid argument `%s'\n" msgstr "Argument invalide « %s »\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, c-format msgid "A port is required to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "" -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 msgid "Could not save some persistent statistics\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 msgid "Need at least 2 arguments\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, c-format msgid "Invalid topology: %s\n" msgstr "Topologie invalide : %s\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6400,83 +6404,83 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, c-format msgid "%s is stopped" msgstr "%s est arrêté" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, c-format msgid "%s is starting" msgstr "%s est en cours de démarrage" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "%s est en cours d'arrêt" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, c-format msgid "%s is starting already" msgstr "%s est déjà en cours de démarrage" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "%s est déjà arrêté" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "%s est déjà démarré" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "%s est déjà arrêté" -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, c-format msgid "%s service is not known to ARM" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, c-format msgid "%s service failed to start" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, c-format msgid "%.s Unknown result code." msgstr "%.s Code d'erreur inconnu" @@ -6490,173 +6494,173 @@ msgstr "" msgid "Spawning process `%s'\n" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, c-format msgid "Adding host %u failed with error: %s\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, c-format msgid "Hosts file %s not found\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, c-format msgid "Hosts file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 msgid "Cannot start the master controller" msgstr "" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, c-format msgid "Topology file %s not found\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, c-format msgid "Topology file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, c-format msgid "Topology file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, c-format msgid "Failed to read peer index from toology file: %s" msgstr "" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, c-format msgid "Failed to read peer index from topology file: %s" msgstr "" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 msgid "create unique configuration files" msgstr "" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" msgstr "" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 msgid "configuration template" msgstr "" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" @@ -6664,1455 +6668,1455 @@ msgstr "" msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, c-format msgid "Key number %u does not exist\n" msgstr "" -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " "precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "" -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, c-format msgid "Failed to start `%s': %s\n" msgstr "" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, c-format msgid "Failed to load configuration from %s\n" msgstr "" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 msgid "# connect requests issued to ATS" msgstr "" -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 msgid "# friends connected" msgstr "" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, c-format msgid "Found friend `%s' in configuration\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 msgid "# friends in configuration" msgstr "" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 msgid "# HELLO messages received" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 msgid "# messages dropped due to slow client" msgstr "" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 msgid "# bytes payload discarded due to not connected peer" msgstr "" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 msgid "# bytes total received" msgstr "" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 msgid "# bytes payload received" msgstr "" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 #, fuzzy msgid "# session creation failed" msgstr "# Session TCP active" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 msgid "# DISCONNECT messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 msgid "# messages transmitted to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Résolution de « %s » échouée\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 msgid "# SYN messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Échec du démarrage de %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 msgid "# SYN_ACK messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Échec du démarrage de %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 msgid "# SYN messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 msgid "# SYN_ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 msgid "# unexpected SYN_ACK messages (no peer)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 msgid "# unexpected SYN_ACK messages (not ready)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 msgid "# ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 msgid "# unexpected ACK messages" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 msgid "# quota messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 msgid "# QUOTA messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 msgid "# DISCONNECT messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 msgid "# disconnected from peer upon explicit request" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 msgid "# Addresses in validation map" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 msgid "# validations running" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 msgid "# address records discarded (timeout)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 msgid "# address records discarded (blacklist)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 msgid "# PINGs for address validation sent" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 msgid "# PING message for different peer received" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " "having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 msgid "# validations succeeded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, c-format msgid "Failed to connect to `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 msgid "Failed to list connections, timeout occured\n" msgstr "" -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, c-format msgid "Transmitting %u bytes\n" msgstr "" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " "blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 msgid "Connected to" msgstr "Connecté à" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 msgid "Disconnected from" msgstr "Déconnecté de" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, fuzzy, c-format msgid "Received %u bytes\n" msgstr "%s message(s) reçu(s)\n" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, c-format msgid "Peer `%s': %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " "%s, %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 msgid "Failed to connect to transport service for disconnection\n" msgstr "" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 msgid "Failed to connect to transport service\n" msgstr "" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 msgid "print information for all peers (instead of only connected peers)" msgstr "" -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 msgid "disconnect from a peer" msgstr "" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 msgid "provide information about all current connections (once)" msgstr "" -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "" -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 msgid "do not resolve hostnames" msgstr "" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 msgid "monitor plugin sessions" msgstr "" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 msgid "Direct access to transport service." msgstr "" -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 msgid "receive data from peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 msgid "iterations" msgstr "" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "nombre de valeurs" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 msgid "message size to use" msgstr "" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, c-format msgid "Shutting down plugin `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, c-format msgid "Maximum number of requests is %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " "size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 msgid "Require valid port number for service in configuration!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "Prise en charge d’IPv4 %s\n" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "Prise en charge d’IPv6 %s\n" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 msgid "Port is required! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, c-format msgid "Using port %u\n" msgstr "Utilisation du port %u\n" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, c-format msgid "Using external hostname `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, c-format msgid "Maximum number of connections is %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 msgid "Unable to compile URL regex\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "SNTP : « %s » échouée : %s.\n" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 msgid "# bytes received via SMTP" msgstr "" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 msgid "# bytes sent via SMTP" msgstr "" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 msgid "# bytes dropped by SMTP (outgoing)" msgstr "" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 msgid "# TCP sessions active" msgstr "# Session TCP active" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 msgid "# bytes currently in TCP buffers" msgstr "" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 msgid "# bytes discarded by TCP (disconnect)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 msgid "# bytes discarded by TCP (timeout)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 msgid "# bytes transmitted via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 msgid "# TCP WELCOME messages received" msgstr "" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr "# Session TCP active" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 msgid "# TCP server connect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 msgid "Failed to start service.\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 msgid "# Multicast HELLO beacons received via UDP" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 msgid "Failed to open UDP sockets\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "adresse invalide" -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "adresse invalide" -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 msgid "Failed to create UDP network sockets\n" msgstr "" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, c-format msgid "Cannot create path to `%s'\n" msgstr "" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, c-format msgid "Cannot bind to `%s'\n" msgstr "" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 msgid "Failed to open UNIX listen socket\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 msgid "# ACKs sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 msgid "# Messages defragmented" msgstr "" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 #, fuzzy msgid "# Sessions allocated" msgstr "# Session TCP active" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 msgid "# message fragments sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 msgid "# messages pending (with fragmentation)" msgstr "" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 msgid "# MAC endpoints allocated" msgstr "" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 msgid "# ACKs received" msgstr "" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 msgid "# DATA messages discarded due to CRC32 error" msgstr "" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 msgid "# HELLO beacons sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 msgid "# DATA messages received" msgstr "" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 msgid "# DATA messages processed" msgstr "" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 #, fuzzy msgid "# sessions allocated" msgstr "# Session TCP active" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, c-format msgid "XT transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 msgid "XT transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "# Session TCP active" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " "network configuration\n" msgstr "" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 msgid "" "XU could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, c-format msgid "Access denied to `%s'\n" msgstr "" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "" -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, c-format msgid "Unknown address family %d\n" msgstr "" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, c-format msgid "Service `%s' runs at %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "Aucun utilisateur trouvé" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 msgid "Malformed configuration, exit ...\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, c-format msgid "Could not access configuration file `%s'\n" msgstr "" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "Masque érroné : %d\n" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, c-format msgid "Error reading `%s': %s" msgstr "Erreur de lecture : « %s » : %s" -#: src/util/bio.c:191 +#: src/util/bio.c:186 msgid "End of file" msgstr "Fin de fichier" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "DEBUG" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "AVERTISSEMENT" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "ERREUR" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "AUCUN" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "INVALIDE" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "adresse inconnue" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "adresse invalide" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" msgstr "" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Erreur de lecture : « %s » : %s" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 msgid "Creating a new private key. This may take a while.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 msgid "Could not load peer's private key\n" msgstr "" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, c-format msgid "Expected `%s' to be a directory!\n" msgstr "" @@ -8182,134 +8186,134 @@ msgstr "" msgid "Missing mandatory option `%s'.\n" msgstr "" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" msgstr "" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "fornat invalide : « %s »\n" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "fornat invalide : « %s »\n" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 msgid "print available configuration sections" msgstr "" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 msgid "Manipulate GNUnet configuration files" msgstr "" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, c-format msgid "Failed to open `%s': %s\n" msgstr "" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, c-format msgid "Generating %u keys like %s, please wait" msgstr "" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, c-format msgid "" "\n" "Failed to write to `%s': %s\n" msgstr "" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, c-format msgid "" "\n" @@ -8318,559 +8322,559 @@ msgstr "" "\n" "Terminé !\n" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, c-format msgid "Hostkeys file `%s' not found\n" msgstr "" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, c-format msgid "Could not read hostkey file: %s\n" msgstr "" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 msgid "Manipulate GNUnet private ECC key files" msgstr "" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 msgid "Manipulate GNUnet proof of work files" msgstr "" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, c-format msgid "Error reading from `%s': %s\n" msgstr "" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, c-format msgid "Error writing to `%s': %s\n" msgstr "" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 msgid "Could not determine plugin installation path.\n" msgstr "" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Résolution de « %s » échouée : %s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVICE_client_continue' after %s\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "o" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "µs" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "perpetuel" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "0 ms" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "ms" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "s" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "m" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "h" -#: src/util/strings.c:739 +#: src/util/strings.c:734 msgid "day" msgstr "jour" -#: src/util/strings.c:741 +#: src/util/strings.c:736 msgid "days" msgstr "jours" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "fin du temps" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, c-format msgid "Malformed port policy `%s'\n" msgstr "" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "" -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, c-format msgid "Invalid format: `%s'\n" msgstr "fornat invalide : « %s »\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, c-format msgid "Wrong format `%s' for network\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 msgid "# Active channels" msgstr "# Canaux actifs" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 msgid "# Messages dropped in cadet queue (overflow)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 msgid "# ICMP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 msgid "# UDP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 msgid "# TCP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 msgid "# Cadet channels created" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 msgid "# Packets dropped (channel not yet online)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 msgid "# Packets received from TUN interface" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 msgid "# Active destinations" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 msgid "Must specify valid IPv6 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 msgid "Must specify valid IPv4 address" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 msgid "Error creating tunnel\n" msgstr "Erreur de création du tunnel\n" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, c-format msgid "`%s' is not a valid IP address.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 msgid "service is offered via TCP" msgstr "" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 msgid "service is offered via UDP" msgstr "" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "Configurer des tunnels via VPN." -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 msgid "Failed to connect to the namestore!\n" msgstr "" -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index a512b655d4..51942f9b70 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNUnet 0.7.0b\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2006-01-21 17:16+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -16,1042 +16,1042 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, fuzzy, c-format msgid "Failed to remove configuration file %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, fuzzy, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 msgid "Message was sent successfully" msgstr "" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 #, fuzzy msgid "We disconnected from ARM before we could send a request" msgstr "# av anslutna parter" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 #, fuzzy msgid "Unknown request status" msgstr "Okänd operation \"%s\"\n" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "# byte krypterade" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 #, fuzzy msgid "is starting" msgstr "\"%s\" startar\n" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 #, fuzzy msgid "is stopping" msgstr "# byte krypterade" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 #, fuzzy msgid "is starting already" msgstr "\"%s\" startar\n" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 #, fuzzy msgid "is stopping already" msgstr "\"%s\" startar\n" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 #, fuzzy msgid "is started already" msgstr "\"%s\" startar\n" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 #, fuzzy msgid "is stopped already" msgstr "\"%s\" startar\n" -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 #, fuzzy msgid "service is not known to ARM" msgstr "\"%s\" är inte en fil.\n" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "Misslyckades att starta samling.\n" -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 msgid "service cannot be manipulated because ARM is shutting down" msgstr "" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "Okänd operation \"%s\"\n" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, fuzzy, c-format msgid "Failed to start the ARM service: %s\n" msgstr "Misslyckades att starta samling.\n" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, fuzzy, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, fuzzy, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, fuzzy, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "Misslyckades att starta samling.\n" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, fuzzy, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, fuzzy, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "Fel vid %s:%d.\n" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, fuzzy, c-format msgid "Failed to request a list of services: %s\n" msgstr "Misslyckades att starta samling.\n" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 #, fuzzy msgid "Error communicating with ARM. ARM not running?\n" msgstr "Skriv ut information om GNUnets motparter." -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 #, fuzzy msgid "Running services:\n" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, fuzzy, c-format msgid "Starting %s...\n" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, fuzzy, c-format msgid "Unknown status %u for service %s.\n" msgstr "Okänd operation \"%s\"\n" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 msgid "stop all GNUnet services" msgstr "" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 msgid "start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 msgid "stop and start all GNUnet default services" msgstr "" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 #, fuzzy msgid "list currently running services" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, fuzzy, c-format msgid "Using `%s' instead\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " "domain socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, fuzzy, c-format msgid "Failed to start service `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, fuzzy, c-format msgid "Starting service `%s'\n" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, fuzzy, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "Kunde inte skapa användarkonto:" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, fuzzy, c-format msgid "Preparing to stop `%s'\n" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, fuzzy, c-format msgid "Restarting service `%s'.\n" msgstr "Startade samling \"%s\".\n" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 #, fuzzy msgid "unknown" msgstr "Okänt fel" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, fuzzy, c-format msgid "Service `%s' took %s to terminate\n" msgstr "Tjänst borttagen.\n" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 msgid "solver to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 #, fuzzy msgid "print logging" msgstr "Startade samling \"%s\".\n" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, fuzzy, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, fuzzy, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, fuzzy, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " "%llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " "must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, fuzzy, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 msgid "Stop logging\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, fuzzy, c-format msgid "Start logging `%s'\n" msgstr "Startade samling \"%s\".\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " "= %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, fuzzy, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" "s, %s\n" msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, fuzzy, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "Tillgängliga transport(er): %s\n" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, fuzzy, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 #, fuzzy msgid "Cannot connect to ATS service, exiting...\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 #, fuzzy msgid "Cannot issue request to ATS service, exiting...\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 #, fuzzy msgid "No preference type given!\n" msgstr "Skriv ut information om GNUnets motparter." -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 msgid "No peer given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 msgid "Valid type required\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 #, fuzzy msgid "do not resolve IP addresses to hostnames" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 #, fuzzy msgid "set preference for the given peer" msgstr "Skriv ut information om GNUnets motparter." -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 #, fuzzy msgid "Print information about ATS state" msgstr "Skriv ut information om GNUnets motparter." -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 msgid "public auction outcome" msgstr "" -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 #, fuzzy msgid "help text" msgstr "hjälptext för -t" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, fuzzy, c-format msgid "Invalid peer ID `%s'\n" msgstr "Ogiltiga argument: " -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, fuzzy, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, fuzzy, c-format msgid "Invalid target `%s'\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 #, fuzzy msgid "No action requested\n" msgstr "Samling stoppad.\n" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 #, fuzzy msgid "Provide information about a particular connection" msgstr "Skriv ut information om GNUnets motparter." -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 #, fuzzy msgid "Provide information about a patricular peer" msgstr "Skriv ut information om GNUnets motparter." -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 #, fuzzy msgid "Provide information about all peers" msgstr "Skriv ut information om GNUnets motparter." -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 #, fuzzy msgid "Provide information about a particular tunnel" msgstr "Skriv ut information om GNUnets motparter." -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 #, fuzzy msgid "Provide information about all tunnels" msgstr "Skriv ut information om GNUnets motparter." -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 #, fuzzy msgid "number of peers in consensus" msgstr "antal iterationer" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 #, fuzzy msgid "number of values" msgstr "antal iterationer" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 #, fuzzy msgid "consensus timeout" msgstr "# sessionsnycklar accepterade" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 msgid "write statistics to file" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "Okänd operation \"%s\"\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "tillåter klienter att fastställa gnunetds konfiguration" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Pseudonym \"%s\" togs bort.\n" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Du måste ange en lista av filer att lägga in.\n" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Misslyckades att starta samling.\n" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1059,15 +1059,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1077,5635 +1077,5640 @@ msgstr "" msgid "pa_stream_write() failed: %s\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 #, fuzzy msgid "Connection established.\n" msgstr "Samling stoppad.\n" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, fuzzy, c-format msgid "pa_stream_new() failed: %s\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, fuzzy, c-format msgid "Connection failure: %s\n" msgstr " Anslutning misslyckades (fel?)\n" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 msgid "Wrong Spec\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 #, fuzzy msgid "pa_mainloop_new() failed.\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 #, fuzzy msgid "pa_context_new() failed.\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, fuzzy, c-format msgid "pa_context_connect() failed: %s\n" msgstr "# av anslutna parter" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 #, fuzzy msgid "pa_mainloop_run() failed.\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, fuzzy, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "# av anslutna parter" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, fuzzy, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 #, fuzzy msgid "Stream successfully created.\n" msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, fuzzy, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, fuzzy, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, fuzzy, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 #, fuzzy msgid "ogg_stream_init() failed.\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, fuzzy, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, fuzzy, c-format msgid "Could not open line, port %s already in use!\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 #, fuzzy msgid "Could not start record audio helper\n" msgstr "Kunde inte komma åt namnrymdsinformation.\n" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, c-format msgid "PHONE version %u not supported\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, fuzzy, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 #, fuzzy msgid "Could not start playback audio helper.\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 #, fuzzy msgid "fresh connection" msgstr "# av anslutna parter" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 #, fuzzy msgid "key received" msgstr "# sessionnycklar vägrade" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 #, fuzzy msgid "connection established" msgstr "Samling stoppad.\n" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 msgid "Connection to CORE service lost (reconnecting)" msgstr "" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "Okänt fel" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, fuzzy, c-format msgid "Invalid command line argument `%s'\n" msgstr "Ogiltiga kommandoradsargument:\n" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 #, fuzzy msgid "Failed to connect to CORE service!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 #, fuzzy msgid "provide information about all current connections (continuously)" msgstr "Skriv ut information om GNUnets motparter." -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 #, fuzzy msgid "Print information about connected peers." msgstr "Skriv ut information om GNUnets motparter." -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 msgid "# send requests dropped (disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, fuzzy, c-format msgid "# bytes of messages of type %u received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 #, fuzzy msgid "# messages discarded (session disconnected)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, fuzzy, c-format msgid "# messages of type %u discarded (client busy)" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 #, fuzzy msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, fuzzy, c-format msgid "Core service of `%s' ready.\n" msgstr "\"%s\" är inte en fil.\n" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "# byte krypterade" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "# byte dekrypterade" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 #, fuzzy msgid "# PING messages transmitted" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 #, fuzzy msgid "# duplicate ephemeral keys ignored" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 #, fuzzy msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 #, fuzzy msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 #, fuzzy msgid "# valid ephemeral keys received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 #, fuzzy msgid "# PING messages received" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 #, fuzzy msgid "# PONG messages created" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 #, fuzzy msgid "# sessions terminated by timeout" msgstr "# byte kastade via TCP (utgående)" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 #, fuzzy msgid "# keepalive messages sent" msgstr "# PING-meddelanden i klartext skickade" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 #, fuzzy msgid "# PONG messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 #, fuzzy msgid "# PONG messages decrypted" msgstr "# PING-meddelanden skapade" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# sessionnycklar vägrade" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# byte mottogs via TCP" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 #, fuzzy msgid "# rekey operations confirmed via PONG" msgstr "# sessionnycklar vägrade" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 #, fuzzy msgid "# DATA message dropped (out of order)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 #, fuzzy msgid "# sessions terminated by key expiration" msgstr "# byte kastade via TCP (utgående)" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 #, fuzzy msgid "# bytes dropped (duplicates)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 #, fuzzy msgid "# bytes dropped (out of sequence)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 #, fuzzy msgid "# bytes dropped (ancient message)" msgstr "# byte kastade via UDP (utgående)" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 #, fuzzy msgid "# bytes of payload decrypted" msgstr "# byte dekrypterade" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 #, fuzzy msgid "# peers connected" msgstr "# av anslutna parter" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 msgid "# type map refreshes sent" msgstr "" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 #, fuzzy msgid "# outdated typemap confirmations received" msgstr "Kunde inte spara konfiguration!" -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 #, fuzzy msgid "# valid typemap confirmations received" msgstr "Kunde inte spara konfiguration!" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 #, fuzzy msgid "# type maps received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, fuzzy, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, fuzzy, c-format msgid "Ego `%s' not known to identity service\n" msgstr "\"%s\": okänd tjänst: %s\n" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, fuzzy, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, fuzzy, c-format msgid "Issuer public key not well-formed\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, c-format msgid "ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, fuzzy, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, c-format msgid "Issuer ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 #, fuzzy msgid "The public key of the subject to lookup the credential for" msgstr "ange prioritet för innehållet" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 #, fuzzy msgid "The public key of the authority to verify the credential against" msgstr "ange prioritet för innehållet" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 #, fuzzy msgid "The ego to use" msgstr "meddelandestorlek" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 #, fuzzy msgid "GNUnet credential resolver tool" msgstr "Spåra GNUnets nätverkstopologi." -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, fuzzy, c-format msgid "Failed to connect to namestore\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 #, fuzzy msgid "GNS REST API initialized\n" msgstr " Anslutning misslyckades\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 #, fuzzy msgid "# bytes stored" msgstr "# byte krypterade" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 #, fuzzy msgid "# items stored" msgstr "# byte krypterade" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 #, fuzzy msgid "# requests received" msgstr "# byte mottogs via TCP" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 #, fuzzy msgid "# requests for random value received" msgstr "# byte mottogs via TCP" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 #, fuzzy msgid "# proximity search requests received" msgstr "# klartext PONG-meddelanden mottagna" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 msgid "Heap datacache running\n" msgstr "" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 #, fuzzy msgid "# queue entries created" msgstr "# PING-meddelanden skapade" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 #, fuzzy msgid "# status messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 #, fuzzy msgid "# Results received" msgstr "# byte mottogs via TCP" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 #, fuzzy msgid "# datastore connections (re)created" msgstr "Nätverksanslutning" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 msgid "# PUT requests executed" msgstr "" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 msgid "# RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 msgid "# REMOVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 msgid "# GET requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 #, fuzzy msgid "Error queueing datastore GET operation\n" msgstr "Fel vid skapandet av användare" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, fuzzy, c-format msgid "Failed to store item: %s, aborting\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, c-format msgid "Inserted % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 #, fuzzy msgid "Error queueing datastore PUT operation\n" msgstr "Fel vid skapandet av användare" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 #, fuzzy msgid "Failed connecting to the datastore.\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 #, fuzzy msgid "Dump all records from the datastore" msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 #, fuzzy msgid "Insert records into the datastore" msgstr "# byte krypterade" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 #, fuzzy msgid "Manipulate GNUnet datastore" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 #, fuzzy msgid "# bytes expired" msgstr "# byte mottogs via TCP" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " "%llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " "bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 #, fuzzy msgid "# GET requests received" msgstr "# byte mottogs via TCP" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 #, fuzzy msgid "# GET KEY requests received" msgstr "# byte mottogs via TCP" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 msgid "# requests filtered by bloomfilter" msgstr "" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 msgid "# GET REPLICATION requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 msgid "# GET ZERO ANONYMITY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 #, fuzzy msgid "Content not found" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 #, fuzzy msgid "# REMOVE requests received" msgstr "# byte mottogs via TCP" -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, fuzzy, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, fuzzy, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "# byte krypterade" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, fuzzy, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 #, fuzzy msgid "Failed to initialize bloomfilter.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 msgid "Heap database running\n" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 #, fuzzy msgid "Data too large" msgstr "antal iterationer" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, fuzzy, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 #, fuzzy msgid "Failed to drop table from database.\n" msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, fuzzy, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, fuzzy, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 msgid "Sqlite database running\n" msgstr "" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, c-format msgid "Result %d, type %d:\n" msgstr "" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, fuzzy, c-format msgid "Exiting as the number of peers is %u\n" msgstr "Maximalt antal chattklienter uppnått.\n" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 #, fuzzy msgid "number of peers to start" msgstr "antal iterationer" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 #, fuzzy msgid "Measure quality and performance of the DHT service." msgstr "Kan inte tillgå tjänsten" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 #, fuzzy msgid "# GET requests from clients injected" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 #, fuzzy msgid "# PUT requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 #, fuzzy msgid "# GET requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 #, fuzzy msgid "# RESULTS queued for clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, fuzzy, c-format msgid "%s request received, but have no datacache!\n" msgstr "# byte mottagna av typen %d" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 #, fuzzy msgid "# GET requests given to datacache" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 #, fuzzy msgid "# HELLOs obtained from peerinfo" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 #, fuzzy msgid "# FIND PEER messages initiated" msgstr "# PING-meddelanden skapade" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 #, fuzzy msgid "# requests TTL-dropped" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 msgid "# Peer selection failed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 #, fuzzy msgid "# PUT requests routed" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 #, fuzzy msgid "# PUT messages queued for transmission" msgstr "# PING-meddelanden skapade" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 #, fuzzy msgid "# P2P messages dropped due to full queue" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 #, fuzzy msgid "# GET requests routed" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 #, fuzzy msgid "# GET messages queued for transmission" msgstr "# PING-meddelanden skapade" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 #, fuzzy msgid "# RESULT messages queued for transmission" msgstr "# PING-meddelanden skapade" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 #, fuzzy msgid "# P2P PUT requests received" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 #, fuzzy msgid "# P2P PUT bytes received" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 #, fuzzy msgid "# P2P GET requests received" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 #, fuzzy msgid "# P2P GET bytes received" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 #, fuzzy msgid "# P2P FIND PEER requests processed" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 #, fuzzy msgid "# P2P GET requests ONLY routed" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 #, fuzzy msgid "# P2P RESULTS received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 #, fuzzy msgid "# P2P RESULT bytes received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 #, fuzzy msgid "# Network size estimates received" msgstr "# byte mottogs via TCP" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 #, fuzzy msgid "# DHT requests combined" msgstr "# byte mottogs via TCP" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Ingen transport av typ %d är känd.\n" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, fuzzy, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "Kunde inte köra \"%s\": %s\n" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 #, fuzzy msgid "# DNS requests received via TUN interface" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 #, fuzzy msgid "Print information about DV state" msgstr "Skriv ut information om GNUnets motparter." -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# byte skickade via UDP" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 #, fuzzy msgid "# Bytes received from CADET" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# byte mottogs via TCP" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# PING-meddelanden skapade" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# byte skickade av typen %d" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 #, fuzzy msgid "# Packets received from TUN" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 #, fuzzy msgid "# Bytes received from TUN" msgstr "# byte mottagna via HTTP" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 #, fuzzy msgid "# fragments received" msgstr "# byte mottogs via TCP" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 #, fuzzy msgid "# duplicate fragments received" msgstr "# byte mottogs via TCP" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 #, fuzzy msgid "# fragments transmitted" msgstr "# byte skickade av typen %d" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 #, fuzzy msgid "# fragments retransmitted" msgstr "# byte skickade av typen %d" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 #, fuzzy msgid "# fragments wrap arounds" msgstr "# byte skickade av typen %d" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 msgid "# fragment acknowledgements received" msgstr "" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 #, fuzzy msgid "# fragmentation transmissions completed" msgstr "# klartext PONG-meddelanden mottagna" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, fuzzy, c-format msgid "Could not open file `%s': %s" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, fuzzy, c-format msgid "Could not read file `%s': %s" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, fuzzy, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, fuzzy, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, fuzzy, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, fuzzy, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, fuzzy, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 #, fuzzy msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 #, fuzzy msgid "internal error decoding tree" msgstr "=\tFel vid läsning av katalog.\n" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 #, fuzzy msgid "Invalid URI" msgstr "Ogiltiga argument: " -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " "`unknown' instead.\n" msgstr "" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, fuzzy, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, fuzzy, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, fuzzy, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, fuzzy, c-format msgid "Failed to write `%s': %s\n" msgstr "Fel vid %s:%d.\n" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, fuzzy, c-format msgid "Failed to read `%s': %s\n" msgstr "Fel vid %s:%d.\n" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 #, fuzzy msgid "Failed to connect to datastore." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, fuzzy, c-format msgid "Publishing failed: %s" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, fuzzy, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 #, fuzzy msgid "error on index-start request to `fs' service" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 msgid "filename too long" msgstr "" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 #, fuzzy msgid "could not connect to `fs' service" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, fuzzy, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, fuzzy, c-format msgid "Recursive upload failed at `%s': %s" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, fuzzy, c-format msgid "Recursive upload failed: %s" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 msgid "needs to be an actual file" msgstr "" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr " Anslutning misslyckades (fel?)\n" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 #, fuzzy msgid "Could not connect to datastore." msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 #, fuzzy msgid "Internal error." msgstr "Okänt fel.\n" -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Fil \"%s\" har URI: %s\n" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 #, fuzzy msgid "Failed to read file" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 #, fuzzy msgid "Error communicating with `fs' service." msgstr "Skriv ut information om GNUnets motparter." -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 #, fuzzy msgid "Failed to connect to FS service for unindexing." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 #, fuzzy msgid "Failed to get KSKs from directory scan." msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, fuzzy, c-format msgid "Internal error scanning `%s'.\n" msgstr "=\tFel vid läsning av katalog.\n" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, fuzzy, c-format msgid "Failed to remove UBlock: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 #, fuzzy msgid "Failed to connect to `datastore' service." msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 #, fuzzy msgid "Failed to open file for unindexing." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 #, fuzzy msgid "Failed to compute hash of file." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, fuzzy, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 #, fuzzy msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 #, fuzzy msgid "Malformed KSK URI (`++' not allowed)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 #, fuzzy msgid "Malformed KSK URI (quotes not balanced)" msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "Inga nyckelord angivna!\n" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, fuzzy, c-format msgid "Failed to load state: %s\n" msgstr "Misslyckades att starta samling.\n" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, fuzzy, c-format msgid "Failed to save state to file %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, fuzzy, c-format msgid "Publishing `%s'\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, fuzzy, c-format msgid "Failed to run `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, fuzzy, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "ange prioritet för innehållet" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 msgid "Automatically publish files from a directory on GNUnet" msgstr "" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, fuzzy, c-format msgid "Directory `%s' meta data:\n" msgstr "==> Katalog \"%s\":\n" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, fuzzy, c-format msgid "Directory `%s' contents:\n" msgstr "==> Katalog \"%s\":\n" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 #, fuzzy msgid "You must specify a filename to inspect.\n" msgstr "Du måste ange en lista av filer att lägga in.\n" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, fuzzy, c-format msgid "Failed to read directory `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, fuzzy, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 #, fuzzy msgid "Display contents of a GNUnet directory" msgstr "Filformatsfel (inte en GNUnet-katalog?)\n" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Startade samling \"%s\".\n" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 #, fuzzy msgid "" msgstr "Okänt fel" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Fel vid nedladdning: %s\n" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Uppladdning vägrades!" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Fil \"%s\" har URI: %s\n" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "skriv filen till FILNAMN" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "hämta en GNUnet-katalog rekursivt" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 #, fuzzy msgid "Special file-sharing operations" msgstr "Visa alla alternativ" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, fuzzy, c-format msgid "Error publishing: %s.\n" msgstr "Fel vid nedladdning: %s\n" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, fuzzy, c-format msgid "URI is `%s'.\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, fuzzy, c-format msgid "Namespace URI is `%s'.\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 #, fuzzy msgid "Starting cleanup after abort\n" msgstr "\"%s\" uppstart klar.\n" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 #, fuzzy msgid "Cleanup after abort completed.\n" msgstr "\"%s\" uppstart klar.\n" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 #, fuzzy msgid "Cleanup after abort failed.\n" msgstr "\"%s\" uppstart klar.\n" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, fuzzy, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "Uppdaterar data för modul \"%s\"\n" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, fuzzy, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "Nyckelord för fil \"%s\":\n" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 #, fuzzy msgid "Could not publish\n" msgstr "Kunde inte köra \"%s\": %s\n" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 #, fuzzy msgid "Could not start publishing.\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, fuzzy, c-format msgid "Scanning directory `%s'.\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, fuzzy, c-format msgid "Scanning file `%s'.\n" msgstr "Startade samling \"%s\".\n" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 #, fuzzy msgid "Preprocessing complete.\n" msgstr "Nedstängning klar.\n" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, fuzzy, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "Uppdaterar data för modul \"%s\"\n" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 #, fuzzy msgid "Internal error scanning directory.\n" msgstr "=\tFel vid läsning av katalog.\n" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, fuzzy, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "Namnrymd \"%s\" skapad(rot: %s).\n" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, fuzzy, c-format msgid "Failed to access `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, fuzzy, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, fuzzy, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, fuzzy, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, fuzzy, c-format msgid "Error searching: %s.\n" msgstr "Fel vid lämning av DHT.\n" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 #, fuzzy msgid "Could not create keyword URI from arguments.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 #, fuzzy msgid "Could not start searching.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 msgid "Search GNUnet for files that were published on GNUnet" msgstr "" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 #, fuzzy msgid "# client searches active" msgstr "# klartext PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 #, fuzzy msgid "# replies received for local clients" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 msgid "# Loopback routes suppressed" msgstr "" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 #, fuzzy msgid "# client searches received" msgstr "# klartext PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 #, fuzzy msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 #, fuzzy msgid "# replies received via cadet" msgstr "# byte mottagna av typen %d" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 #, fuzzy msgid "# replies received via cadet dropped" msgstr "# byte mottagna av typen %d" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 #, fuzzy msgid "# queries received via CADET not answered" msgstr "# byte mottogs via TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 #, fuzzy msgid "# Blocks transferred via cadet" msgstr "# byte skickade av typen %d" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 #, fuzzy msgid "# queries received via cadet" msgstr "# byte mottogs via TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 #, fuzzy msgid "# cadet client connections rejected" msgstr "Nätverksanslutning" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr "Nätverksanslutning" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 #, fuzzy msgid "# migration stop messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 #, fuzzy msgid "# replies dropped due to type mismatch" msgstr "# byte mottagna av typen %d" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 #, fuzzy msgid "# replies received for other peers" msgstr "# byte mottagna av typen %d" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 msgid "# requests done for free (low load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 msgid "# request dropped, priority insufficient" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 msgid "# requests done for a price (normal load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 msgid "# requests dropped due to higher-TTL request" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 #, fuzzy msgid "# migration stop messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, fuzzy, c-format msgid "Could not open `%s'.\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, fuzzy, c-format msgid "Error writing `%s'.\n" msgstr "Fel vid skapandet av användare" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, fuzzy, c-format msgid "Failed to delete bogus block: %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, fuzzy, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 #, fuzzy msgid "not indexed" msgstr "Avindexering misslyckades." -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, fuzzy, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "Indexering av data misslyckades vid position %i.\n" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " "anyway.\n" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 msgid "# average retransmission delay (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 msgid "# delay heap timeout (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query plans executed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 #, fuzzy msgid "# query messages sent to other peers" msgstr "# byte skickade av typen %d" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 #, fuzzy msgid "# requests merged" msgstr "# byte mottogs via TCP" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 #, fuzzy msgid "# requests refreshed" msgstr "# byte mottogs via TCP" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 #, fuzzy msgid "# Pending requests created" msgstr "# byte mottogs via TCP" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 msgid "# Pending requests active" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 #, fuzzy msgid "# replies received and matched" msgstr "# byte mottagna av typen %d" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 msgid "# irrelevant replies discarded" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 msgid "# results found locally" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 #, fuzzy msgid "# storage requests dropped due to high load" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 #, fuzzy msgid "# Replies received from DHT" msgstr "# byte mottagna via HTTP" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 #, fuzzy msgid "# Replies received from CADET" msgstr "# byte mottagna via HTTP" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 #, fuzzy msgid "# GAP PUT messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, fuzzy, c-format msgid "Error unindexing: %s.\n" msgstr "" "\n" "Fel vid avindexering av fil: %s\n" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 #, fuzzy msgid "Unindexing done.\n" msgstr "Avindexera filer." -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, fuzzy, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 #, fuzzy msgid "Could not start unindex operation.\n" msgstr "Kunde inte komma åt namnrymdsinformation.\n" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, fuzzy, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "Ogiltiga argument. Avslutar.\n" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, fuzzy, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "Misslyckades att starta samling.\n" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, fuzzy, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "Misslyckades att starta samling.\n" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, fuzzy, c-format msgid "Cannot parse DNS request from %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, fuzzy, c-format msgid "Received malformed DNS request from %s\n" msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, fuzzy, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Mottog okänd typ av begäran %d vid %s:%d\n" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 #, fuzzy msgid "No DNS server specified!\n" msgstr "Inga nyckelord angivna!\n" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 #, fuzzy msgid "Specify the type of the record to lookup" msgstr "ange prioritet för innehållet" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 #, fuzzy msgid "GNUnet GNS resolver tool" msgstr "Spåra GNUnets nätverkstopologi." -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, fuzzy, c-format msgid "Failed to connect to identity service\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, fuzzy, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Kunde inte skapa användarkonto:" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, fuzzy, c-format msgid "Unable to import certificate from `%s'\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 #, fuzzy msgid "Properly base32-encoded public key required" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, fuzzy, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, fuzzy, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, fuzzy, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, fuzzy, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, fuzzy, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, fuzzy, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, fuzzy, c-format msgid "Unable to parse MX record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, fuzzy, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, fuzzy, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, fuzzy, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, fuzzy, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, fuzzy, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, fuzzy, c-format msgid "Error accessing file `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, fuzzy, c-format msgid "Error opening file `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, fuzzy, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "%d filer hittades i katalog.\n" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, fuzzy, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 #, fuzzy msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "Kunde inte spara konfiguration!" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 #, fuzzy msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "Kunde inte spara konfiguration!" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 #, fuzzy msgid "Failed to parse HELLO message: malformed\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 #, fuzzy msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, fuzzy, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 msgid "advertise our hostlist to other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 msgid "enable learning about hostlist servers from other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 msgid "provide a hostlist server" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Ogiltigt meddelande mottogs den %s:%d." -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "" "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, fuzzy, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 #, fuzzy msgid "# active connections" msgstr "Nätverksanslutning" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "antal meddelanden att använda per iteration" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 #, fuzzy msgid "bytes in hostlist" msgstr "# byte krypterade" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Skriv ut information om GNUnets motparter." -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 msgid "hostlist requests refused (not HTTP GET)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 msgid "hostlist requests refused (upload data)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 msgid "hostlist requests refused (not ready)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 msgid "Received request for our hostlist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 msgid "hostlist requests processed" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 msgid "# hostlist advertisements send" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 #, fuzzy msgid "Could not access PEERINFO service. Exiting.\n" msgstr "Kunde inte komma åt namnrymdsinformation.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, fuzzy, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "Ogiltiga argument. Avslutar.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, fuzzy, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, fuzzy, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, fuzzy, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, fuzzy, c-format msgid "Failed to create ego: %s\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, fuzzy, c-format msgid "Failed to set default ego: %s\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, fuzzy, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, fuzzy, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, fuzzy, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, fuzzy, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 #, fuzzy msgid "Identity REST API initialized\n" msgstr " Anslutning misslyckades\n" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 #, fuzzy msgid "Ego is required\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 #, fuzzy msgid "Requesting party key is required!\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "Misslyckades att starta samling.\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 #, fuzzy msgid "Identity Provider REST API initialized\n" msgstr " Anslutning misslyckades\n" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, fuzzy, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, fuzzy, c-format msgid "Could not access file `%s': %s\n" msgstr "Kunde inte köra \"%s\": %s\n" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, fuzzy, c-format msgid "No records found for `%s'" msgstr "%d filer hittades i katalog.\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, fuzzy, c-format msgid "You must specify which zone should be accessed\n" msgstr "anger vilken TRANSPORT som ska testas" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, fuzzy, c-format msgid "You must specify a name\n" msgstr "Du måste ange en mottagare!\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 #, fuzzy msgid "spezifies the public key of the zone to look in" msgstr "ange prioritet för innehållet" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet-konfiguration" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 #, fuzzy msgid "Error communicating with namecache service" msgstr "Skriv ut information om GNUnets motparter." -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 msgid "flat plugin running\n" msgstr "" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, fuzzy, c-format msgid "Adding record failed: %s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "" "\n" "Fel vid uppladdning av fil: %s\n" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, fuzzy, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Ogiltiga argument: " -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Ogiltiga argument: " -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, fuzzy, c-format msgid "No default ego configured in identity service\n" msgstr "\"%s\": okänd tjänst: %s\n" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 #, fuzzy msgid "set the desired nick name for the zone" msgstr "Skriv ut information om GNUnets motparter." -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 #, fuzzy msgid "monitor changes in the namestore" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 #, fuzzy msgid "determine our name for the given PKEY" msgstr "Skriv ut information om GNUnets motparter." -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 #, fuzzy msgid "name of the ego controlling the zone" msgstr "Visa värde av alternativet" -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, fuzzy, c-format msgid "Unsupported form value `%s'\n" msgstr "Kommando \"%s\" stöds ej. Avbryter.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, fuzzy, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, fuzzy, c-format msgid "Failed to create page for `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, fuzzy, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 #, fuzzy msgid "Failed to start HTTP server\n" msgstr "Misslyckades att starta samling.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 #, fuzzy msgid "Failed to connect to identity\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 msgid "flat file database running\n" msgstr "" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "Fel vid %s:%d.\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 #, fuzzy msgid "Namestore REST API initialized\n" msgstr " Anslutning misslyckades\n" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 #, fuzzy msgid "Suggested configuration changes:\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "Kunde inte spara konfiguration!" -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, fuzzy, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "GNUnet-konfiguration" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 #, fuzzy msgid "write configuration file (for autoconfiguration)" msgstr "Inga applikationer definierade i konfiguration!\n" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 #, fuzzy msgid "GNUnet NAT traversal autoconfiguration" msgstr "GNUnet-konfiguration" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 #, fuzzy msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 #, fuzzy msgid "NAT test failed to start NAT library\n" msgstr "Misslyckades att starta samling.\n" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 #, fuzzy msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 #, fuzzy msgid "Testing connection reversal with ICMP server.\n" msgstr "Skriv ut information om GNUnets motparter." -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, fuzzy, c-format msgid "Detected external IP `%s'\n" msgstr "Mottog ogiltig RPC \"%s\".\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, c-format msgid "Detected internal network address `%s'.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 #, fuzzy msgid "upnpc not found\n" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 #, fuzzy msgid "`upnpc` command not found" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 #, fuzzy msgid "Failed to run `upnpc` command" msgstr "Misslyckades att starta samling.\n" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 #, fuzzy msgid "`upnpc' command took too long, process killed" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 #, fuzzy msgid "`external-ip' command not found" msgstr "Kommando \"%s\" hittades inte!\n" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 #, fuzzy msgid "Failed to run `external-ip` command" msgstr "Misslyckades att starta samling.\n" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 msgid "`external-ip' command output invalid" msgstr "" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 #, fuzzy msgid "Could not determine interface with internal/local network address" msgstr "Kunde inte fastställa min publika IPv6-adress.\n" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 msgid "No functioning gnunet-helper-nat-server installation found" msgstr "" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 msgid "No working gnunet-helper-nat-client installation found" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Samling stoppad.\n" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, fuzzy, c-format msgid "Failed to start %s\n" msgstr "Misslyckades att starta samling.\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 #, fuzzy msgid "Show network size estimates from NSE service." msgstr "# byte mottogs via TCP" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 #, fuzzy msgid "limit to the number of connections to NSE services, 0 for none" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 #, fuzzy msgid "Measure quality and performance of the NSE service." msgstr "Kan inte tillgå tjänsten" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 msgid "Value is too large.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, fuzzy, c-format msgid "Removing expired address of transport `%s'\n" msgstr "Tillgängliga transport(er): %s\n" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, fuzzy, c-format msgid "Scanning directory `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, fuzzy, c-format msgid "Cleaning up directory `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 #, fuzzy msgid "Failed to receive response from `PEERINFO' service." msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, fuzzy, c-format msgid "%sPeer `%s'\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, fuzzy, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, c-format msgid "Failure: Received invalid %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, fuzzy, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 msgid "list all known peers" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 #, fuzzy msgid "Print information about peers." msgstr "Skriv ut information om GNUnets motparter." -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, fuzzy, c-format msgid "Starting transport plugins `%s'\n" msgstr "Testar transport(er) %s\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, fuzzy, c-format msgid "Loading `%s' transport plugin\n" msgstr "Testar transport(er) %s\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, fuzzy, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 #, fuzzy msgid "Unexpected iteration response, this should not happen.\n" msgstr "Utdataformat är inte känt, detta bör inte hända.\n" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 #, fuzzy msgid "Received a malformed response from service." msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, fuzzy, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "Fel vid skapandet av användare" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, fuzzy, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "Fel vid skapandet av användare" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, fuzzy, c-format msgid "Unable to create indices: %s.\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, fuzzy, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 #, fuzzy msgid "Failed to store membership information!\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 #, fuzzy msgid "Failed to test membership!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "Misslyckades att starta samling.\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 #, fuzzy msgid "Failed to get fragment!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 #, fuzzy msgid "Failed to get message!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 #, fuzzy msgid "Failed to get message fragment!\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 #, fuzzy msgid "Failed to get master counters!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "Misslyckades att starta samling.\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "Misslyckades att starta samling.\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 #, fuzzy msgid "Failed to end modifying state!\n" msgstr "Misslyckades att starta samling.\n" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 #, fuzzy msgid "Failed to begin synchronizing state!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 #, fuzzy msgid "Failed to end synchronizing state!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 #, fuzzy msgid "Failed to reset state!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 #, fuzzy msgid "Failed to get state variable!\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 msgid "SQLite database running\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 #, fuzzy msgid "Failed to pack DNS request. Dropping.\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 #, fuzzy msgid "# DNS requests mapped to VPN" msgstr "# byte mottogs via TCP" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 msgid "# DNS replies intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 #, fuzzy msgid "Failed to parse DNS request. Dropping.\n" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 #, fuzzy msgid "# DNS requests dropped (timeout)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 #, fuzzy msgid "# DNS requests intercepted" msgstr "# byte mottogs via TCP" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 #, fuzzy msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "# byte mottogs via TCP" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 #, fuzzy msgid "# DNS requests dropped (malformed)" msgstr "# byte mottogs via TCP" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 #, fuzzy msgid "# DNS replies received" msgstr "# byte mottogs via TCP" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 #, fuzzy msgid "# DNS replies dropped (too late?)" msgstr "# byte mottagna av typen %d" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, fuzzy, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, fuzzy, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 #, fuzzy msgid "No configuration file given. Exiting\n" msgstr "använd konfigurationsfil FILNAMN" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, fuzzy, c-format msgid "No files found in `%s'\n" msgstr "%d filer hittades i katalog.\n" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 #, fuzzy msgid "Error loading search strings. Exiting.\n" msgstr "Fel vid lämning av DHT.\n" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 #, fuzzy msgid "name of the file for writing statistics" msgstr "Visa värde av alternativet" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 #, fuzzy msgid "name of file with input strings" msgstr "Visa värde av alternativet" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 #, fuzzy msgid "name of file with hosts' names" msgstr "Visa värde av alternativet" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 #, fuzzy msgid "name of the table to write DFAs" msgstr "Visa värde av alternativet" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, fuzzy, c-format msgid "Regex `%s' is too long!\n" msgstr "\"%s\" är inte en fil.\n" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, fuzzy, c-format msgid "Search string `%s' is too long!\n" msgstr "\"%s\" är inte en fil.\n" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 #, fuzzy msgid "GNUnet REST server" msgstr "Spåra GNUnets nätverkstopologi." -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, fuzzy, c-format msgid "Key `%s' is valid\n" msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, fuzzy, c-format msgid "Key `%s' has been revoked\n" msgstr "Tjänst borttagen.\n" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 #, fuzzy msgid "Internal error\n" msgstr "Okänt fel.\n" -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 #, fuzzy msgid "Revocation failed (!)\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, fuzzy, c-format msgid "Ego `%s' not found.\n" msgstr "\"%s\" misslyckades: tabell hittades inte!\n" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, fuzzy, c-format msgid "Public key `%s' malformed\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 #, fuzzy msgid "No filename to store revocation certificate given.\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, fuzzy, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 #, fuzzy msgid "No action specified. Nothing to do.\n" msgstr "Inget tabellnamn angivet, använder \"%s\".\n" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 #, fuzzy msgid "# unsupported revocations received via set union" msgstr "# byte mottogs via TCP" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 #, fuzzy msgid "# revocation messages received via set union" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 #, fuzzy msgid "# revocation set unions failed" msgstr "# sessionsnycklar accepterade" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 #, fuzzy msgid "# revocation set unions completed" msgstr "# klartext PONG-meddelanden mottagna" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 #, fuzzy msgid "Could not open revocation database file!" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +#, fuzzy +msgid "Measure quality and performance of the RPS service." +msgstr "Kan inte tillgå tjänsten" + +#: src/scalarproduct/gnunet-scalarproduct.c:215 #, fuzzy msgid "You must specify at least one message ID to check!\n" msgstr "Du måste ange en lista av filer att lägga in.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, fuzzy, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Anslutning misslyckades (fel?)\n" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "Kunde inte ansluta till gnunetd.\n" -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 #, fuzzy msgid "number of element in set A-B" msgstr "antal iterationer" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 #, fuzzy msgid "number of element in set B-A" msgstr "antal iterationer" -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 #, fuzzy msgid "--place missing or invalid.\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 #, fuzzy msgid "name or public key of ego" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 #, fuzzy msgid "wait for incoming messages" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 #, fuzzy msgid "GNS name" msgstr "Visa _namn" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 #, fuzzy msgid "method name" msgstr "Visa _namn" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "antal meddelanden att använda per iteration" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, fuzzy, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "Ladda ner filer från GNUnet." -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, fuzzy, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "Ladda ner filer från GNUnet." -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 #, fuzzy msgid "Failed to obtain statistics.\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, fuzzy, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, c-format msgid "No subsystem or name given\n" msgstr "" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, fuzzy, c-format msgid "Failed to initialize watch routine\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, fuzzy, c-format msgid "Invalid argument `%s'\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, fuzzy, c-format msgid "A port is required to connect to host `%s'\n" msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "Skriv ut statistik om GNUnet-operationer." -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 #, fuzzy msgid "Could not save some persistent statistics\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 #, fuzzy msgid "Need at least 2 arguments\n" msgstr "Du måste ange en och endast en fil att avindexera.\n" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, fuzzy, c-format msgid "Invalid topology: %s\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, fuzzy, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, fuzzy, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "Ogiltigt argument: \"%s\"\n" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6729,83 +6734,83 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, fuzzy, c-format msgid "%s is stopped" msgstr "# byte krypterade" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, fuzzy, c-format msgid "%s is starting" msgstr "\"%s\" startar\n" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, fuzzy, c-format msgid "%s is starting already" msgstr "\"%s\" startar\n" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, fuzzy, c-format msgid "%s service is not known to ARM" msgstr "\"%s\" är inte en fil.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, fuzzy, c-format msgid "%s service failed to start" msgstr "Misslyckades att starta samling.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, c-format msgid "%.s Unknown result code." msgstr "" @@ -6820,176 +6825,176 @@ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n" msgid "Spawning process `%s'\n" msgstr "Startade samling \"%s\".\n" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, fuzzy, c-format msgid "Hosts file %s not found\n" msgstr "\"%s\" misslyckades: tabell hittades inte!\n" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, c-format msgid "Hosts file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 msgid "Cannot start the master controller" msgstr "" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, fuzzy, c-format msgid "Topology file %s not found\n" msgstr "\"%s\" misslyckades: tabell hittades inte!\n" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, c-format msgid "Topology file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, c-format msgid "Topology file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, fuzzy, c-format msgid "Failed to read peer index from toology file: %s" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, fuzzy, c-format msgid "Failed to read peer index from topology file: %s" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, fuzzy, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, fuzzy, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 #, fuzzy msgid "create unique configuration files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 #, fuzzy msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 #, fuzzy msgid "configuration template" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" @@ -6997,1551 +7002,1551 @@ msgstr "" msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, fuzzy, c-format msgid "Key number %u does not exist\n" msgstr "antal meddelanden att använda per iteration" -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " "precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, fuzzy, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 #, fuzzy msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "Inga applikationer definierade i konfiguration!\n" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 #, fuzzy msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "Kunde inte komma åt namnrymdsinformation.\n" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, fuzzy, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, fuzzy, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "Kunde inte skapa användarkonto:" -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, fuzzy, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, fuzzy, c-format msgid "Failed to start `%s': %s\n" msgstr "Fel vid %s:%d.\n" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, fuzzy, c-format msgid "Failed to load configuration from %s\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# byte mottogs via TCP" -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 #, fuzzy msgid "# friends connected" msgstr "# av anslutna parter" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr " gconfig\tGTK-konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 #, fuzzy msgid "# friends in configuration" msgstr " gconfig\tGTK-konfiguration\n" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 #, fuzzy msgid "# HELLO messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 msgid "# messages dropped due to slow client" msgstr "" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 #, fuzzy msgid "# bytes payload discarded due to not connected peer" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 #, fuzzy msgid "# bytes total received" msgstr "# byte krypterade" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 #, fuzzy msgid "# bytes payload received" msgstr "# byte dekrypterade" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, fuzzy, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, fuzzy, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 #, fuzzy msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "GNUnet-konfiguration" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 #, fuzzy msgid "# session creation failed" msgstr "# sessionsnycklar accepterade" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 #, fuzzy msgid "# DISCONNECT messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# byte skickade av typen %d" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 #, fuzzy msgid "# transmission failures for messages to other peers" msgstr "# byte skickade av typen %d" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 #, fuzzy msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 #, fuzzy msgid "# KEEPALIVE messages discarded (no session)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 #, fuzzy msgid "# messages discarded due to lack of neighbour record" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 #, fuzzy msgid "# SYN messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Misslyckades att initiera tjänsten \"%s\".\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 #, fuzzy msgid "# SYN messages received" msgstr "# PING-meddelanden skapade" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "skicka ANTAL meddelanden" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 #, fuzzy msgid "# ACK messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 #, fuzzy msgid "# unexpected ACK messages" msgstr "# krypterade PONG-meddelanden skickade" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# byte mottogs via TCP" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 #, fuzzy msgid "# QUOTA messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 #, fuzzy msgid "# disconnected from peer upon explicit request" msgstr "# av anslutna parter" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, fuzzy, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 msgid "# Addresses in validation map" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 msgid "# validations running" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 #, fuzzy msgid "# address records discarded (timeout)" msgstr "# byte kastade via TCP (utgående)" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 msgid "# address records discarded (blacklist)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 msgid "# PINGs for address validation sent" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 #, fuzzy msgid "# PING message for different peer received" msgstr "# PING-meddelanden skapade" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " "having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, fuzzy, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 msgid "# validations succeeded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 #, fuzzy msgid "# HELLOs given to peerinfo" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, fuzzy, c-format msgid "Failed to connect to `%s'\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, fuzzy, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "Misslyckades att binda till UDP-port %d.\n" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 #, fuzzy msgid "Failed to list connections, timeout occured\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, fuzzy, c-format msgid "Transmitting %u bytes\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " "blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, fuzzy, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 #, fuzzy msgid "Connected to" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 #, fuzzy msgid "Disconnected from" msgstr "\"%s\" ansluten till \"%s\".\n" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, fuzzy, c-format msgid "Received %u bytes\n" msgstr "mottog ogiltigt \"%s\" meddelande\n" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, fuzzy, c-format msgid "Peer `%s': %s %s\n" msgstr "Jag är ändpunkt \"%s\".\n" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 #, fuzzy msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " "%s, %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 #, fuzzy msgid "Failed to connect to transport service for disconnection\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 #, fuzzy msgid "Failed to connect to transport service\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 #, fuzzy msgid "print information for all peers (instead of only connected peers)" msgstr "Skriv ut information om GNUnets motparter." -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 #, fuzzy msgid "disconnect from a peer" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 #, fuzzy msgid "provide information about all current connections (once)" msgstr "Skriv ut information om GNUnets motparter." -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 #, fuzzy msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "Skriv ut information om GNUnets motparter." -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 #, fuzzy msgid "do not resolve hostnames" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 msgid "monitor plugin sessions" msgstr "" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 #, fuzzy msgid "Direct access to transport service." msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 #, fuzzy msgid "receive data from peer" msgstr "# byte mottagna av typen %d" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 #, fuzzy msgid "iterations" msgstr "Visa alla alternativ" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "antal meddelanden att använda per iteration" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 #, fuzzy msgid "message size to use" msgstr "meddelandestorlek" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, fuzzy, c-format msgid "Shutting down plugin `%s'\n" msgstr "Testar transport(er) %s\n" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, fuzzy, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "" "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, fuzzy, c-format msgid "Maximum number of requests is %u\n" msgstr "Maximalt antal chattklienter uppnått.\n" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " "size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 #, fuzzy msgid "Require valid port number for service in configuration!\n" msgstr "Inga applikationer definierade i konfiguration!\n" -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 #, fuzzy msgid "Port is required! Fix in configuration\n" msgstr " gconfig\tGTK-konfiguration\n" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, fuzzy, c-format msgid "Using port %u\n" msgstr "Testar transport(er) %s\n" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, fuzzy, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s" "\".\n" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, fuzzy, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s" "\".\n" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, fuzzy, c-format msgid "Using external hostname `%s'\n" msgstr "Startade samling \"%s\".\n" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, fuzzy, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, fuzzy, c-format msgid "Maximum number of connections is %u\n" msgstr "Maximalt antal chattklienter uppnått.\n" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 #, fuzzy msgid "Unable to compile URL regex\n" msgstr "Kunde inte initiera SQLite.\n" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, fuzzy, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n" # capped är inte ett bra ord IMHO -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 #, fuzzy msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n" # capped är inte ett bra ord IMHO -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, fuzzy, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "\"%s\" %s misslyckades: %s\n" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 #, fuzzy msgid "# bytes received via SMTP" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 #, fuzzy msgid "# bytes sent via SMTP" msgstr "# byte skickades via TCP" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 #, fuzzy msgid "# bytes dropped by SMTP (outgoing)" msgstr "# byte kastade via TCP (utgående)" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 #, fuzzy msgid "# TCP sessions active" msgstr "# sessionsnycklar accepterade" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# byte skickades via TCP" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# byte kastade via TCP (utgående)" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# byte kastade via TCP (utgående)" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# byte skickade av typen %d" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr "Nätverksanslutning" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 #, fuzzy msgid "# TCP server connect events" msgstr "# av anslutna parter" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 #, fuzzy msgid "Failed to start service.\n" msgstr "Misslyckades att starta samling.\n" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 #, fuzzy msgid "# Multicast HELLO beacons received via UDP" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "\"%s\" är inte tillgänglig." -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "\"%s\" är inte tillgänglig." -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, fuzzy, c-format msgid "Cannot bind to `%s'\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 #, fuzzy msgid "Failed to open UNIX listen socket\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 msgid "# ACKs sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 #, fuzzy msgid "# Messages defragmented" msgstr "# PING-meddelanden skapade" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 #, fuzzy msgid "# Sessions allocated" msgstr "# sessionsnycklar accepterade" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 #, fuzzy msgid "# message fragments sent" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 #, fuzzy msgid "# messages pending (with fragmentation)" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 #, fuzzy msgid "# MAC endpoints allocated" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 #, fuzzy msgid "# ACKs received" msgstr "# byte mottogs via TCP" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 #, fuzzy msgid "# DATA messages discarded due to CRC32 error" msgstr "Nätverksannonsering avstängd i konfigurationen!\n" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 #, fuzzy msgid "# HELLO beacons sent" msgstr "# byte skickade via UDP" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 #, fuzzy msgid "# DATA messages received" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 #, fuzzy msgid "# DATA messages processed" msgstr "# krypterade PONG-meddelanden mottagna" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 #, fuzzy msgid "# sessions allocated" msgstr "# sessionsnycklar accepterade" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, c-format msgid "XT transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 msgid "XT transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "# sessionsnycklar accepterade" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " "network configuration\n" msgstr "" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 msgid "" "XU could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "Misslyckades att binda till UDP6-port %d.\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, fuzzy, c-format msgid "Access denied to `%s'\n" msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "" # drive = hard drive ? -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, fuzzy, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "\"%s\" misslyckades för enhet %s: %u\n" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, fuzzy, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, fuzzy, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, fuzzy, c-format msgid "Unknown address family %d\n" msgstr "Okänd operation \"%s\"\n" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, fuzzy, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "Fel vid %s:%d.\n" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, fuzzy, c-format msgid "Service `%s' runs at %s\n" msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, fuzzy, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "Kan inte öppna konfigurationsfil \"%s\".\n" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Fel vid skapandet av användare" -#: src/util/bio.c:191 +#: src/util/bio.c:186 #, fuzzy msgid "End of file" msgstr "Läs in en konfigurationsfil" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "FELSÖKNING" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "INFO" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "MEDDELANDE" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "VARNING" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "FEL" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" msgstr "Konfigurationsfil \"%s\" hittades inte. Kör \"gnunet-setup -d\"!\n" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, fuzzy, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Fel vid nedladdning: %s\n" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, fuzzy, c-format msgid "Expected `%s' to be a directory!\n" msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n" @@ -8611,11 +8616,11 @@ msgstr "Använd --help för att få en lista på flaggor.\n" msgid "Missing mandatory option `%s'.\n" msgstr "Konfigurationsfil \"%s\" skapad.\n" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "skriv ut versionsnummer" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8623,342 +8628,342 @@ msgstr "" "Argument som är obligatoriska för långa flaggor är också obligatoriska för " "korta flaggor.\n" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "skriv ut denna hjälp" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "var informativ" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, fuzzy, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Kunde inte spara konfigurationsfil \"%s\":" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, c-format msgid "--section argument is required\n" msgstr "" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 #, fuzzy msgid "name of the option to access" msgstr "Visa värde av alternativet" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 #, fuzzy msgid "print available configuration sections" msgstr "GNUnet-konfiguration" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, fuzzy, c-format msgid "Failed to open `%s': %s\n" msgstr "Misslyckades att leverera \"%s\" meddelande.\n" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, c-format msgid "Generating %u keys like %s, please wait" msgstr "" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, fuzzy, c-format msgid "" "\n" "Failed to write to `%s': %s\n" msgstr "Fel vid %s:%d.\n" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, fuzzy, c-format msgid "" "\n" "Finished!\n" msgstr "Slutför" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "\"%s\" misslyckades: tabell hittades inte!\n" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "antal meddelanden att använda per iteration" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "Kunde inte skapa värdnyckel!\n" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, fuzzy, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 #, fuzzy msgid "Manipulate GNUnet proof of work files" msgstr "skriv ut ett värde från konfigurationsfilen till standard ut" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, fuzzy, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, fuzzy, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, fuzzy, c-format msgid "Error reading from `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, fuzzy, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, fuzzy, c-format msgid "Error writing to `%s': %s\n" msgstr "Fel vid skapandet av användare" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" # drive = hard drive ? -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "\"%s\" misslyckades för enhet %s: %u\n" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "Initiering av insticksmekanism misslyckades: %s!\n" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, fuzzy, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, fuzzy, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 #, fuzzy msgid "Could not determine plugin installation path.\n" msgstr "Kunde inte fastställa min publika IPv6-adress.\n" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, fuzzy, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " @@ -8967,365 +8972,365 @@ msgstr "" "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s" "\".\n" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "Misslyckades att läsa kompislista från \"%s\"\n" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "" -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Kunde inte slå upp \"%s\": %s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVICE_client_continue' after %s\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, fuzzy, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "Anrop till \"%s\" returnerade %d.\n" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "b" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "ms" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "s" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "m" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "h" -#: src/util/strings.c:739 +#: src/util/strings.c:734 #, fuzzy msgid "day" msgstr " dagar" -#: src/util/strings.c:741 +#: src/util/strings.c:736 #, fuzzy msgid "days" msgstr " dagar" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Ogiltigt svar på \"%s\".\n" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Misslyckades att starta samling.\n" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)." -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Ogiltigt format för IP: \"%s\"\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Fel format \"%s\" för nätmask: %s\n" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Fel format \"%s\" för nätverk: %s\n" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 #, fuzzy msgid "# Active channels" msgstr "Nätverksanslutning" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 #, fuzzy msgid "# Messages dropped in cadet queue (overflow)" msgstr "# byte kastade via UDP (utgående)" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 #, fuzzy msgid "# ICMP packets received from cadet" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 #, fuzzy msgid "# UDP packets received from cadet" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 #, fuzzy msgid "# TCP packets received from cadet" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 #, fuzzy msgid "# Cadet channels created" msgstr "# PING-meddelanden skapade" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 #, fuzzy msgid "# Packets dropped (channel not yet online)" msgstr "# byte kastade via UDP (utgående)" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 #, fuzzy msgid "# Packets received from TUN interface" msgstr "Meddelande mottaget från klient är ogiltig.\n" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 #, fuzzy msgid "# Active destinations" msgstr "Nätverksanslutning" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 #, fuzzy msgid "Must specify valid IPv6 address" msgstr "\"%s\" är inte tillgänglig." -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 #, fuzzy msgid "Must specify valid IPv4 address" msgstr "\"%s\" är inte tillgänglig." -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 #, fuzzy msgid "Error creating tunnel\n" msgstr "Klar med skapandet av värdnyckel.\n" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, fuzzy, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, fuzzy, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "%s: flagga \"%s\" är tvetydig\n" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, fuzzy, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, fuzzy, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "\"%s\" är inte en vanlig fil.\n" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, fuzzy, c-format msgid "`%s' is not a valid IP address.\n" msgstr "\"%s\" är inte tillgänglig." -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 #, fuzzy msgid "service is offered via TCP" msgstr "# byte mottogs via TCP" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 #, fuzzy msgid "service is offered via UDP" msgstr "# byte mottagna via UDP" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Misslyckades att ansluta till gnunetd.\n" -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n" diff --git a/po/vi.po b/po/vi.po index 8d8b9f144c..797c414fb3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet 0.8.0a\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2008-09-10 22:05+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -19,1048 +19,1048 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.7b3\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, fuzzy, c-format msgid "Failed to remove configuration file %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, fuzzy, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 msgid "Message was sent successfully" msgstr "" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 #, fuzzy msgid "We disconnected from ARM before we could send a request" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 #, fuzzy msgid "Unknown request status" msgstr "Không rõ người dùng « %s »\n" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "# các byte trong kho dữ liệu" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 #, fuzzy msgid "is starting" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 #, fuzzy msgid "is stopping" msgstr "# các byte trong kho dữ liệu" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 #, fuzzy msgid "is starting already" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 #, fuzzy msgid "is stopping already" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 #, fuzzy msgid "is started already" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 #, fuzzy msgid "is stopped already" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 #, fuzzy msgid "service is not known to ARM" msgstr "Không gian tên « %s » có đánh giá %d.\n" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 #, fuzzy msgid "service cannot be manipulated because ARM is shutting down" msgstr "« %s » đang tắt.\n" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "Không rõ người dùng « %s »\n" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, fuzzy, c-format msgid "Failed to start the ARM service: %s\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, fuzzy, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, fuzzy, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "Lỗi vào phòng « %s »\n" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, fuzzy, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, fuzzy, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, fuzzy, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, fuzzy, c-format msgid "Failed to request a list of services: %s\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 #, fuzzy msgid "Error communicating with ARM. ARM not running?\n" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 #, fuzzy msgid "Running services:\n" msgstr "Đang nạp và khởi động dùng « %s ».\n" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, fuzzy, c-format msgid "Starting %s...\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, fuzzy, c-format msgid "Unknown status %u for service %s.\n" msgstr "Không rõ người dùng « %s »\n" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 #, fuzzy msgid "stop all GNUnet services" msgstr "hủy cài đặt dịch vụ GNUnet" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 #, fuzzy msgid "start all GNUnet default services" msgstr "hủy cài đặt dịch vụ GNUnet" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 #, fuzzy msgid "stop and start all GNUnet default services" msgstr "hủy cài đặt dịch vụ GNUnet" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 #, fuzzy msgid "list currently running services" msgstr "Đang nạp và khởi động dùng « %s ».\n" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, fuzzy, c-format msgid "Using `%s' instead\n" msgstr "%s: tùy chọn « %s » là mơ hồ\n" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " "domain socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "Lỗi đóng kết đến cổng %s %d.\n" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, fuzzy, c-format msgid "Failed to start service `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, fuzzy, c-format msgid "Starting service `%s'\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, fuzzy, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "Không thể tạo tài khoản người dùng:" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, fuzzy, c-format msgid "Preparing to stop `%s'\n" msgstr "Đang bắt đầu tài lên « %s ».\n" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, fuzzy, c-format msgid "Restarting service `%s'.\n" msgstr "Đang nạp và khởi động dùng « %s ».\n" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 #, fuzzy msgid "unknown" msgstr "Lỗi không rõ" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, fuzzy, c-format msgid "Service `%s' took %s to terminate\n" msgstr "Dịch vụ đã bị xoá.\n" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 msgid "solver to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 #, fuzzy msgid "print logging" msgstr "Theo dõi" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, fuzzy, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, fuzzy, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, fuzzy, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " "%llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " "must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, fuzzy, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 #, fuzzy msgid "Stop logging\n" msgstr "Theo dõi" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, fuzzy, c-format msgid "Start logging `%s'\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " "= %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, fuzzy, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" "s, %s\n" msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, fuzzy, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "Đã nạp truyền tải « %s »\n" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, fuzzy, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 #, fuzzy msgid "Cannot connect to ATS service, exiting...\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 #, fuzzy msgid "Cannot issue request to ATS service, exiting...\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 #, fuzzy msgid "No preference type given!\n" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 #, fuzzy msgid "No peer given!\n" msgstr "chưa đưa ra tên" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 msgid "Valid type required\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 #, fuzzy msgid "do not resolve IP addresses to hostnames" msgstr "không quyết định các tên máy" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 #, fuzzy msgid "set preference for the given peer" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 #, fuzzy msgid "Print information about ATS state" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 #, fuzzy msgid "public auction outcome" msgstr "Ứng dụng bị hủy bỏ." -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 msgid "help text" msgstr "" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, fuzzy, c-format msgid "Invalid peer ID `%s'\n" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, fuzzy, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, fuzzy, c-format msgid "Invalid target `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 #, fuzzy msgid "No action requested\n" msgstr "Thu thập bị dừng.\n" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 #, fuzzy msgid "Provide information about a particular connection" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 #, fuzzy msgid "Provide information about a patricular peer" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 #, fuzzy msgid "Provide information about all peers" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 #, fuzzy msgid "Provide information about a particular tunnel" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 #, fuzzy msgid "Provide information about all tunnels" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 #, fuzzy msgid "number of peers in consensus" msgstr "số lần lặp lại" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 #, fuzzy msgid "number of values" msgstr "số lần lặp lại" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 #, fuzzy msgid "consensus timeout" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 msgid "write statistics to file" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "Không rõ câu lệnh « %s ».\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 #, fuzzy msgid "Use `/quit' to terminate gnunet-conversation" msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "Không thể tạo miền tên.\n" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, fuzzy, c-format msgid "Our ego `%s' was deleted!\n" msgstr "Biệt hiệu « %s » bị xoá.\n" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1068,15 +1068,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1086,1932 +1086,1932 @@ msgstr "" msgid "pa_stream_write() failed: %s\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 #, fuzzy msgid "Connection established.\n" msgstr "Thu thập bị dừng.\n" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, fuzzy, c-format msgid "pa_stream_new() failed: %s\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, fuzzy, c-format msgid "Connection failure: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 msgid "Wrong Spec\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 #, fuzzy msgid "pa_mainloop_new() failed.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 #, fuzzy msgid "pa_context_new() failed.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, fuzzy, c-format msgid "pa_context_connect() failed: %s\n" msgstr "# của các đồng đẳng đã kết nối" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 #, fuzzy msgid "pa_mainloop_run() failed.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, fuzzy, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "# của các đồng đẳng đã kết nối" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, fuzzy, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 #, fuzzy msgid "Stream successfully created.\n" msgstr "Không đủ quyền cho « %s ».\n" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, fuzzy, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, fuzzy, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "« %s » được kết nối tới « %s ».\n" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, fuzzy, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 #, fuzzy msgid "ogg_stream_init() failed.\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, fuzzy, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "Lỗi tạo thư mục tạm thời." -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, fuzzy, c-format msgid "Could not open line, port %s already in use!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 #, fuzzy msgid "Could not start record audio helper\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, c-format msgid "PHONE version %u not supported\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, fuzzy, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 #, fuzzy msgid "Could not start playback audio helper.\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 #, fuzzy msgid "fresh connection" msgstr "# của các đồng đẳng đã kết nối" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 #, fuzzy msgid "key received" msgstr "# các khoá phiên chạy bị từ chối" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 #, fuzzy msgid "connection established" msgstr "Thu thập bị dừng.\n" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "« %.*s » được kết nối tới « %.*s ».\n" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 msgid "Connection to CORE service lost (reconnecting)" msgstr "" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "Lỗi không rõ" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, fuzzy, c-format msgid "Invalid command line argument `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 #, fuzzy msgid "Failed to connect to CORE service!\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 #, fuzzy msgid "provide information about all current connections (continuously)" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 #, fuzzy msgid "Print information about connected peers." msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 #, fuzzy msgid "# send requests dropped (disconnected)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, fuzzy, c-format msgid "# bytes of messages of type %u received" msgstr "# các byte nhiễu được nhận" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 #, fuzzy msgid "# messages discarded (session disconnected)" msgstr "# các thông báo được chắp liền" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, fuzzy, c-format msgid "# messages of type %u discarded (client busy)" msgstr "# các byte nhiễu được nhận" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 #, fuzzy msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, fuzzy, c-format msgid "Core service of `%s' ready.\n" msgstr "Không gian tên « %s » có đánh giá %d.\n" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "# các byte đã mã hoá" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "# các byte đã giải mã" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 #, fuzzy msgid "# PAYLOAD dropped (out of order)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 #, fuzzy msgid "# PING messages transmitted" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 #, fuzzy msgid "# duplicate ephemeral keys ignored" msgstr "# các thông báo phát hiện dht được nhận" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 #, fuzzy msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "# các thông báo được chắp liền" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 #, fuzzy msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "# các thông báo được chắp liền" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 #, fuzzy msgid "# valid ephemeral keys received" msgstr "# các thông báo phát hiện dht được nhận" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 #, fuzzy msgid "# PING messages received" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 #, fuzzy msgid "# PING messages dropped (out of order)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 #, fuzzy msgid "# PONG messages created" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 #, fuzzy msgid "# sessions terminated by timeout" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 #, fuzzy msgid "# keepalive messages sent" msgstr "# các thông báo PING nhập thô được gửi" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 #, fuzzy msgid "# PONG messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 #, fuzzy msgid "# PONG messages dropped (connection down)" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 #, fuzzy msgid "# PONG messages dropped (out of order)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 #, fuzzy msgid "# PONG messages decrypted" msgstr "# các thông báo PING được tạo" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 #, fuzzy msgid "# session keys confirmed via PONG" msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 #, fuzzy msgid "# timeouts prevented via PONG" msgstr "# các byte đã nhận qua TCP" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 #, fuzzy msgid "# rekey operations confirmed via PONG" msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 #, fuzzy msgid "# DATA message dropped (out of order)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 #, fuzzy msgid "# sessions terminated by key expiration" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 #, fuzzy msgid "# bytes dropped (duplicates)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 #, fuzzy msgid "# bytes dropped (out of sequence)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 #, fuzzy msgid "# bytes dropped (ancient message)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 #, fuzzy msgid "# bytes of payload decrypted" msgstr "# các byte đã giải mã" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 #, fuzzy msgid "# peers connected" msgstr "# của các đồng đẳng đã kết nối" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 #, fuzzy msgid "# type map refreshes sent" msgstr "# tổng số yêu cầu lỗ hổng được gửi" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 #, fuzzy msgid "# outdated typemap confirmations received" msgstr "Lỗi lưu cấu hình." -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 #, fuzzy msgid "# valid typemap confirmations received" msgstr "Lỗi lưu cấu hình." -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 #, fuzzy msgid "# type maps received" msgstr "# các thông báo phát hiện dht được nhận" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, fuzzy, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, c-format msgid "Ego `%s' not known to identity service\n" msgstr "" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, fuzzy, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, fuzzy, c-format msgid "Issuer public key not well-formed\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, c-format msgid "ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, fuzzy, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, c-format msgid "Issuer ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 #, fuzzy msgid "The public key of the subject to lookup the credential for" msgstr "xác định mức ưu tiên của nội dung" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 #, fuzzy msgid "The public key of the authority to verify the credential against" msgstr "xác định mức ưu tiên của nội dung" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 #, fuzzy msgid "The ego to use" msgstr "kích cỡ tin nhắn" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 #, fuzzy msgid "GNUnet credential resolver tool" msgstr "Bản ghi lỗi GNUnet" -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, fuzzy, c-format msgid "Failed to connect to namestore\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 #, fuzzy msgid "GNS REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 #, fuzzy msgid "# bytes stored" msgstr "# các byte trong kho dữ liệu" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 #, fuzzy msgid "# items stored" msgstr "# các byte trong kho dữ liệu" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, fuzzy, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 #, fuzzy msgid "# requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "# các yêu cầu được lọc theo bộ lọc bloom" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 #, fuzzy msgid "# requests for random value received" msgstr "# tổng số yêu cầu lỗ hổng được nhận" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 #, fuzzy msgid "# proximity search requests received" msgstr "# các yêu cầu khách lỗ hổng được nhận" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 #, fuzzy msgid "Heap datacache running\n" msgstr "kho dữ liệu sqlite" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "« %.*s » được kết nối tới « %.*s ».\n" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "« %.*s » được kết nối tới « %.*s ».\n" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 #, fuzzy msgid "# queue entries created" msgstr "# các truy vấn lỗ hổng được định tuyến" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 #, fuzzy msgid "# status messages received" msgstr "# các thông báo phát hiện dht được nhận" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 #, fuzzy msgid "# Results received" msgstr "# các kết quả dht được nhận" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 #, fuzzy msgid "# datastore connections (re)created" msgstr "# các kết nối dht" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 #, fuzzy msgid "# PUT requests executed" msgstr "# các yêu cầu dht được định tuyến" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 #, fuzzy msgid "# RESERVE requests executed" msgstr "# các yêu cầu dht được định tuyến" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 #, fuzzy msgid "# REMOVE requests executed" msgstr "# các yêu cầu dht được định tuyến" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 #, fuzzy msgid "# GET requests executed" msgstr "# các yêu cầu dht được định tuyến" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 #, fuzzy msgid "Error queueing datastore GET operation\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "Không thể tạo miền tên.\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, fuzzy, c-format msgid "Failed to store item: %s, aborting\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, c-format msgid "Inserted % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 #, fuzzy msgid "Error queueing datastore PUT operation\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 #, fuzzy msgid "Failed connecting to the datastore.\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 #, fuzzy msgid "Dump all records from the datastore" msgstr "" "\n" "Không nhận được đáp ứng từ gnunetd.\n" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 #, fuzzy msgid "Insert records into the datastore" msgstr "# các byte trong kho dữ liệu" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 #, fuzzy msgid "Manipulate GNUnet datastore" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 #, fuzzy msgid "# bytes expired" msgstr "# các byte được nhận" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " "%llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " "bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 #, fuzzy msgid "# GET requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 #, fuzzy msgid "# GET KEY requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 #, fuzzy msgid "# requests filtered by bloomfilter" msgstr "# các yêu cầu được lọc theo bộ lọc bloom" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 #, fuzzy msgid "# GET REPLICATION requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 #, fuzzy msgid "# GET ZERO ANONYMITY requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 msgid "Content not found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 #, fuzzy msgid "# REMOVE requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, fuzzy, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, fuzzy, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "# các byte được phép trong kho dữ liệu" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, fuzzy, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 #, fuzzy msgid "Failed to initialize bloomfilter.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 #, fuzzy msgid "Heap database running\n" msgstr "kho dữ liệu sqlite" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 #, fuzzy msgid "Data too large" msgstr "số lần lặp lại" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, fuzzy, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 #, fuzzy msgid "Failed to drop table from database.\n" msgstr "" "\n" "Không nhận được đáp ứng từ gnunetd.\n" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, fuzzy, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 #, fuzzy msgid "Sqlite database running\n" msgstr "kho dữ liệu sqlite" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, c-format msgid "Result %d, type %d:\n" msgstr "" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, fuzzy, c-format msgid "Exiting as the number of peers is %u\n" msgstr "tăng sổ tối đa các kết nối TCP/IP" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 #, fuzzy msgid "number of peers to start" msgstr "số lần lặp lại" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 #, fuzzy msgid "Measure quality and performance of the DHT service." msgstr "Không thể truy cập đến dịch vụ" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 #, fuzzy msgid "# GET requests from clients injected" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 #, fuzzy msgid "# PUT requests received from clients" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 #, fuzzy msgid "# GET requests received from clients" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 #, fuzzy msgid "# GET STOP requests received from clients" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, fuzzy, c-format msgid "%s request received, but have no datacache!\n" msgstr "# các byte kiểu %d được nhận" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 #, fuzzy msgid "# GET requests given to datacache" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 #, fuzzy msgid "# HELLOs obtained from peerinfo" msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 #, fuzzy msgid "# FIND PEER messages initiated" msgstr "# các thông báo PING được tạo" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 #, fuzzy msgid "# requests TTL-dropped" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 #, fuzzy msgid "# Peer selection failed" msgstr "# các cuộc gọi HTTP select (lựa chọn)" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 #, fuzzy msgid "# PUT requests routed" msgstr "# các yêu cầu dht được định tuyến" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 #, fuzzy msgid "# PUT messages queued for transmission" msgstr "# các thông báo PING được tạo" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 #, fuzzy msgid "# P2P messages dropped due to full queue" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 #, fuzzy msgid "# GET requests routed" msgstr "# các yêu cầu dht được định tuyến" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 #, fuzzy msgid "# GET messages queued for transmission" msgstr "# các thông báo PING được tạo" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 #, fuzzy msgid "# RESULT messages queued for transmission" msgstr "# các thông báo PING được tạo" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 #, fuzzy msgid "# P2P PUT requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 #, fuzzy msgid "# P2P PUT bytes received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 #, fuzzy msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "# các yêu cầu được lọc theo bộ lọc bloom" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 #, fuzzy msgid "# P2P GET requests received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 #, fuzzy msgid "# P2P GET bytes received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 #, fuzzy msgid "# P2P FIND PEER requests processed" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 #, fuzzy msgid "# P2P GET requests ONLY routed" msgstr "# các yêu cầu dht được định tuyến" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 #, fuzzy msgid "# P2P RESULTS received" msgstr "# Tín hiệu HTTP PUT được nhận" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 #, fuzzy msgid "# P2P RESULT bytes received" msgstr "# Tín hiệu HTTP PUT được nhận" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 #, fuzzy msgid "# Network size estimates received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 #, fuzzy msgid "# DHT requests combined" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, fuzzy, c-format msgid "Block not of type %u\n" msgstr "Không biết truyền tải nào kiểu %d.\n" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, fuzzy, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 #, fuzzy msgid "# DNS requests received via TUN interface" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 #, fuzzy msgid "Print information about DV state" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 #, fuzzy msgid "# TCP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 #, fuzzy msgid "# ICMP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 #, fuzzy msgid "# UDP packets sent via TUN" msgstr "# các byte đã gửi qua UDP" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 #, fuzzy msgid "# Bytes received from CADET" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 #, fuzzy msgid "# UDP IP-exit requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 #, fuzzy msgid "# UDP service requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 #, fuzzy msgid "# TCP service creation requests received via cadet" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 #, fuzzy msgid "# TCP IP-exit creation requests received via cadet" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 #, fuzzy msgid "# TCP DATA requests dropped (no session)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 #, fuzzy msgid "# TCP data requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 #, fuzzy msgid "# ICMP IP-exit requests received via cadet" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 #, fuzzy msgid "# ICMP service requests received via cadet" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 #, fuzzy msgid "# Inbound CADET channels created" msgstr "# các truy vấn lỗ hổng được định tuyến" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "# các byte được gửi" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 #, fuzzy msgid "# Packets received from TUN" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 #, fuzzy msgid "# Bytes received from TUN" msgstr "# các byte đã nhận qua HTTP" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 #, fuzzy msgid "# fragments received" msgstr "# các mảnh bị loại bỏ" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 #, fuzzy msgid "# duplicate fragments received" msgstr "# các kết quả dht được nhận" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "# các thông báo được chắp liền" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 #, fuzzy msgid "# fragments transmitted" msgstr "# Các tự quảng cáo được truyền" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 #, fuzzy msgid "# fragments retransmitted" msgstr "# Các tự quảng cáo được truyền" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 #, fuzzy msgid "# fragments wrap arounds" msgstr "# Các tự quảng cáo được truyền" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "# các thông báo bị tế phân" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 #, fuzzy msgid "# fragment acknowledgements received" msgstr "# Các quảng cáo đồng đẳng được nhận" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 #, fuzzy msgid "# fragmentation transmissions completed" msgstr "# các sự truyền PONG bị lỗi" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, fuzzy, c-format msgid "Could not open file `%s': %s" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, fuzzy, c-format msgid "Could not read file `%s': %s" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, fuzzy, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, fuzzy, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, fuzzy, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, fuzzy, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, fuzzy, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 #, fuzzy msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, fuzzy, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, fuzzy, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 #, fuzzy msgid "internal error decoding tree" msgstr "=\tLỗi đọc thư mục.\n" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 #, fuzzy msgid "Invalid URI" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " @@ -3020,615 +3020,615 @@ msgstr "" "Không rõ kiểu siêu dữ liệu trong tùy chọn siêu dữ liệu « %s ». Đang ùng kiểu " "siêu dữ liệu « không rõ » (unknown) để thay thế.\n" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "" "\n" "Không nhận được đáp ứng từ gnunetd.\n" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, fuzzy, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, fuzzy, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, fuzzy, c-format msgid "Failed to write `%s': %s\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, fuzzy, c-format msgid "Failed to read `%s': %s\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 #, fuzzy msgid "Failed to connect to datastore." msgstr "Không kết nối được đến trình nền gnunetd." -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, fuzzy, c-format msgid "Publishing failed: %s" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, fuzzy, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 #, fuzzy msgid "error on index-start request to `fs' service" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 #, fuzzy msgid "filename too long" msgstr "tên tập tin" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 msgid "could not connect to `fs' service" msgstr "" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, fuzzy, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, fuzzy, c-format msgid "Recursive upload failed at `%s': %s" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, fuzzy, c-format msgid "Recursive upload failed: %s" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 msgid "needs to be an actual file" msgstr "" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr "Kho dữ liệu đầy.\n" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 #, fuzzy msgid "Could not connect to datastore." msgstr "« %s »: Không thể kết nối.\n" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 #, fuzzy msgid "Internal error." msgstr "Lỗi VR." -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "Tập tin « %s » có URI: %s\n" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 #, fuzzy msgid "Failed to read file" msgstr "Lỗi gửi tin nhẳn.\n" -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 #, fuzzy msgid "Error communicating with `fs' service." msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 #, fuzzy msgid "Failed to connect to FS service for unindexing." msgstr "Không kết nối được đến trình nền gnunetd." -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 #, fuzzy msgid "Failed to get KSKs from directory scan." msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, fuzzy, c-format msgid "Internal error scanning `%s'.\n" msgstr "=\tLỗi đọc thư mục.\n" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, fuzzy, c-format msgid "Failed to remove UBlock: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 #, fuzzy msgid "Failed to connect to `datastore' service." msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 #, fuzzy msgid "Failed to open file for unindexing." msgstr "Không kết nối được đến trình nền gnunetd." -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 #, fuzzy msgid "Failed to compute hash of file." msgstr "Không kết nối được đến trình nền gnunetd." -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "Chưa ghi rõ từ khoá.\n" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "Có dấu nháy kép thừa hay thiếu.\n" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, fuzzy, c-format msgid "Failed to load state: %s\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, fuzzy, c-format msgid "Failed to save state to file %s\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, fuzzy, c-format msgid "Publishing `%s'\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, fuzzy, c-format msgid "Failed to run `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, fuzzy, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "xác định mức ưu tiên của nội dung" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 #, fuzzy msgid "Automatically publish files from a directory on GNUnet" msgstr "Tự động chia sẻ một thư mục." -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, fuzzy, c-format msgid "Directory `%s' meta data:\n" msgstr "==> Thư mục « %s »:\n" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, fuzzy, c-format msgid "Directory `%s' contents:\n" msgstr "==> Thư mục « %s »:\n" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 #, fuzzy msgid "You must specify a filename to inspect.\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, fuzzy, c-format msgid "Failed to read directory `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, fuzzy, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 #, fuzzy msgid "Display contents of a GNUnet directory" msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 #, fuzzy msgid "" msgstr "Lỗi không rõ" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, fuzzy, c-format msgid "Error downloading: %s.\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, fuzzy, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, fuzzy, c-format msgid "Unexpected status: %d\n" msgstr "Gặp sự kiện bất thường: %d\n" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "Tập tin « %s » có URI: %s\n" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 #, fuzzy msgid "set the desired LEVEL of receiver-anonymity" msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "ghi tập tin vào TÊN_TẬP_TIN" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 #, fuzzy msgid "set the maximum number of parallel downloads that is allowed" msgstr "đặt số tối đa các việc tải xuống đồng thời được phép" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 #, fuzzy msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "đặt số tối đa các việc tải xuống đồng thời được phép" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "tải xuống đệ quy một thư mục GNUnet" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 #, fuzzy msgid "Special file-sharing operations" msgstr "Tùy chọn chia sẻ tập tin" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, fuzzy, c-format msgid "Error publishing: %s.\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, fuzzy, c-format msgid "URI is `%s'.\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, fuzzy, c-format msgid "Namespace URI is `%s'.\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 #, fuzzy msgid "Starting cleanup after abort\n" msgstr "Hoàn thành khởi chạy « %s ».\n" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 #, fuzzy msgid "Cleanup after abort completed.\n" msgstr "Hoàn thành khởi chạy « %s ».\n" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 #, fuzzy msgid "Cleanup after abort failed.\n" msgstr "Hoàn thành khởi chạy « %s ».\n" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, fuzzy, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, fuzzy, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "Từ khoá cho tập tin « %s »:\n" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 #, fuzzy msgid "Could not publish\n" msgstr "Không thể truy cập đến « %s »: %s\n" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 #, fuzzy msgid "Could not start publishing.\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, fuzzy, c-format msgid "Scanning directory `%s'.\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, fuzzy, c-format msgid "Scanning file `%s'.\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 msgid "Preprocessing complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, fuzzy, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 #, fuzzy msgid "Internal error scanning directory.\n" msgstr "=\tLỗi đọc thư mục.\n" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, fuzzy, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "Không gian tên « %s » có đánh giá %d.\n" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, fuzzy, c-format msgid "Failed to access `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" @@ -3636,7 +3636,7 @@ msgstr "" "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện " "tải lên" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" @@ -3644,11 +3644,11 @@ msgstr "" "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra " "tùy chọn này nhiều lần)" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" @@ -3656,7 +3656,7 @@ msgstr "" "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng " "mã hóa trong cơ sở dữ liệu GNUnet)" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" @@ -3664,12 +3664,12 @@ msgstr "" "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ " "cho sự chèn không gian tên)" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 #, fuzzy msgid "" "only simulate the process but do not do any actual publishing (useful to " @@ -3677,13 +3677,13 @@ msgid "" msgstr "" "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" @@ -3691,2069 +3691,2069 @@ msgstr "" "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm " "từ khoá vào tập tin có địa chỉ URI tương ứng)" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, fuzzy, c-format msgid "Error searching: %s.\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 #, fuzzy msgid "Could not create keyword URI from arguments.\n" msgstr "Không thể tạo miền tên.\n" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 #, fuzzy msgid "Could not start searching.\n" msgstr "Không thể tạo miền tên.\n" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 #, fuzzy msgid "Search GNUnet for files that were published on GNUnet" msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 #, fuzzy msgid "# client searches active" msgstr "# các yêu cầu khách lỗ hổng được nhận" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 #, fuzzy msgid "# replies received for local clients" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 #, fuzzy msgid "# Loopback routes suppressed" msgstr "# tổng số định tuyến lỗ hổng thành công" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 #, fuzzy msgid "# client searches received" msgstr "# các yêu cầu khách lỗ hổng được nhận" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 #, fuzzy msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 #, fuzzy msgid "# replies received via cadet" msgstr "# các byte kiểu %d được nhận" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 #, fuzzy msgid "# replies received via cadet dropped" msgstr "# các byte kiểu %d được nhận" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 #, fuzzy msgid "# queries received via CADET not answered" msgstr "# các byte đã nhận qua TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 #, fuzzy msgid "# Blocks transferred via cadet" msgstr "# các byte được gửi" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 #, fuzzy msgid "# queries received via cadet" msgstr "# các byte đã nhận qua TCP" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 #, fuzzy msgid "# cadet client connections rejected" msgstr "# các kết nối dht" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr "# các kết nối dht" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 #, fuzzy msgid "# migration stop messages received" msgstr "# các thông báo phát hiện dht được nhận" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 #, fuzzy msgid "# replies dropped due to type mismatch" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 #, fuzzy msgid "# replies received for other peers" msgstr "# các byte kiểu %d được nhận" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 #, fuzzy msgid "# requests done for free (low load)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 msgid "# request dropped, priority insufficient" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 #, fuzzy msgid "# requests done for a price (normal load)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 #, fuzzy msgid "# requests dropped due to higher-TTL request" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 #, fuzzy msgid "# requests dropped due to missing reverse route" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 #, fuzzy msgid "# requests dropped due to full reply queue" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 #, fuzzy msgid "# requests dropped due TTL underflow" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 #, fuzzy msgid "# P2P query messages received and processed" msgstr "# các thông báo phát hiện dht được nhận" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 #, fuzzy msgid "# migration stop messages sent" msgstr "# các thông báo phát hiện dht được nhận" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, fuzzy, c-format msgid "Could not open `%s'.\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, fuzzy, c-format msgid "Error writing `%s'.\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, fuzzy, c-format msgid "Failed to delete bogus block: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, fuzzy, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "Không thể giải quyết « %s » (%s): %s\n" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 msgid "not indexed" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, fuzzy, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " "anyway.\n" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 #, fuzzy msgid "# average retransmission delay (ms)" msgstr "# thời gian trung bình còn kết nối (theo miligiây)" -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 msgid "# delay heap timeout (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 #, fuzzy msgid "# query plans executed" msgstr "# các yêu cầu dht được định tuyến" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 #, fuzzy msgid "# query messages sent to other peers" msgstr "# các byte thông báo gửi đi bị loại bỏ" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 #, fuzzy msgid "# requests merged" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 #, fuzzy msgid "# requests refreshed" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 #, fuzzy msgid "# Pending requests created" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 #, fuzzy msgid "# Pending requests active" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 #, fuzzy msgid "# replies received and matched" msgstr "# các byte kiểu %d được nhận" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 msgid "# irrelevant replies discarded" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 #, fuzzy msgid "# results found locally" msgstr "# nội dung lỗ hổng được tìm cục bộ" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 #, fuzzy msgid "# storage requests dropped due to high load" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 #, fuzzy msgid "# Replies received from DHT" msgstr "# các byte đã nhận qua HTTP" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 #, fuzzy msgid "# Replies received from CADET" msgstr "# các byte đã nhận qua HTTP" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 #, fuzzy msgid "# GAP PUT messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, fuzzy, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)." -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, fuzzy, c-format msgid "Error unindexing: %s.\n" msgstr "" "\n" "Gặp lỗi khi bỏ chỉ mục tập tin: %s\n" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 #, fuzzy msgid "Unindexing done.\n" msgstr "Bỏ chỉ mục tập tin." -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, fuzzy, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 #, fuzzy msgid "Could not start unindex operation.\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, fuzzy, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "trình phục vụ danh sách máy HTTP hợp nhất" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, fuzzy, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, fuzzy, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, fuzzy, c-format msgid "Received malformed DNS request from %s\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, fuzzy, c-format msgid "Received unsupported DNS request from %s\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 #, fuzzy msgid "No DNS server specified!\n" msgstr "Chưa ghi rõ từ khoá.\n" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 #, fuzzy msgid "Specify the type of the record to lookup" msgstr "xác định mức ưu tiên của nội dung" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 #, fuzzy msgid "GNUnet GNS resolver tool" msgstr "Bản ghi lỗi GNUnet" -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, fuzzy, c-format msgid "Failed to connect to identity service\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "Không thể tạo tài khoản người dùng:" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, fuzzy, c-format msgid "Unable to import certificate from `%s'\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 #, fuzzy msgid "Properly base32-encoded public key required" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 #, fuzzy msgid "Error converting GNS response to DNS response!\n" msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, fuzzy, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, fuzzy, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, fuzzy, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, fuzzy, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, fuzzy, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, fuzzy, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, fuzzy, c-format msgid "Unable to parse MX record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, fuzzy, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, fuzzy, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, fuzzy, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, fuzzy, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, fuzzy, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, fuzzy, c-format msgid "Error accessing file `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, fuzzy, c-format msgid "Error opening file `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, fuzzy, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, fuzzy, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 #, fuzzy msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "Lỗi lưu cấu hình." -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 #, fuzzy msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "Lỗi lưu cấu hình." -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 #, fuzzy msgid "Failed to parse HELLO message: malformed\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 #, fuzzy msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, fuzzy, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "Lỗi đóng kết đến cổng %s %d.\n" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 #, fuzzy msgid "advertise our hostlist to other peers" msgstr "Tắt quảng cáo máy này cho đồng đẳng khác" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 #, fuzzy msgid "enable learning about hostlist servers from other peers" msgstr "Tắt quảng cáo máy này cho đồng đẳng khác" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 #, fuzzy msgid "provide a hostlist server" msgstr "trình phục vụ danh sách máy HTTP hợp nhất" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 #, fuzzy msgid "# bytes downloaded from hostlist servers" msgstr "trình phục vụ danh sách máy HTTP hợp nhất" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 #, fuzzy msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "# các HELLO tải xuống qua HTTP" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, fuzzy, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 #, fuzzy msgid "# valid HELLOs downloaded from hostlist servers" msgstr "# các HELLO tải xuống qua HTTP" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, fuzzy, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, fuzzy, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, fuzzy, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "Đang nạp và khởi động dùng « %s ».\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 #, fuzzy msgid "# active connections" msgstr "# các kết nối dht" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, fuzzy, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, fuzzy, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 #, fuzzy msgid "# hostlist URIs read from file" msgstr "# các byte danh sách máy được trả về" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, fuzzy, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 #, fuzzy msgid "# hostlist URIs written to file" msgstr "# các byte danh sách máy được trả về" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 #, fuzzy msgid "bytes in hostlist" msgstr "# các byte trong kho dữ liệu" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, fuzzy, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, fuzzy, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "trình phục vụ danh sách máy HTTP hợp nhất" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 #, fuzzy msgid "hostlist requests refused (not HTTP GET)" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 #, fuzzy msgid "hostlist requests refused (upload data)" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 #, fuzzy msgid "hostlist requests refused (not ready)" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 #, fuzzy msgid "Received request for our hostlist\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 #, fuzzy msgid "hostlist requests processed" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 #, fuzzy msgid "# hostlist advertisements send" msgstr "# Các quảng cáo ngoại được chuyển tiếp" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 #, fuzzy msgid "Could not access PEERINFO service. Exiting.\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, fuzzy, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, fuzzy, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, fuzzy, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, fuzzy, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, fuzzy, c-format msgid "Failed to create ego: %s\n" msgstr "Không thể tạo miền tên.\n" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, fuzzy, c-format msgid "Failed to set default ego: %s\n" msgstr "Không thể tạo miền tên.\n" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, fuzzy, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, fuzzy, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, fuzzy, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, fuzzy, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 #, fuzzy msgid "Identity REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 #, fuzzy msgid "Ego is required\n" msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 #, fuzzy msgid "Requesting party key is required!\n" msgstr "đặt tên hiệu cần dùng (cần thiết)" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 #, fuzzy msgid "Identity Provider REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, fuzzy, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, fuzzy, c-format msgid "Could not access file `%s': %s\n" msgstr "Không thể truy cập đến « %s »: %s\n" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, fuzzy, c-format msgid "No records found for `%s'" msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, fuzzy, c-format msgid "You must specify which zone should be accessed\n" msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, fuzzy, c-format msgid "You must specify a name\n" msgstr "Phải ghi rõ tên hiệu\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 #, fuzzy msgid "spezifies the public key of the zone to look in" msgstr "xác định mức ưu tiên của nội dung" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "Cấu hình GNUnet" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 #, fuzzy msgid "Error communicating with namecache service" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "Không thể tạo miền tên.\n" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "Không thể tạo miền tên.\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 #, fuzzy msgid "flat plugin running\n" msgstr "kho dữ liệu sqlite" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, fuzzy, c-format msgid "Adding record failed: %s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, fuzzy, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, fuzzy, c-format msgid "Deleting record failed%s%s\n" msgstr "Gặp lỗi khi tải lên tập tin: %s\n" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, fuzzy, c-format msgid "No options given\n" msgstr "chưa đưa ra tên" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "Dữ liệu nhập không hợp lệ.\n" -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 #, fuzzy msgid "set the desired nick name for the zone" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 #, fuzzy msgid "monitor changes in the namestore" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 #, fuzzy msgid "determine our name for the given PKEY" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, fuzzy, c-format msgid "Unsupported form value `%s'\n" msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, fuzzy, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, fuzzy, c-format msgid "Failed to create page for `%s'\n" msgstr "Không thể tạo miền tên.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, fuzzy, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 #, fuzzy msgid "Failed to start HTTP server\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 #, fuzzy msgid "Failed to connect to identity\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 #, fuzzy msgid "flat file database running\n" msgstr "kho dữ liệu sqlite" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 #, fuzzy msgid "Namestore REST API initialized\n" msgstr "Lỗi sơ khởi lõi.\n" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 #, fuzzy msgid "Suggested configuration changes:\n" msgstr "" "\n" "CHƯA lưu các thay đổi trong cấu hình.\n" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "Lỗi lưu cấu hình." -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, fuzzy, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "Cấu hình hạn ngạch" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 msgid "write configuration file (for autoconfiguration)" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 #, fuzzy msgid "GNUnet NAT traversal autoconfiguration" msgstr "Cấu hình GNUnet" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 #, fuzzy msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 #, fuzzy msgid "NAT test failed to start NAT library\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 #, fuzzy msgid "Testing connection reversal with ICMP server.\n" msgstr "Cổng để liên lạc với giao diện người dùng GNUnet" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, c-format msgid "Detected external IP `%s'\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, fuzzy, c-format msgid "Detected internal network address `%s'.\n" msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 msgid "upnpc not found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 msgid "`upnpc` command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 #, fuzzy msgid "Failed to run `upnpc` command" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 msgid "`upnpc' command took too long, process killed" msgstr "" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 msgid "`external-ip' command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 #, fuzzy msgid "Failed to run `external-ip` command" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 msgid "`external-ip' command output invalid" msgstr "" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 #, fuzzy msgid "Could not determine interface with internal/local network address" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 msgid "No functioning gnunet-helper-nat-server installation found" msgstr "" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 msgid "No working gnunet-helper-nat-client installation found" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "Lỗi đóng kết đến cổng %s %d.\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 #, fuzzy msgid "Connection reversal request failed\n" msgstr "Thu thập bị dừng.\n" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, fuzzy, c-format msgid "Failed to start %s\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 #, fuzzy msgid "Show network size estimates from NSE service." msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 #, fuzzy msgid "limit to the number of connections to NSE services, 0 for none" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 #, fuzzy msgid "Measure quality and performance of the NSE service." msgstr "Không thể truy cập đến dịch vụ" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 #, fuzzy msgid "Value is too large.\n" msgstr "Giá trị không nằm trong phạm vi được phép." -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, fuzzy, c-format msgid "Removing expired address of transport `%s'\n" msgstr "Đã nạp truyền tải « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" @@ -5761,1004 +5761,1009 @@ msgstr "" "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ " "bỏ.\n" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, fuzzy, c-format msgid "Scanning directory `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, fuzzy, c-format msgid "Cleaning up directory `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 #, fuzzy msgid "Failed to receive response from `PEERINFO' service." msgstr "" "\n" "Không nhận được đáp ứng từ gnunetd.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, fuzzy, c-format msgid "%sPeer `%s'\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, fuzzy, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "Lỗi đóng kết đến cổng %s %d.\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, c-format msgid "Failure: Received invalid %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, fuzzy, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "không quyết định các tên máy" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "chỉ xuất những chuỗi nhận diện" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "chỉ xuất nhận diện mình" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 #, fuzzy msgid "list all known peers" msgstr "liệt kê mọi bộ tiếp hợp mạng" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 #, fuzzy msgid "Print information about peers." msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, fuzzy, c-format msgid "Starting transport plugins `%s'\n" msgstr "Đang nạp các truyền tải « %s »\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, fuzzy, c-format msgid "Loading `%s' transport plugin\n" msgstr "Đang nạp các truyền tải « %s »\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, fuzzy, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 #, fuzzy msgid "Unexpected iteration response, this should not happen.\n" msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 #, fuzzy msgid "Received a malformed response from service." msgstr "Nhận yêu cầu định tuyến\n" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, fuzzy, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, fuzzy, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, fuzzy, c-format msgid "Unable to create indices: %s.\n" msgstr "Không thể tạo miền tên.\n" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, fuzzy, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 #, fuzzy msgid "Failed to store membership information!\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 #, fuzzy msgid "Failed to test membership!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 #, fuzzy msgid "Failed to get fragment!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 #, fuzzy msgid "Failed to get message!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 #, fuzzy msgid "Failed to get message fragment!\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 #, fuzzy msgid "Failed to get master counters!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 #, fuzzy msgid "Failed to end modifying state!\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 #, fuzzy msgid "Failed to begin synchronizing state!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 #, fuzzy msgid "Failed to end synchronizing state!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 #, fuzzy msgid "Failed to reset state!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 #, fuzzy msgid "Failed to get state variable!\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 #, fuzzy msgid "SQLite database running\n" msgstr "kho dữ liệu sqlite" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 msgid "Failed to pack DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 #, fuzzy msgid "# DNS requests mapped to VPN" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 #, fuzzy msgid "# DNS replies intercepted" msgstr "# các đáp ứng dht được định tuyến" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 msgid "Failed to parse DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 #, fuzzy msgid "# DNS requests dropped (timeout)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 #, fuzzy msgid "# DNS requests intercepted" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 #, fuzzy msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 #, fuzzy msgid "# DNS requests dropped (malformed)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 #, fuzzy msgid "# DNS replies received" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 #, fuzzy msgid "# DNS replies dropped (too late?)" msgstr "# các đáp ứng dht được định tuyến" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, fuzzy, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, fuzzy, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 #, fuzzy msgid "No configuration file given. Exiting\n" msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, fuzzy, c-format msgid "No files found in `%s'\n" msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 #, fuzzy msgid "Error loading search strings. Exiting.\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 #, fuzzy msgid "name of the file for writing statistics" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 #, fuzzy msgid "name of file with input strings" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 #, fuzzy msgid "name of file with hosts' names" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 msgid "name of the table to write DFAs" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, fuzzy, c-format msgid "Regex `%s' is too long!\n" msgstr "« %s » không phải là một tập tin.\n" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, fuzzy, c-format msgid "Search string `%s' is too long!\n" msgstr "« %s » không phải là một tập tin.\n" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 #, fuzzy msgid "GNUnet REST server" msgstr "Bản ghi lỗi GNUnet" -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, fuzzy, c-format msgid "Key `%s' is valid\n" msgstr "Định dạng của biệt hiệu « %s » là không hợp lệ.\n" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, fuzzy, c-format msgid "Key `%s' has been revoked\n" msgstr "Dịch vụ đã bị xoá.\n" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 #, fuzzy msgid "Internal error\n" msgstr "Lỗi VR." -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 #, fuzzy msgid "Revocation failed (!)\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, fuzzy, c-format msgid "Ego `%s' not found.\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, fuzzy, c-format msgid "Public key `%s' malformed\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 #, fuzzy msgid "No filename to store revocation certificate given.\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, fuzzy, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 #, fuzzy msgid "No action specified. Nothing to do.\n" msgstr "Chưa xác định giao diện nên dùng mặc định.\n" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 #, fuzzy msgid "# unsupported revocations received via set union" msgstr "# các yêu cầu danh sách máy được nhận" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 #, fuzzy msgid "# revocation messages received via set union" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 #, fuzzy msgid "# revocation set unions failed" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 #, fuzzy msgid "# revocation set unions completed" msgstr "# các sự truyền PONG bị lỗi" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 #, fuzzy msgid "Could not open revocation database file!" msgstr "« %s »: Không thể kết nối.\n" -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +#, fuzzy +msgid "Measure quality and performance of the RPS service." +msgstr "Không thể truy cập đến dịch vụ" + +#: src/scalarproduct/gnunet-scalarproduct.c:215 #, fuzzy msgid "You must specify at least one message ID to check!\n" msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, fuzzy, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 #, fuzzy msgid "Connect to CADET failed\n" msgstr " Không kết nối được (lỗi ?)\n" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 #, fuzzy msgid "number of element in set A-B" msgstr "số lần lặp lại" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 #, fuzzy msgid "number of element in set B-A" msgstr "số lần lặp lại" -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 #, fuzzy msgid "--place missing or invalid.\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 #, fuzzy msgid "name or public key of ego" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 #, fuzzy msgid "wait for incoming messages" msgstr "Lỗi gửi tin nhẳn.\n" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 msgid "GNS name" msgstr "" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 msgid "method name" msgstr "" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "số tin nhắn cần dùng mỗi lần lặp" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, fuzzy, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "Đã tải %llu byte xuống « %s ».\n" -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, fuzzy, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "Đã tải %llu byte xuống « %s ».\n" -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 #, fuzzy msgid "Failed to obtain statistics.\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, fuzzy, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "Lỗi lấy thông kê về truyền tải.\n" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, fuzzy, c-format msgid "No subsystem or name given\n" msgstr "chưa đưa ra tên" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, fuzzy, c-format msgid "Failed to initialize watch routine\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, fuzzy, c-format msgid "Invalid argument `%s'\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, fuzzy, c-format msgid "A port is required to connect to host `%s'\n" msgstr "Không thể kết nối tới %s:%u: %s\n" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "In ra thống kê về các thao tác GNUnet." -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 #, fuzzy msgid "Could not save some persistent statistics\n" msgstr "Không thể tạo miền tên.\n" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 #, fuzzy msgid "Need at least 2 arguments\n" msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, fuzzy, c-format msgid "Invalid topology: %s\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, fuzzy, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, fuzzy, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "Đối số không hợp lệ cho « %s ».\n" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6782,83 +6787,83 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, fuzzy, c-format msgid "%s is stopped" msgstr "# các byte trong kho dữ liệu" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, c-format msgid "%s is starting" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, fuzzy, c-format msgid "%s is starting already" msgstr "« %s » đang đăng ký trình điều khiển %d\n" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, fuzzy, c-format msgid "%s service is not known to ARM" msgstr "Không gian tên « %s » có đánh giá %d.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, fuzzy, c-format msgid "%s service failed to start" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, fuzzy, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "« %s » đang tắt.\n" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, c-format msgid "%.s Unknown result code." msgstr "" @@ -6873,176 +6878,176 @@ msgstr "Đang đợi các đồng đẳng kết nối" msgid "Spawning process `%s'\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" msgstr "« %s » thất bại với mã lỗi %d: %s\n" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, fuzzy, c-format msgid "Hosts file %s not found\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, fuzzy, c-format msgid "Hosts file %s has no data\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, fuzzy, c-format msgid "Hosts file %s cannot be read\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 msgid "Cannot start the master controller" msgstr "" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, fuzzy, c-format msgid "Topology file %s not found\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, fuzzy, c-format msgid "Topology file %s has no data\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, fuzzy, c-format msgid "Topology file %s cannot be read\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, fuzzy, c-format msgid "Failed to read peer index from toology file: %s" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, fuzzy, c-format msgid "Failed to read peer index from topology file: %s" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, fuzzy, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, fuzzy, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 #, fuzzy msgid "create unique configuration files" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 #, fuzzy msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 #, fuzzy msgid "configuration template" msgstr "Cấu hình đã được lưu." -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" @@ -7050,1456 +7055,1456 @@ msgstr "" msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, fuzzy, c-format msgid "Key number %u does not exist\n" msgstr "đặt số trình nền cần khởi chạy" -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " "precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, fuzzy, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 #, fuzzy msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, fuzzy, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, fuzzy, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "Lỗi tạo thư mục tạm thời." -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, fuzzy, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, fuzzy, c-format msgid "Failed to start `%s': %s\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, fuzzy, c-format msgid "Failed to load configuration from %s\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "" "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 #, fuzzy msgid "# connect requests issued to ATS" msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào" -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 #, fuzzy msgid "# HELLO messages gossipped" msgstr "# các thông báo gửi đi bị loại bỏ" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 #, fuzzy msgid "# friends connected" msgstr "# của các đồng đẳng đã kết nối" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr "" "\n" "Kết thúc cấu hình.\n" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 #, fuzzy msgid "# friends in configuration" msgstr "" "\n" "Kết thúc cấu hình.\n" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 #, fuzzy msgid "# HELLO messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 #, fuzzy msgid "# messages dropped due to slow client" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 #, fuzzy msgid "# bytes payload discarded due to not connected peer" msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 #, fuzzy msgid "# bytes total received" msgstr "# tổng số nội dung lỗ hổng được nhận" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 #, fuzzy msgid "# bytes payload received" msgstr "# các byte đã giải mã" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, fuzzy, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, fuzzy, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 #, fuzzy msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 #, fuzzy msgid "# session creation failed" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 #, fuzzy msgid "# DISCONNECT messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 #, fuzzy msgid "# bytes in message queue for other peers" msgstr "# các byte thông báo gửi đi bị loại bỏ" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 #, fuzzy msgid "# messages transmitted to other peers" msgstr "# các byte kiểu %d được gửi " -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 #, fuzzy msgid "# transmission failures for messages to other peers" msgstr "# các byte thông báo gửi đi bị loại bỏ" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 #, fuzzy msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 #, fuzzy msgid "# KEEPALIVE messages discarded (no session)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 #, fuzzy msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 #, fuzzy msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 #, fuzzy msgid "# messages discarded due to lack of neighbour record" msgstr "# các thông báo được chắp liền" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 #, fuzzy msgid "# bandwidth quota violations by other peers" msgstr "theo dõi gnunetd sử dụng dải thông" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 #, fuzzy msgid "# SYN messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 #, fuzzy msgid "# SYN_ACK messages sent" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "Lỗi sơ khởi dịch vụ « %s ».\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 #, fuzzy msgid "# SYN messages received" msgstr "# các thông báo PING được tạo" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 #, fuzzy msgid "# SYN_ACK messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 #, fuzzy msgid "# unexpected SYN_ACK messages (no peer)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 #, fuzzy msgid "# unexpected SYN_ACK messages (not ready)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 #, fuzzy msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 #, fuzzy msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "gửi ĐẾM thông báo" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 #, fuzzy msgid "# ACK messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 #, fuzzy msgid "# unexpected ACK messages" msgstr "# các thông báo PONG đã mật mã được gửi" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 #, fuzzy msgid "# quota messages ignored (malformed)" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 #, fuzzy msgid "# QUOTA messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 #, fuzzy msgid "# DISCONNECT messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 #, fuzzy msgid "# disconnected from peer upon explicit request" msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, fuzzy, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, fuzzy, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 msgid "# Addresses in validation map" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 #, fuzzy msgid "# validations running" msgstr "kho dữ liệu sqlite" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 #, fuzzy msgid "# address records discarded (timeout)" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 msgid "# address records discarded (blacklist)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 msgid "# PINGs for address validation sent" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 #, fuzzy msgid "# PING message for different peer received" msgstr "# các thông báo PING được tạo" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " "having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, fuzzy, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "Không thể tạo miền tên.\n" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 msgid "# validations succeeded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 #, fuzzy msgid "# HELLOs given to peerinfo" msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, fuzzy, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, fuzzy, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, fuzzy, c-format msgid "Failed to connect to `%s'\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, fuzzy, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "Lỗi đóng kết đến cổng %s %d.\n" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 #, fuzzy msgid "Failed to list connections, timeout occured\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, fuzzy, c-format msgid "Transmitting %u bytes\n" msgstr "Đang thử tải danh sách các máy xuống « %s »\n" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " "blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, fuzzy, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "« %.*s » được kết nối tới « %.*s ».\n" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 #, fuzzy msgid "Connected to" msgstr "« %s » được kết nối tới « %s ».\n" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 #, fuzzy msgid "Disconnected from" msgstr "« %.*s » được kết nối tới « %.*s ».\n" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, fuzzy, c-format msgid "Received %u bytes\n" msgstr "Nhận yêu cầu định tuyến\n" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, fuzzy, c-format msgid "Peer `%s': %s %s\n" msgstr "Tôi là đồng đẳng « %s ».\n" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 #, fuzzy msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " "%s, %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 #, fuzzy msgid "Failed to connect to transport service for disconnection\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 #, fuzzy msgid "Failed to connect to transport service\n" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 #, fuzzy msgid "print information for all peers (instead of only connected peers)" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 #, fuzzy msgid "disconnect from a peer" msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 #, fuzzy msgid "provide information about all current connections (once)" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 #, fuzzy msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "In ra thông tin về các đồng đẳng GNUnet." -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 #, fuzzy msgid "do not resolve hostnames" msgstr "không quyết định các tên máy" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 msgid "monitor plugin sessions" msgstr "" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 #, fuzzy msgid "Direct access to transport service." msgstr "Lỗi kết nối đến gnunetd.\n" -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 #, fuzzy msgid "receive data from peer" msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 #, fuzzy msgid "iterations" msgstr "Tùy chọn chung" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "số tin nhắn cần dùng mỗi lần lặp" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 #, fuzzy msgid "message size to use" msgstr "kích cỡ tin nhắn" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, fuzzy, c-format msgid "Shutting down plugin `%s'\n" msgstr "Đang nạp các truyền tải « %s »\n" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, fuzzy, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, fuzzy, c-format msgid "Maximum number of requests is %u\n" msgstr "tăng sổ tối đa các kết nối TCP/IP" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " "size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 #, fuzzy msgid "Require valid port number for service in configuration!\n" msgstr "Lỗi lưu cấu hình." -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 #, fuzzy msgid "Port is required! Fix in configuration\n" msgstr "" "\n" "Kết thúc cấu hình.\n" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, fuzzy, c-format msgid "Using port %u\n" msgstr "Đang thử nghiệm (các) truyền tải %s\n" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, fuzzy, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, fuzzy, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, fuzzy, c-format msgid "Using external hostname `%s'\n" msgstr "Đang bắt đầu tài về « %s »\n" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, fuzzy, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "không quyết định các tên máy" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, fuzzy, c-format msgid "Maximum number of connections is %u\n" msgstr "tăng sổ tối đa các kết nối TCP/IP" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 #, fuzzy msgid "Unable to compile URL regex\n" msgstr "Không thể sơ khởi SQLite: %s.\n" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n" -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n" -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "SMTP: « %s » bị lỗi: %s\n" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 msgid "# bytes received via SMTP" msgstr "# các byte đã nhận qua SMTP" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 msgid "# bytes sent via SMTP" msgstr "# các byte đã gửi qua SMTP" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 msgid "# bytes dropped by SMTP (outgoing)" msgstr "# các byte loại đi bởi SMTP (đi ra)" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, fuzzy, c-format msgid "Unexpected address length: %u bytes\n" msgstr "Gặp sự kiện bất thường: %d\n" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 #, fuzzy msgid "# TCP sessions active" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 #, fuzzy msgid "# bytes currently in TCP buffers" msgstr "# các byte đã gừi qua TCP" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 #, fuzzy msgid "# bytes discarded by TCP (disconnect)" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 #, fuzzy msgid "# bytes discarded by TCP (timeout)" msgstr "# các byte loại đi bởi TCP (đi ra)" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 #, fuzzy msgid "# bytes transmitted via TCP" msgstr "# các byte được gửi" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 #, fuzzy msgid "# TCP WELCOME messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "# các byte đã nhận qua TCP" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr "# các kết nối dht" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 #, fuzzy msgid "# TCP server connect events" msgstr "# của các đồng đẳng đã kết nối" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 #, fuzzy msgid "Failed to start service.\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 #, fuzzy msgid "# Multicast HELLO beacons received via UDP" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "« %s » không sẵn sàng.\n" -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "« %s » không sẵn sàng.\n" -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "Không thể tạo miền tên.\n" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" msgstr "Không thể tạo miền tên.\n" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, fuzzy, c-format msgid "Cannot bind to `%s'\n" msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 #, fuzzy msgid "Failed to open UNIX listen socket\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 msgid "# ACKs sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 #, fuzzy msgid "# Messages defragmented" msgstr "# các thông báo được chắp liền" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 #, fuzzy msgid "# Sessions allocated" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 #, fuzzy msgid "# message fragments sent" msgstr "# các thông báo bị tế phân" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 #, fuzzy msgid "# messages pending (with fragmentation)" msgstr "# các thông báo được chắp liền" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 #, fuzzy msgid "# MAC endpoints allocated" msgstr "# các yêu cầu get (lấy) dht được nhận" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 #, fuzzy msgid "# ACKs received" msgstr "# các byte đã nhận qua TCP" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 #, fuzzy msgid "# DATA messages discarded due to CRC32 error" msgstr "# các thông báo được chắp liền" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 #, fuzzy msgid "# HELLO beacons sent" msgstr "# các byte đã gửi qua UDP" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 #, fuzzy msgid "# DATA messages received" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 #, fuzzy msgid "# DATA messages processed" msgstr "# các thông báo PONG đã mật mã được nhận" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 #, fuzzy msgid "# sessions allocated" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, c-format msgid "XT transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 msgid "XT transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "# các khoá phiên chạy được chấp nhận" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " "network configuration\n" msgstr "" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 msgid "" "XU could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "Không thể tạo miền tên.\n" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, fuzzy, c-format msgid "Access denied to `%s'\n" msgstr "Không đủ quyền cho « %s ».\n" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "" -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, fuzzy, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, fuzzy, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, fuzzy, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, fuzzy, c-format msgid "Unknown address family %d\n" msgstr "\tKhông rõ miền tên « %s »\n" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, fuzzy, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, fuzzy, c-format msgid "Service `%s' runs at %s\n" msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "Không có người dùng như vậy" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "Gặp lỗi khi tạo người dùng" -#: src/util/bio.c:191 +#: src/util/bio.c:186 msgid "End of file" msgstr "" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "GỠ LỖI" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "TIN" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "CẢNH BÁO" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "LỖI" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, fuzzy, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "" "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" msgstr "" "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, fuzzy, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "Gặp lỗi khi tải xuống: %s\n" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " @@ -8508,96 +8513,96 @@ msgstr "" "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong " "tập hợp các sự chọn được phép\n" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 #, fuzzy msgid "Could not load peer's private key\n" msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "%s bị lỗi tại %s:%d: « %s »\n" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, c-format msgid "Expected `%s' to be a directory!\n" msgstr "Mong đợi « %s » là một thư mục.\n" @@ -8668,11 +8673,11 @@ msgstr "" msgid "Missing mandatory option `%s'.\n" msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "hiển thị số thứ tự phiên bản" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" @@ -8680,707 +8685,707 @@ msgstr "" "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn " "ngắn.\n" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "hiển thị trợ giúp này" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "xuất chi tiết" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 #, fuzzy msgid "configure logging to write logs to FILENAME" msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, fuzzy, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "Phải gửi một con số cho tùy chọn « %s ».\n" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "Không thể lưu tập tin cấu hình « %s »:" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, fuzzy, c-format msgid "--section argument is required\n" msgstr "đặt tên hiệu cần dùng (cần thiết)" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 #, fuzzy msgid "print available configuration sections" msgstr "Lưu cấu hình ngay bây giờ không?" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, fuzzy, c-format msgid "Failed to open `%s': %s\n" msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, c-format msgid "Generating %u keys like %s, please wait" msgstr "" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, fuzzy, c-format msgid "" "\n" "Failed to write to `%s': %s\n" msgstr "Lỗi chạy %s: %s %d\n" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, c-format msgid "" "\n" "Finished!\n" msgstr "" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, fuzzy, c-format msgid "Hostkeys file `%s' not found\n" msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 #, fuzzy msgid "Manipulate GNUnet proof of work files" msgstr "cập nhật một giá trị trong tập tin cấu hình" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "Không thể giải quyết « %s » (%s): %s\n" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, fuzzy, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, fuzzy, c-format msgid "Error reading from `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, fuzzy, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, fuzzy, c-format msgid "Error writing to `%s': %s\n" msgstr "Gặp lỗi khi tạo người dùng" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "Không thể đọc danh sách bạn bè « %s »\n" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 #, fuzzy msgid "Could not determine plugin installation path.\n" msgstr "Không thể truy cập đến thông tin về không gian tên.\n" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, fuzzy, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "không quyết định các tên máy" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, fuzzy, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n" -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "Không thể giải quyết « %s » (%s): %s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVICE_client_continue' after %s\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "b" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "" "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "mg" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "g" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "p" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "g" -#: src/util/strings.c:739 +#: src/util/strings.c:734 #, fuzzy msgid "day" msgstr " ngày" -#: src/util/strings.c:741 +#: src/util/strings.c:736 #, fuzzy msgid "days" msgstr " ngày" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "Lỗi bắt đầu thu thập.\n" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)." -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "Địa chỉ IP định dạng sai: %s\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, fuzzy, c-format msgid "Wrong format `%s' for netmask\n" msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, fuzzy, c-format msgid "Wrong format `%s' for network\n" msgstr "Mạng có định dạng sai « %s »: %s\n" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 #, fuzzy msgid "# Active channels" msgstr "# các kết nối dht" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 #, fuzzy msgid "# Messages dropped in cadet queue (overflow)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 #, fuzzy msgid "# ICMP packets received from cadet" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 #, fuzzy msgid "# UDP packets received from cadet" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 #, fuzzy msgid "# TCP packets received from cadet" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 #, fuzzy msgid "# Cadet channels created" msgstr "# các truy vấn lỗ hổng được định tuyến" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 #, fuzzy msgid "# Packets dropped (channel not yet online)" msgstr "# các byte loại bỏ bởi UDP (đi ra)" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 #, fuzzy msgid "# Packets received from TUN interface" msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 #, fuzzy msgid "# Active destinations" msgstr "# các kết nối dht" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 #, fuzzy msgid "Must specify valid IPv6 address" msgstr "« %s » không sẵn sàng.\n" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 #, fuzzy msgid "Must specify valid IPv4 address" msgstr "« %s » không sẵn sàng.\n" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 #, fuzzy msgid "Error creating tunnel\n" msgstr "Hoàn thành tạo khoá.\n" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, fuzzy, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, fuzzy, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, fuzzy, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, fuzzy, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, fuzzy, c-format msgid "`%s' is not a valid IP address.\n" msgstr "« %s » không sẵn sàng.\n" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 #, fuzzy msgid "service is offered via TCP" msgstr "# các byte đã nhận qua TCP" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 #, fuzzy msgid "service is offered via UDP" msgstr "# các byte đã nhận qua UDP" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "Không kết nối được đến trình nền gnunetd." -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, fuzzy, c-format msgid "Assertion failed at %s:%d.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, fuzzy, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4e77d8c08d..bc0b9d06a6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnunet-0.8.1\n" "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n" -"POT-Creation-Date: 2018-06-05 22:13+0200\n" +"POT-Creation-Date: 2018-06-06 08:27+0200\n" "PO-Revision-Date: 2011-07-09 12:12+0800\n" "Last-Translator: Wylmer Wang \n" "Language-Team: Chinese (simplified) \n" @@ -16,1032 +16,1032 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/arm/gnunet-arm.c:156 +#: src/arm/gnunet-arm.c:151 #, fuzzy, c-format msgid "Failed to remove configuration file %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/arm/gnunet-arm.c:162 +#: src/arm/gnunet-arm.c:157 #, c-format msgid "Failed to remove servicehome directory %s\n" msgstr "" -#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139 +#: src/arm/gnunet-arm.c:217 src/testbed/gnunet-service-testbed_peers.c:1134 msgid "Message was sent successfully" msgstr "" -#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141 +#: src/arm/gnunet-arm.c:219 src/testbed/gnunet-service-testbed_peers.c:1136 msgid "We disconnected from ARM before we could send a request" msgstr "" -#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143 +#: src/arm/gnunet-arm.c:221 src/testbed/gnunet-service-testbed_peers.c:1138 #, fuzzy msgid "Unknown request status" msgstr "未知的用户“%s”\n" -#: src/arm/gnunet-arm.c:242 +#: src/arm/gnunet-arm.c:237 #, fuzzy msgid "is stopped" msgstr "服务已删除。\n" -#: src/arm/gnunet-arm.c:244 +#: src/arm/gnunet-arm.c:239 msgid "is starting" msgstr "" -#: src/arm/gnunet-arm.c:246 +#: src/arm/gnunet-arm.c:241 msgid "is stopping" msgstr "" -#: src/arm/gnunet-arm.c:248 +#: src/arm/gnunet-arm.c:243 msgid "is starting already" msgstr "" -#: src/arm/gnunet-arm.c:250 +#: src/arm/gnunet-arm.c:245 msgid "is stopping already" msgstr "" -#: src/arm/gnunet-arm.c:252 +#: src/arm/gnunet-arm.c:247 msgid "is started already" msgstr "" -#: src/arm/gnunet-arm.c:254 +#: src/arm/gnunet-arm.c:249 msgid "is stopped already" msgstr "" -#: src/arm/gnunet-arm.c:256 +#: src/arm/gnunet-arm.c:251 #, fuzzy msgid "service is not known to ARM" msgstr "服务已删除。\n" -#: src/arm/gnunet-arm.c:258 +#: src/arm/gnunet-arm.c:253 #, fuzzy msgid "service failed to start" msgstr "运行 %s失败：%s %d\n" -#: src/arm/gnunet-arm.c:260 +#: src/arm/gnunet-arm.c:255 msgid "service cannot be manipulated because ARM is shutting down" msgstr "" -#: src/arm/gnunet-arm.c:262 +#: src/arm/gnunet-arm.c:257 #, fuzzy msgid "Unknown result code." msgstr "未知的用户“%s”\n" -#: src/arm/gnunet-arm.c:294 +#: src/arm/gnunet-arm.c:289 msgid "Fatal error initializing ARM API.\n" msgstr "" -#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:331 +#: src/arm/gnunet-arm.c:317 src/arm/gnunet-arm.c:326 #, fuzzy, c-format msgid "Failed to start the ARM service: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/arm/gnunet-arm.c:365 +#: src/arm/gnunet-arm.c:360 #, fuzzy, c-format msgid "Failed to send a stop request to the ARM service: %s\n" msgstr "初始化“%s”服务失败。\n" -#: src/arm/gnunet-arm.c:376 +#: src/arm/gnunet-arm.c:371 #, fuzzy, c-format msgid "Failed to stop the ARM service: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/arm/gnunet-arm.c:415 +#: src/arm/gnunet-arm.c:410 #, fuzzy, c-format msgid "Failed to send a request to start the `%s' service: %s\n" msgstr "初始化“%s”服务失败。\n" -#: src/arm/gnunet-arm.c:425 +#: src/arm/gnunet-arm.c:420 #, fuzzy, c-format msgid "Failed to start the `%s' service: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/arm/gnunet-arm.c:462 +#: src/arm/gnunet-arm.c:457 #, fuzzy, c-format msgid "Failed to send a request to kill the `%s' service: %%s\n" msgstr "初始化“%s”服务失败。\n" -#: src/arm/gnunet-arm.c:473 +#: src/arm/gnunet-arm.c:468 #, fuzzy, c-format msgid "Failed to kill the `%s' service: %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/arm/gnunet-arm.c:513 +#: src/arm/gnunet-arm.c:508 #, fuzzy, c-format msgid "Failed to request a list of services: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/arm/gnunet-arm.c:522 +#: src/arm/gnunet-arm.c:517 #, fuzzy msgid "Error communicating with ARM. ARM not running?\n" msgstr "连接 %s:%u 出错。守护程序在运行吗？\n" -#: src/arm/gnunet-arm.c:528 +#: src/arm/gnunet-arm.c:523 msgid "Running services:\n" msgstr "" -#: src/arm/gnunet-arm.c:616 +#: src/arm/gnunet-arm.c:611 #, c-format msgid "Now only monitoring, press CTRL-C to stop.\n" msgstr "" -#: src/arm/gnunet-arm.c:648 +#: src/arm/gnunet-arm.c:643 #, c-format msgid "Stopped %s.\n" msgstr "" -#: src/arm/gnunet-arm.c:651 +#: src/arm/gnunet-arm.c:646 #, fuzzy, c-format msgid "Starting %s...\n" msgstr "未知的命令“%s”。\n" -#: src/arm/gnunet-arm.c:654 +#: src/arm/gnunet-arm.c:649 #, c-format msgid "Stopping %s...\n" msgstr "" -#: src/arm/gnunet-arm.c:668 +#: src/arm/gnunet-arm.c:663 #, fuzzy, c-format msgid "Unknown status %u for service %s.\n" msgstr "未知的用户“%s”\n" -#: src/arm/gnunet-arm.c:769 +#: src/arm/gnunet-arm.c:764 #, fuzzy msgid "stop all GNUnet services" msgstr "卸载 GNUnet 服务" -#: src/arm/gnunet-arm.c:775 +#: src/arm/gnunet-arm.c:770 msgid "start a particular service" msgstr "" -#: src/arm/gnunet-arm.c:781 +#: src/arm/gnunet-arm.c:776 msgid "stop a particular service" msgstr "" -#: src/arm/gnunet-arm.c:786 +#: src/arm/gnunet-arm.c:781 #, fuzzy msgid "start all GNUnet default services" msgstr "卸载 GNUnet 服务" -#: src/arm/gnunet-arm.c:791 +#: src/arm/gnunet-arm.c:786 #, fuzzy msgid "stop and start all GNUnet default services" msgstr "卸载 GNUnet 服务" -#: src/arm/gnunet-arm.c:795 +#: src/arm/gnunet-arm.c:790 msgid "delete config file and directory on exit" msgstr "" -#: src/arm/gnunet-arm.c:800 +#: src/arm/gnunet-arm.c:795 msgid "monitor ARM activities" msgstr "" -#: src/arm/gnunet-arm.c:805 +#: src/arm/gnunet-arm.c:800 msgid "don't print status messages" msgstr "" -#: src/arm/gnunet-arm.c:811 +#: src/arm/gnunet-arm.c:806 msgid "exit with error status if operation does not finish after DELAY" msgstr "" -#: src/arm/gnunet-arm.c:816 +#: src/arm/gnunet-arm.c:811 msgid "list currently running services" msgstr "" -#: src/arm/gnunet-arm.c:821 +#: src/arm/gnunet-arm.c:816 msgid "don't let gnunet-service-arm inherit standard output" msgstr "" -#: src/arm/gnunet-arm.c:826 +#: src/arm/gnunet-arm.c:821 msgid "don't let gnunet-service-arm inherit standard error" msgstr "" -#: src/arm/gnunet-arm.c:839 +#: src/arm/gnunet-arm.c:834 msgid "Control services and the Automated Restart Manager (ARM)" msgstr "" -#: src/arm/gnunet-service-arm.c:374 src/transport/plugin_transport_tcp.c:1120 -#: src/transport/plugin_transport_xt.c:1120 -#: src/transport/tcp_service_legacy.c:557 src/util/service.c:612 +#: src/arm/gnunet-service-arm.c:369 src/transport/plugin_transport_tcp.c:1115 +#: src/transport/plugin_transport_xt.c:1115 +#: src/transport/tcp_service_legacy.c:552 src/util/service.c:607 #, c-format msgid "" "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399 -#: src/transport/plugin_transport_tcp.c:1139 -#: src/transport/plugin_transport_tcp.c:1145 -#: src/transport/plugin_transport_tcp.c:3825 -#: src/transport/plugin_transport_xt.c:1139 -#: src/transport/plugin_transport_xt.c:1145 -#: src/transport/plugin_transport_xt.c:3833 -#: src/transport/tcp_service_legacy.c:576 -#: src/transport/tcp_service_legacy.c:582 src/util/service.c:637 -#: src/util/service.c:643 +#: src/arm/gnunet-service-arm.c:388 src/arm/gnunet-service-arm.c:394 +#: src/transport/plugin_transport_tcp.c:1134 +#: src/transport/plugin_transport_tcp.c:1140 +#: src/transport/plugin_transport_tcp.c:3820 +#: src/transport/plugin_transport_xt.c:1134 +#: src/transport/plugin_transport_xt.c:1140 +#: src/transport/plugin_transport_xt.c:3828 +#: src/transport/tcp_service_legacy.c:571 +#: src/transport/tcp_service_legacy.c:577 src/util/service.c:632 +#: src/util/service.c:638 #, c-format msgid "Require valid port number for service `%s' in configuration!\n" msgstr "" -#: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176 -#: src/transport/plugin_transport_xt.c:1176 -#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506 -#: src/util/service.c:682 +#: src/arm/gnunet-service-arm.c:425 src/transport/plugin_transport_tcp.c:1171 +#: src/transport/plugin_transport_xt.c:1171 +#: src/transport/tcp_service_legacy.c:608 src/util/client.c:501 +#: src/util/service.c:677 #, c-format msgid "UNIXPATH `%s' too long, maximum length is %llu\n" msgstr "" -#: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180 -#: src/transport/plugin_transport_xt.c:1180 -#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511 -#: src/util/service.c:687 +#: src/arm/gnunet-service-arm.c:429 src/transport/plugin_transport_tcp.c:1175 +#: src/transport/plugin_transport_xt.c:1175 +#: src/transport/tcp_service_legacy.c:612 src/util/client.c:506 +#: src/util/service.c:682 #, fuzzy, c-format msgid "Using `%s' instead\n" msgstr "%s：选项“%s”有歧义\n" -#: src/arm/gnunet-service-arm.c:465 src/transport/plugin_transport_tcp.c:1211 -#: src/transport/plugin_transport_xt.c:1211 -#: src/transport/tcp_service_legacy.c:648 src/util/service.c:723 +#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1206 +#: src/transport/plugin_transport_xt.c:1206 +#: src/transport/tcp_service_legacy.c:643 src/util/service.c:718 #, c-format msgid "" "Disabling UNIX domain socket support for service `%s', failed to create UNIX " "domain socket: %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:482 src/transport/plugin_transport_tcp.c:1228 -#: src/transport/plugin_transport_xt.c:1228 -#: src/transport/tcp_service_legacy.c:665 src/util/service.c:741 +#: src/arm/gnunet-service-arm.c:477 src/transport/plugin_transport_tcp.c:1223 +#: src/transport/plugin_transport_xt.c:1223 +#: src/transport/tcp_service_legacy.c:660 src/util/service.c:736 #, c-format msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n" msgstr "" -#: src/arm/gnunet-service-arm.c:513 -#: src/transport/plugin_transport_http_server.c:2684 -#: src/transport/plugin_transport_tcp.c:1259 -#: src/transport/plugin_transport_xt.c:1259 -#: src/transport/tcp_service_legacy.c:696 src/util/service.c:782 +#: src/arm/gnunet-service-arm.c:508 +#: src/transport/plugin_transport_http_server.c:2679 +#: src/transport/plugin_transport_tcp.c:1254 +#: src/transport/plugin_transport_xt.c:1254 +#: src/transport/tcp_service_legacy.c:691 src/util/service.c:777 #, fuzzy, c-format msgid "Failed to resolve `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/arm/gnunet-service-arm.c:532 -#: src/transport/plugin_transport_http_server.c:2702 -#: src/transport/plugin_transport_tcp.c:1278 -#: src/transport/plugin_transport_xt.c:1278 -#: src/transport/tcp_service_legacy.c:715 src/util/service.c:802 +#: src/arm/gnunet-service-arm.c:527 +#: src/transport/plugin_transport_http_server.c:2697 +#: src/transport/plugin_transport_tcp.c:1273 +#: src/transport/plugin_transport_xt.c:1273 +#: src/transport/tcp_service_legacy.c:710 src/util/service.c:797 #, fuzzy, c-format msgid "Failed to find %saddress for `%s'.\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/arm/gnunet-service-arm.c:933 +#: src/arm/gnunet-service-arm.c:928 #, fuzzy, c-format msgid "Failed to start service `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/arm/gnunet-service-arm.c:944 +#: src/arm/gnunet-service-arm.c:939 #, c-format msgid "Starting service `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1056 +#: src/arm/gnunet-service-arm.c:1051 #, fuzzy, c-format msgid "Unable to create socket for service `%s': %s\n" msgstr "无法创建用户账户：" -#: src/arm/gnunet-service-arm.c:1091 +#: src/arm/gnunet-service-arm.c:1086 #, c-format msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1134 +#: src/arm/gnunet-service-arm.c:1129 #, c-format msgid "ARM now monitors connections to service `%s' at `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1310 +#: src/arm/gnunet-service-arm.c:1305 #, c-format msgid "Preparing to stop `%s'\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1612 +#: src/arm/gnunet-service-arm.c:1607 #, c-format msgid "Restarting service `%s'.\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1772 +#: src/arm/gnunet-service-arm.c:1767 msgid "exit" msgstr "" -#: src/arm/gnunet-service-arm.c:1777 +#: src/arm/gnunet-service-arm.c:1772 msgid "signal" msgstr "" -#: src/arm/gnunet-service-arm.c:1782 +#: src/arm/gnunet-service-arm.c:1777 #, fuzzy msgid "unknown" msgstr "未知错误" -#: src/arm/gnunet-service-arm.c:1788 +#: src/arm/gnunet-service-arm.c:1783 #, fuzzy, c-format msgid "Service `%s' took %s to terminate\n" msgstr "服务已删除。\n" -#: src/arm/gnunet-service-arm.c:1814 +#: src/arm/gnunet-service-arm.c:1809 #, c-format msgid "Service `%s' terminated normally, will restart at any time\n" msgstr "" -#: src/arm/gnunet-service-arm.c:1830 +#: src/arm/gnunet-service-arm.c:1825 #, c-format msgid "Service `%s' terminated with status %s/%d, will restart in %s\n" msgstr "" -#: src/arm/mockup-service.c:42 +#: src/arm/mockup-service.c:37 msgid "Initiating shutdown as requested by client.\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822 +#: src/ats/gnunet-ats-solver-eval.c:2776 src/ats/gnunet-ats-solver-eval.c:2817 #, c-format msgid "" "Could not load quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2799 +#: src/ats/gnunet-ats-solver-eval.c:2794 #, c-format msgid "" "No outbound quota configured for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:2840 +#: src/ats/gnunet-ats-solver-eval.c:2835 #, c-format msgid "" "No outbound quota configure for network `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939 +#: src/ats/gnunet-ats-solver-eval.c:3289 src/ats-tests/gnunet-solver-eval.c:934 msgid "solver to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945 -#: src/ats-tests/gnunet-solver-eval.c:950 +#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:940 +#: src/ats-tests/gnunet-solver-eval.c:945 msgid "experiment to use" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3306 +#: src/ats/gnunet-ats-solver-eval.c:3301 #, fuzzy msgid "print logging" msgstr "未知的命令“%s”。\n" -#: src/ats/gnunet-ats-solver-eval.c:3311 +#: src/ats/gnunet-ats-solver-eval.c:3306 msgid "save logging to disk" msgstr "" -#: src/ats/gnunet-ats-solver-eval.c:3316 +#: src/ats/gnunet-ats-solver-eval.c:3311 msgid "disable normalization" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:304 +#: src/ats/gnunet-service-ats_plugins.c:299 #, c-format msgid "" "Could not load %s quota for network `%s': `%s', assigning default bandwidth " "%llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:314 +#: src/ats/gnunet-service-ats_plugins.c:309 #, c-format msgid "%s quota configured for network `%s' is %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:359 +#: src/ats/gnunet-service-ats_plugins.c:354 #, c-format msgid "" "No %s-quota configured for network `%s', assigning default bandwidth %llu\n" msgstr "" -#: src/ats/gnunet-service-ats_plugins.c:451 +#: src/ats/gnunet-service-ats_plugins.c:446 #, fuzzy, c-format msgid "Failed to initialize solver `%s'!\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/ats/plugin_ats_mlp.c:1274 +#: src/ats/plugin_ats_mlp.c:1269 msgid "Problem size too large, cannot allocate memory!\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1869 +#: src/ats/plugin_ats_mlp.c:1864 #, c-format msgid "Adding address for peer `%s' multiple times\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:1913 +#: src/ats/plugin_ats_mlp.c:1908 #, c-format msgid "Updating address property for peer `%s' %p not added before\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2475 +#: src/ats/plugin_ats_mlp.c:2470 msgid "" "MLP solver is not optimizing for anything, changing to feasibility check\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532 -#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582 -#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141 -#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629 -#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663 -#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697 -#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731 +#: src/ats/plugin_ats_mlp.c:2510 src/ats/plugin_ats_mlp.c:2527 +#: src/ats/plugin_ats_mlp.c:2559 src/ats/plugin_ats_mlp.c:2577 +#: src/ats/plugin_ats_mlp.c:2596 src/ats/plugin_ats_proportional.c:1136 +#: src/ats/plugin_ats_ril.c:2607 src/ats/plugin_ats_ril.c:2624 +#: src/ats/plugin_ats_ril.c:2641 src/ats/plugin_ats_ril.c:2658 +#: src/ats/plugin_ats_ril.c:2675 src/ats/plugin_ats_ril.c:2692 +#: src/ats/plugin_ats_ril.c:2709 src/ats/plugin_ats_ril.c:2726 #, fuzzy, c-format msgid "Invalid %s configuration %f \n" msgstr "解析配置文件“%s”失败\n" -#: src/ats/plugin_ats_mlp.c:2670 +#: src/ats/plugin_ats_mlp.c:2665 #, c-format msgid "" "Adjusting inconsistent outbound quota configuration for network `%s', is " "%llu must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2679 +#: src/ats/plugin_ats_mlp.c:2674 #, c-format msgid "" "Adjusting inconsistent inbound quota configuration for network `%s', is %llu " "must be at least %llu\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2689 +#: src/ats/plugin_ats_mlp.c:2684 #, c-format msgid "" "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_mlp.c:2698 +#: src/ats/plugin_ats_mlp.c:2693 #, c-format msgid "" "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n" msgstr "" -#: src/ats/plugin_ats_proportional.c:1164 +#: src/ats/plugin_ats_proportional.c:1159 #, fuzzy, c-format msgid "Invalid %s configuration %f\n" msgstr "解析配置文件“%s”失败\n" -#: src/ats-tests/ats-testing.c:422 +#: src/ats-tests/ats-testing.c:417 #, c-format msgid "Connected master [%u] with slave [%u]\n" msgstr "" -#: src/ats-tests/ats-testing.c:429 +#: src/ats-tests/ats-testing.c:424 #, fuzzy, c-format msgid "Failed to connect master peer [%u] with slave [%u]\n" msgstr "初始化“%s”服务失败。\n" -#: src/ats-tests/ats-testing-log.c:837 +#: src/ats-tests/ats-testing-log.c:832 msgid "Stop logging\n" msgstr "" -#: src/ats-tests/ats-testing-log.c:892 +#: src/ats-tests/ats-testing-log.c:887 #, fuzzy, c-format msgid "Start logging `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/ats-tests/gnunet-ats-sim.c:90 +#: src/ats-tests/gnunet-ats-sim.c:85 #, c-format msgid "" "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. " "= %u KiB/s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:307 +#: src/ats-tool/gnunet-ats.c:302 #, c-format msgid "%u address resolutions had a timeout\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:311 +#: src/ats-tool/gnunet-ats.c:306 #, c-format msgid "ATS returned stat_results for %u addresses\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:395 +#: src/ats-tool/gnunet-ats.c:390 #, c-format msgid "" "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/" "s, %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "active " msgstr "" -#: src/ats-tool/gnunet-ats.c:402 +#: src/ats-tool/gnunet-ats.c:397 msgid "inactive " msgstr "" -#: src/ats-tool/gnunet-ats.c:512 +#: src/ats-tool/gnunet-ats.c:507 #, c-format msgid "Removed address of peer `%s' with plugin `%s'\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:705 +#: src/ats-tool/gnunet-ats.c:700 #, c-format msgid "Quota for network `%11s' (in/out): %10s / %10s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:748 src/ats-tool/gnunet-ats.c:761 +#: src/ats-tool/gnunet-ats.c:743 src/ats-tool/gnunet-ats.c:756 #, fuzzy, c-format msgid "Failed to parse peer identity `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/ats-tool/gnunet-ats.c:773 +#: src/ats-tool/gnunet-ats.c:768 #, c-format msgid "Please select one operation: %s or %s or %s or %s or %s\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:795 src/ats-tool/gnunet-ats.c:820 -#: src/ats-tool/gnunet-ats.c:851 src/ats-tool/gnunet-ats.c:896 +#: src/ats-tool/gnunet-ats.c:790 src/ats-tool/gnunet-ats.c:815 +#: src/ats-tool/gnunet-ats.c:846 src/ats-tool/gnunet-ats.c:891 #, fuzzy msgid "Cannot connect to ATS service, exiting...\n" msgstr "初始化“%s”服务失败。\n" -#: src/ats-tool/gnunet-ats.c:806 src/ats-tool/gnunet-ats.c:832 +#: src/ats-tool/gnunet-ats.c:801 src/ats-tool/gnunet-ats.c:827 #, fuzzy msgid "Cannot issue request to ATS service, exiting...\n" msgstr "初始化“%s”服务失败。\n" -#: src/ats-tool/gnunet-ats.c:862 +#: src/ats-tool/gnunet-ats.c:857 #, fuzzy msgid "No preference type given!\n" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/ats-tool/gnunet-ats.c:869 +#: src/ats-tool/gnunet-ats.c:864 msgid "No peer given!\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:887 +#: src/ats-tool/gnunet-ats.c:882 msgid "Valid type required\n" msgstr "" -#: src/ats-tool/gnunet-ats.c:950 +#: src/ats-tool/gnunet-ats.c:945 msgid "get list of active addresses currently used" msgstr "" -#: src/ats-tool/gnunet-ats.c:954 +#: src/ats-tool/gnunet-ats.c:949 msgid "get list of all active addresses" msgstr "" -#: src/ats-tool/gnunet-ats.c:960 +#: src/ats-tool/gnunet-ats.c:955 #, fuzzy msgid "connect to PEER" msgstr "初始化“%s”服务失败。\n" -#: src/ats-tool/gnunet-ats.c:964 +#: src/ats-tool/gnunet-ats.c:959 #, fuzzy msgid "do not resolve IP addresses to hostnames" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/ats-tool/gnunet-ats.c:969 +#: src/ats-tool/gnunet-ats.c:964 msgid "monitor mode" msgstr "" -#: src/ats-tool/gnunet-ats.c:974 +#: src/ats-tool/gnunet-ats.c:969 #, fuzzy msgid "set preference for the given peer" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/ats-tool/gnunet-ats.c:979 +#: src/ats-tool/gnunet-ats.c:974 msgid "print all configured quotas" msgstr "" -#: src/ats-tool/gnunet-ats.c:984 +#: src/ats-tool/gnunet-ats.c:979 msgid "peer id" msgstr "" -#: src/ats-tool/gnunet-ats.c:990 +#: src/ats-tool/gnunet-ats.c:985 msgid "preference type to set: latency | bandwidth" msgstr "" -#: src/ats-tool/gnunet-ats.c:996 +#: src/ats-tool/gnunet-ats.c:991 msgid "preference value" msgstr "" -#: src/ats-tool/gnunet-ats.c:1001 +#: src/ats-tool/gnunet-ats.c:996 msgid "verbose output (include ATS address properties)" msgstr "" -#: src/ats-tool/gnunet-ats.c:1011 +#: src/ats-tool/gnunet-ats.c:1006 #, fuzzy msgid "Print information about ATS state" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/auction/gnunet-auction-create.c:163 +#: src/auction/gnunet-auction-create.c:158 msgid "description of the item to be sold" msgstr "" -#: src/auction/gnunet-auction-create.c:169 +#: src/auction/gnunet-auction-create.c:164 msgid "mapping of possible prices" msgstr "" -#: src/auction/gnunet-auction-create.c:175 +#: src/auction/gnunet-auction-create.c:170 msgid "max duration per round" msgstr "" -#: src/auction/gnunet-auction-create.c:181 +#: src/auction/gnunet-auction-create.c:176 msgid "duration until auction starts" msgstr "" -#: src/auction/gnunet-auction-create.c:186 +#: src/auction/gnunet-auction-create.c:181 msgid "" "number of items to sell\n" "0 for first price auction\n" ">0 for vickrey/M+1st price auction" msgstr "" -#: src/auction/gnunet-auction-create.c:193 +#: src/auction/gnunet-auction-create.c:188 msgid "public auction outcome" msgstr "" -#: src/auction/gnunet-auction-create.c:198 +#: src/auction/gnunet-auction-create.c:193 msgid "keep running in foreground until auction completes" msgstr "" -#: src/auction/gnunet-auction-create.c:209 +#: src/auction/gnunet-auction-create.c:204 msgid "create a new auction and start listening for bidders" msgstr "" -#: src/auction/gnunet-auction-info.c:76 src/auction/gnunet-auction-join.c:76 -#: src/conversation/gnunet-conversation-test.c:243 -#: src/revocation/gnunet-revocation.c:562 src/template/gnunet-template.c:76 +#: src/auction/gnunet-auction-info.c:71 src/auction/gnunet-auction-join.c:71 +#: src/conversation/gnunet-conversation-test.c:249 +#: src/revocation/gnunet-revocation.c:557 src/template/gnunet-template.c:71 msgid "help text" msgstr "" -#: src/cadet/gnunet-cadet.c:664 +#: src/cadet/gnunet-cadet.c:659 #, fuzzy, c-format msgid "Invalid peer ID `%s'\n" msgstr "无效条目。\n" -#: src/cadet/gnunet-cadet.c:703 +#: src/cadet/gnunet-cadet.c:698 #, fuzzy, c-format msgid "Invalid tunnel owner `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/cadet/gnunet-cadet.c:776 +#: src/cadet/gnunet-cadet.c:771 msgid "Extra arguments are not applicable in combination with this option.\n" msgstr "" -#: src/cadet/gnunet-cadet.c:867 +#: src/cadet/gnunet-cadet.c:862 #, fuzzy, c-format msgid "Invalid target `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/cadet/gnunet-cadet.c:904 +#: src/cadet/gnunet-cadet.c:899 msgid "No action requested\n" msgstr "" -#: src/cadet/gnunet-cadet.c:929 +#: src/cadet/gnunet-cadet.c:924 #, fuzzy msgid "Provide information about a particular connection" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/cadet/gnunet-cadet.c:934 +#: src/cadet/gnunet-cadet.c:929 msgid "Activate echo mode" msgstr "" -#: src/cadet/gnunet-cadet.c:939 +#: src/cadet/gnunet-cadet.c:934 msgid "Dump debug information to STDERR" msgstr "" -#: src/cadet/gnunet-cadet.c:945 +#: src/cadet/gnunet-cadet.c:940 msgid "Listen for connections using a shared secret among sender and recipient" msgstr "" -#: src/cadet/gnunet-cadet.c:952 +#: src/cadet/gnunet-cadet.c:947 #, fuzzy msgid "Provide information about a patricular peer" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/cadet/gnunet-cadet.c:958 +#: src/cadet/gnunet-cadet.c:953 #, fuzzy msgid "Provide information about all peers" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/cadet/gnunet-cadet.c:964 +#: src/cadet/gnunet-cadet.c:959 #, fuzzy msgid "Provide information about a particular tunnel" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/cadet/gnunet-cadet.c:970 +#: src/cadet/gnunet-cadet.c:965 #, fuzzy msgid "Provide information about all tunnels" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/consensus/gnunet-consensus-profiler.c:523 -#: src/secretsharing/gnunet-secretsharing-profiler.c:610 +#: src/consensus/gnunet-consensus-profiler.c:518 +#: src/secretsharing/gnunet-secretsharing-profiler.c:605 #, fuzzy msgid "number of peers in consensus" msgstr "迭代次数" -#: src/consensus/gnunet-consensus-profiler.c:529 +#: src/consensus/gnunet-consensus-profiler.c:524 msgid "" "how many peers (random selection without replacement) receive one value?" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:535 -#: src/set/gnunet-set-profiler.c:433 src/set/gnunet-set-profiler.c:439 -#: src/set/gnunet-set-profiler.c:462 +#: src/consensus/gnunet-consensus-profiler.c:530 +#: src/set/gnunet-set-profiler.c:428 src/set/gnunet-set-profiler.c:434 +#: src/set/gnunet-set-profiler.c:457 #, fuzzy msgid "number of values" msgstr "迭代次数" -#: src/consensus/gnunet-consensus-profiler.c:541 +#: src/consensus/gnunet-consensus-profiler.c:536 msgid "consensus timeout" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:548 +#: src/consensus/gnunet-consensus-profiler.c:543 msgid "delay until consensus starts" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:554 -#: src/set/gnunet-set-profiler.c:480 +#: src/consensus/gnunet-consensus-profiler.c:549 +#: src/set/gnunet-set-profiler.c:475 msgid "write statistics to file" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:559 +#: src/consensus/gnunet-consensus-profiler.c:554 msgid "distribute elements to a static subset of good peers" msgstr "" -#: src/consensus/gnunet-consensus-profiler.c:564 +#: src/consensus/gnunet-consensus-profiler.c:559 msgid "be more verbose (print received values)" msgstr "" -#: src/conversation/conversation_api.c:515 -#: src/conversation/conversation_api_call.c:494 +#: src/conversation/conversation_api.c:510 +#: src/conversation/conversation_api_call.c:489 msgid "Connection to conversation service lost, trying to reconnect\n" msgstr "" -#: src/conversation/gnunet-conversation.c:270 +#: src/conversation/gnunet-conversation.c:265 #, c-format msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:295 +#: src/conversation/gnunet-conversation.c:290 #, c-format msgid "Call from `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:330 +#: src/conversation/gnunet-conversation.c:325 #, c-format msgid "Call from `%s' suspended by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:335 +#: src/conversation/gnunet-conversation.c:330 #, c-format msgid "Call from `%s' resumed by other user\n" msgstr "" -#: src/conversation/gnunet-conversation.c:353 +#: src/conversation/gnunet-conversation.c:348 #, c-format msgid "Ego `%s' no longer available, phone is now down.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:368 +#: src/conversation/gnunet-conversation.c:363 #, fuzzy msgid "Failed to setup phone (internal error)\n" msgstr "发送消息失败。\n" -#: src/conversation/gnunet-conversation.c:380 +#: src/conversation/gnunet-conversation.c:375 #, c-format msgid "Phone active at `%s'. Type `/help' for a list of available commands\n" msgstr "" -#: src/conversation/gnunet-conversation.c:404 +#: src/conversation/gnunet-conversation.c:399 #, c-format msgid "Resolved address of `%s'. Now ringing other party.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:411 +#: src/conversation/gnunet-conversation.c:406 #, fuzzy, c-format msgid "Connection established to `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/conversation/gnunet-conversation.c:418 +#: src/conversation/gnunet-conversation.c:413 #, fuzzy, c-format msgid "Failed to resolve `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/conversation/gnunet-conversation.c:426 +#: src/conversation/gnunet-conversation.c:421 #, c-format msgid "Call to `%s' terminated\n" msgstr "" -#: src/conversation/gnunet-conversation.c:435 +#: src/conversation/gnunet-conversation.c:430 #, c-format msgid "Connection to `%s' suspended (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:441 +#: src/conversation/gnunet-conversation.c:436 #, c-format msgid "Connection to `%s' resumed (by other user)\n" msgstr "" -#: src/conversation/gnunet-conversation.c:446 +#: src/conversation/gnunet-conversation.c:441 msgid "Error with the call, restarting it\n" msgstr "" -#: src/conversation/gnunet-conversation.c:517 +#: src/conversation/gnunet-conversation.c:512 #, fuzzy, c-format msgid "Unknown command `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/conversation/gnunet-conversation.c:533 -#: src/conversation/gnunet-conversation.c:547 +#: src/conversation/gnunet-conversation.c:528 +#: src/conversation/gnunet-conversation.c:542 #, c-format msgid "Ego `%s' not available\n" msgstr "" -#: src/conversation/gnunet-conversation.c:540 -#: src/conversation/gnunet-conversation.c:596 +#: src/conversation/gnunet-conversation.c:535 +#: src/conversation/gnunet-conversation.c:591 msgid "You are calling someone else already, hang up first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:555 -#: src/conversation/gnunet-conversation.c:609 +#: src/conversation/gnunet-conversation.c:550 +#: src/conversation/gnunet-conversation.c:604 #, c-format msgid "You are answering call from `%s', hang up or suspend that call first!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:565 +#: src/conversation/gnunet-conversation.c:560 msgid "Call recipient missing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:620 +#: src/conversation/gnunet-conversation.c:615 msgid "There is no incoming call to accept here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:637 +#: src/conversation/gnunet-conversation.c:632 #, c-format msgid "There is no incoming call `%s' to accept right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:668 +#: src/conversation/gnunet-conversation.c:663 msgid "We currently do not have an address.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:692 +#: src/conversation/gnunet-conversation.c:687 #, c-format msgid "We are currently trying to locate the private key for the ego `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:697 +#: src/conversation/gnunet-conversation.c:692 #, c-format msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:703 -#: src/conversation/gnunet-conversation.c:727 +#: src/conversation/gnunet-conversation.c:698 +#: src/conversation/gnunet-conversation.c:722 #, c-format msgid "You are having a conversation with `%s'.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:708 +#: src/conversation/gnunet-conversation.c:703 msgid "" "We had an internal error setting up our phone line. You can still make " "calls.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:717 +#: src/conversation/gnunet-conversation.c:712 #, fuzzy, c-format msgid "We are trying to find the network address to call `%s'.\n" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/conversation/gnunet-conversation.c:722 +#: src/conversation/gnunet-conversation.c:717 #, c-format msgid "We are calling `%s', his phone should be ringing.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:741 +#: src/conversation/gnunet-conversation.c:736 msgid "Calls waiting:\n" msgstr "" -#: src/conversation/gnunet-conversation.c:747 +#: src/conversation/gnunet-conversation.c:742 #, fuzzy, c-format msgid "#%u: `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/conversation/gnunet-conversation.c:776 -#: src/conversation/gnunet-conversation.c:791 +#: src/conversation/gnunet-conversation.c:771 +#: src/conversation/gnunet-conversation.c:786 msgid "There is no call that could be suspended right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:824 -#: src/conversation/gnunet-conversation.c:840 +#: src/conversation/gnunet-conversation.c:819 +#: src/conversation/gnunet-conversation.c:835 msgid "There is no call that could be resumed right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:847 +#: src/conversation/gnunet-conversation.c:842 #, c-format msgid "Already talking with `%s', cannot resume a call right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:856 +#: src/conversation/gnunet-conversation.c:851 msgid "There is no incoming call to resume here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:873 +#: src/conversation/gnunet-conversation.c:868 #, c-format msgid "There is no incoming call `%s' to resume right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:908 +#: src/conversation/gnunet-conversation.c:903 msgid "There is no call that could be cancelled right now.\n" msgstr "" -#: src/conversation/gnunet-conversation.c:916 +#: src/conversation/gnunet-conversation.c:911 msgid "There is no incoming call to refuse here!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:933 +#: src/conversation/gnunet-conversation.c:928 #, c-format msgid "There is no incoming call `%s' to refuse right now!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:959 +#: src/conversation/gnunet-conversation.c:954 msgid "Use `/address' to find out which address this phone should have in GNS" msgstr "" -#: src/conversation/gnunet-conversation.c:961 +#: src/conversation/gnunet-conversation.c:956 msgid "Use `/call USER.gnu' to call USER" msgstr "" -#: src/conversation/gnunet-conversation.c:963 +#: src/conversation/gnunet-conversation.c:958 msgid "Use `/accept #NUM' to accept incoming call #NUM" msgstr "" -#: src/conversation/gnunet-conversation.c:965 +#: src/conversation/gnunet-conversation.c:960 msgid "Use `/suspend' to suspend the active call" msgstr "" -#: src/conversation/gnunet-conversation.c:967 +#: src/conversation/gnunet-conversation.c:962 msgid "" "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming " "calls, no argument is needed to resume the current outgoing call." msgstr "" -#: src/conversation/gnunet-conversation.c:969 +#: src/conversation/gnunet-conversation.c:964 msgid "Use `/cancel' to reject or terminate a call" msgstr "" -#: src/conversation/gnunet-conversation.c:971 +#: src/conversation/gnunet-conversation.c:966 msgid "Use `/status' to print status information" msgstr "" -#: src/conversation/gnunet-conversation.c:973 +#: src/conversation/gnunet-conversation.c:968 msgid "Use `/quit' to terminate gnunet-conversation" msgstr "" -#: src/conversation/gnunet-conversation.c:975 +#: src/conversation/gnunet-conversation.c:970 msgid "Use `/help command' to get help for a specific command" msgstr "" -#: src/conversation/gnunet-conversation.c:1191 +#: src/conversation/gnunet-conversation.c:1186 #, fuzzy, c-format msgid "Name of our ego changed to `%s'\n" msgstr "发送消息失败。\n" -#: src/conversation/gnunet-conversation.c:1204 +#: src/conversation/gnunet-conversation.c:1199 #, c-format msgid "Our ego `%s' was deleted!\n" msgstr "" -#: src/conversation/gnunet-conversation.c:1242 +#: src/conversation/gnunet-conversation.c:1237 #, fuzzy msgid "You must specify the NAME of an ego to use\n" msgstr "您必须指定一个昵称\n" -#: src/conversation/gnunet-conversation.c:1266 +#: src/conversation/gnunet-conversation.c:1261 #, fuzzy msgid "Failed to start gnunet-helper-w32-console\n" msgstr "初始化“%s”服务失败。\n" -#: src/conversation/gnunet-conversation.c:1295 +#: src/conversation/gnunet-conversation.c:1290 msgid "sets the NAME of the ego to use for the caller ID" msgstr "" -#: src/conversation/gnunet-conversation.c:1300 +#: src/conversation/gnunet-conversation.c:1295 msgid "sets the LINE to use for the phone" msgstr "" -#: src/conversation/gnunet-conversation.c:1329 +#: src/conversation/gnunet-conversation.c:1324 msgid "Enables having a conversation with other GNUnet users." msgstr "" -#: src/conversation/gnunet-conversation-test.c:119 +#: src/conversation/gnunet-conversation-test.c:115 #, c-format msgid "" "\n" "End of transmission. Have a GNU day.\n" msgstr "" -#: src/conversation/gnunet-conversation-test.c:145 +#: src/conversation/gnunet-conversation-test.c:140 #, c-format msgid "" "\n" @@ -1049,15 +1049,15 @@ msgid "" "settings are working..." msgstr "" -#: src/conversation/gnunet-conversation-test.c:210 +#: src/conversation/gnunet-conversation-test.c:211 #, c-format msgid "" "We will now be recording you for %s. After that time, the recording will be " "played back to you..." msgstr "" -#: src/conversation/gnunet_gst.c:622 -#: src/conversation/gnunet-helper-audio-playback-gst.c:361 +#: src/conversation/gnunet_gst.c:617 +#: src/conversation/gnunet-helper-audio-playback-gst.c:356 #, c-format msgid "Read error from STDIN: %d %s\n" msgstr "" @@ -1067,5459 +1067,5464 @@ msgstr "" msgid "pa_stream_write() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-playback.c:612 +#: src/conversation/gnunet-helper-audio-playback.c:622 msgid "gnunet-helper-audio-playback - Got signal, exiting\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:637 -#: src/conversation/gnunet-helper-audio-record.c:545 +#: src/conversation/gnunet-helper-audio-playback.c:648 +#: src/conversation/gnunet-helper-audio-record.c:558 msgid "Connection established.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:642 -#: src/conversation/gnunet-helper-audio-record.c:550 +#: src/conversation/gnunet-helper-audio-playback.c:653 +#: src/conversation/gnunet-helper-audio-record.c:563 #, fuzzy, c-format msgid "pa_stream_new() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-playback.c:656 +#: src/conversation/gnunet-helper-audio-playback.c:667 #, c-format msgid "pa_stream_connect_playback() failed: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:669 -#: src/conversation/gnunet-helper-audio-record.c:576 +#: src/conversation/gnunet-helper-audio-playback.c:680 +#: src/conversation/gnunet-helper-audio-record.c:589 #, fuzzy, c-format msgid "Connection failure: %s\n" msgstr "“%s”已连接到“%s”。\n" -#: src/conversation/gnunet-helper-audio-playback.c:690 -#: src/conversation/gnunet-helper-audio-record.c:599 +#: src/conversation/gnunet-helper-audio-playback.c:701 +#: src/conversation/gnunet-helper-audio-record.c:612 msgid "Wrong Spec\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:696 -#: src/conversation/gnunet-helper-audio-record.c:605 +#: src/conversation/gnunet-helper-audio-playback.c:707 +#: src/conversation/gnunet-helper-audio-record.c:618 msgid "pa_mainloop_new() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:710 -#: src/conversation/gnunet-helper-audio-record.c:620 +#: src/conversation/gnunet-helper-audio-playback.c:721 +#: src/conversation/gnunet-helper-audio-record.c:633 msgid "pa_context_new() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:717 -#: src/conversation/gnunet-helper-audio-record.c:626 +#: src/conversation/gnunet-helper-audio-playback.c:728 +#: src/conversation/gnunet-helper-audio-record.c:639 #, fuzzy, c-format msgid "pa_context_connect() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-playback.c:723 -#: src/conversation/gnunet-helper-audio-record.c:632 +#: src/conversation/gnunet-helper-audio-playback.c:734 +#: src/conversation/gnunet-helper-audio-record.c:645 msgid "pa_mainloop_run() failed.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-playback.c:795 +#: src/conversation/gnunet-helper-audio-playback.c:813 #, c-format msgid "Read error from STDIN: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:344 +#: src/conversation/gnunet-helper-audio-record.c:348 #, fuzzy, c-format msgid "opus_encode_float() failed: %s. Aborting\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-record.c:420 +#: src/conversation/gnunet-helper-audio-record.c:427 #, fuzzy, c-format msgid "pa_stream_peek() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-record.c:458 +#: src/conversation/gnunet-helper-audio-record.c:469 msgid "Got signal, exiting.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:483 +#: src/conversation/gnunet-helper-audio-record.c:495 #, fuzzy msgid "Stream successfully created.\n" msgstr "“%s”已连接到“%s”。\n" -#: src/conversation/gnunet-helper-audio-record.c:488 +#: src/conversation/gnunet-helper-audio-record.c:500 #, fuzzy, c-format msgid "pa_stream_get_buffer_attr() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-record.c:496 +#: src/conversation/gnunet-helper-audio-record.c:508 #, c-format msgid "Buffer metrics: maxlength=%u, fragsize=%u\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:500 +#: src/conversation/gnunet-helper-audio-record.c:512 #, c-format msgid "Using sample spec '%s', channel map '%s'.\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:507 +#: src/conversation/gnunet-helper-audio-record.c:519 #, fuzzy, c-format msgid "Connected to device %s (%u, %ssuspended).\n" msgstr "“%s”已连接到“%s”。\n" -#: src/conversation/gnunet-helper-audio-record.c:516 +#: src/conversation/gnunet-helper-audio-record.c:528 #, c-format msgid "Stream error: %s\n" msgstr "" -#: src/conversation/gnunet-helper-audio-record.c:563 +#: src/conversation/gnunet-helper-audio-record.c:576 #, fuzzy, c-format msgid "pa_stream_connect_record() failed: %s\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-record.c:676 +#: src/conversation/gnunet-helper-audio-record.c:690 #, fuzzy msgid "ogg_stream_init() failed.\n" msgstr "“%s”说：%s\n" -#: src/conversation/gnunet-helper-audio-record.c:721 +#: src/conversation/gnunet-helper-audio-record.c:735 #, fuzzy, c-format msgid "Failed to allocate %u bytes for second packet\n" msgstr "初始化“%s”服务失败。\n" -#: src/conversation/gnunet-service-conversation.c:1276 +#: src/conversation/gnunet-service-conversation.c:1282 #, fuzzy, c-format msgid "Could not open line, port %s already in use!\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/conversation/microphone.c:121 +#: src/conversation/microphone.c:116 #, fuzzy msgid "Could not start record audio helper\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/conversation/plugin_gnsrecord_conversation.c:71 +#: src/conversation/plugin_gnsrecord_conversation.c:67 #, c-format msgid "PHONE version %u not supported\n" msgstr "" -#: src/conversation/plugin_gnsrecord_conversation.c:133 -#: src/conversation/plugin_gnsrecord_conversation.c:147 +#: src/conversation/plugin_gnsrecord_conversation.c:130 +#: src/conversation/plugin_gnsrecord_conversation.c:144 #, fuzzy, c-format msgid "Unable to parse PHONE record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/conversation/speaker.c:75 +#: src/conversation/speaker.c:70 msgid "Could not start playback audio helper.\n" msgstr "" -#: src/core/gnunet-core.c:90 +#: src/core/gnunet-core.c:85 #, fuzzy msgid "fresh connection" msgstr "" "\n" "按任意键继续\n" -#: src/core/gnunet-core.c:93 +#: src/core/gnunet-core.c:88 msgid "key sent" msgstr "" -#: src/core/gnunet-core.c:96 +#: src/core/gnunet-core.c:91 msgid "key received" msgstr "" -#: src/core/gnunet-core.c:99 +#: src/core/gnunet-core.c:94 #, fuzzy msgid "connection established" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/core/gnunet-core.c:102 +#: src/core/gnunet-core.c:97 msgid "rekeying" msgstr "" -#: src/core/gnunet-core.c:105 +#: src/core/gnunet-core.c:100 #, fuzzy msgid "disconnected" msgstr "“%s”已连接到“%s”。\n" -#: src/core/gnunet-core.c:112 +#: src/core/gnunet-core.c:107 msgid "Connection to CORE service lost (reconnecting)" msgstr "" -#: src/core/gnunet-core.c:115 +#: src/core/gnunet-core.c:110 #, fuzzy msgid "unknown state" msgstr "未知错误" -#: src/core/gnunet-core.c:120 +#: src/core/gnunet-core.c:115 #, c-format msgid "%24s: %-30s %4s (timeout in %6s)\n" msgstr "" -#: src/core/gnunet-core.c:144 src/peerinfo-tool/gnunet-peerinfo.c:728 +#: src/core/gnunet-core.c:139 src/peerinfo-tool/gnunet-peerinfo.c:723 #, fuzzy, c-format msgid "Invalid command line argument `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/core/gnunet-core.c:155 +#: src/core/gnunet-core.c:150 #, fuzzy msgid "Failed to connect to CORE service!\n" msgstr "初始化“%s”服务失败。\n" -#: src/core/gnunet-core.c:177 src/transport/gnunet-transport.c:1449 +#: src/core/gnunet-core.c:172 src/transport/gnunet-transport.c:1444 msgid "provide information about all current connections (continuously)" msgstr "" -#: src/core/gnunet-core.c:186 +#: src/core/gnunet-core.c:181 msgid "Print information about connected peers." msgstr "" -#: src/core/gnunet-service-core.c:347 +#: src/core/gnunet-service-core.c:342 msgid "# send requests dropped (disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:371 +#: src/core/gnunet-service-core.c:366 msgid "# dequeuing CAR (duplicate request)" msgstr "" -#: src/core/gnunet-service-core.c:443 +#: src/core/gnunet-service-core.c:438 #, c-format msgid "# bytes of messages of type %u received" msgstr "" -#: src/core/gnunet-service-core.c:541 +#: src/core/gnunet-service-core.c:536 msgid "# messages discarded (session disconnected)" msgstr "" -#: src/core/gnunet-service-core.c:879 +#: src/core/gnunet-service-core.c:874 #, c-format msgid "# messages of type %u discarded (client busy)" msgstr "" -#: src/core/gnunet-service-core.c:988 +#: src/core/gnunet-service-core.c:983 #, fuzzy msgid "Core service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "立即保存配置？" -#: src/core/gnunet-service-core.c:1009 +#: src/core/gnunet-service-core.c:1004 #, fuzzy, c-format msgid "Core service of `%s' ready.\n" msgstr "服务已删除。\n" -#: src/core/gnunet-service-core_kx.c:617 +#: src/core/gnunet-service-core_kx.c:612 msgid "# bytes encrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:677 +#: src/core/gnunet-service-core_kx.c:672 msgid "# bytes decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:779 +#: src/core/gnunet-service-core_kx.c:774 msgid "# PAYLOAD dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:829 +#: src/core/gnunet-service-core_kx.c:824 msgid "# key exchanges initiated" msgstr "" -#: src/core/gnunet-service-core_kx.c:891 +#: src/core/gnunet-service-core_kx.c:886 msgid "# key exchanges stopped" msgstr "" -#: src/core/gnunet-service-core_kx.c:925 +#: src/core/gnunet-service-core_kx.c:920 #, fuzzy msgid "# PING messages transmitted" msgstr "消息尺寸" -#: src/core/gnunet-service-core_kx.c:992 +#: src/core/gnunet-service-core_kx.c:987 msgid "# old ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1005 +#: src/core/gnunet-service-core_kx.c:1000 msgid "# duplicate ephemeral keys ignored" msgstr "" -#: src/core/gnunet-service-core_kx.c:1040 +#: src/core/gnunet-service-core_kx.c:1035 msgid "# EPHEMERAL_KEYs rejected (bad signature)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1054 +#: src/core/gnunet-service-core_kx.c:1049 #, c-format msgid "" "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match " "our system time (%llu not in [%llu,%llu]).\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1060 +#: src/core/gnunet-service-core_kx.c:1055 msgid "# EPHEMERAL_KEY messages rejected due to time" msgstr "" -#: src/core/gnunet-service-core_kx.c:1080 +#: src/core/gnunet-service-core_kx.c:1075 #, fuzzy msgid "# valid ephemeral keys received" msgstr "保存配置失败。" -#: src/core/gnunet-service-core_kx.c:1180 -#: src/transport/gnunet-service-transport_validation.c:1128 +#: src/core/gnunet-service-core_kx.c:1175 +#: src/transport/gnunet-service-transport_validation.c:1123 msgid "# PING messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1189 +#: src/core/gnunet-service-core_kx.c:1184 msgid "# PING messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1248 +#: src/core/gnunet-service-core_kx.c:1243 msgid "# PONG messages created" msgstr "" -#: src/core/gnunet-service-core_kx.c:1274 +#: src/core/gnunet-service-core_kx.c:1269 msgid "# sessions terminated by timeout" msgstr "" -#: src/core/gnunet-service-core_kx.c:1287 +#: src/core/gnunet-service-core_kx.c:1282 msgid "# keepalive messages sent" msgstr "" -#: src/core/gnunet-service-core_kx.c:1351 -#: src/transport/gnunet-service-transport_validation.c:1461 +#: src/core/gnunet-service-core_kx.c:1346 +#: src/transport/gnunet-service-transport_validation.c:1456 msgid "# PONG messages received" msgstr "" -#: src/core/gnunet-service-core_kx.c:1358 +#: src/core/gnunet-service-core_kx.c:1353 msgid "# PONG messages dropped (connection down)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1363 +#: src/core/gnunet-service-core_kx.c:1358 msgid "# PONG messages dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1398 +#: src/core/gnunet-service-core_kx.c:1393 msgid "# PONG messages decrypted" msgstr "" -#: src/core/gnunet-service-core_kx.c:1436 +#: src/core/gnunet-service-core_kx.c:1431 msgid "# session keys confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1447 +#: src/core/gnunet-service-core_kx.c:1442 msgid "# timeouts prevented via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1454 +#: src/core/gnunet-service-core_kx.c:1449 msgid "# rekey operations confirmed via PONG" msgstr "" -#: src/core/gnunet-service-core_kx.c:1642 +#: src/core/gnunet-service-core_kx.c:1637 msgid "# DATA message dropped (out of order)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1650 +#: src/core/gnunet-service-core_kx.c:1645 #, c-format msgid "" "Session to peer `%s' went down due to key expiration (should not happen)\n" msgstr "" -#: src/core/gnunet-service-core_kx.c:1653 +#: src/core/gnunet-service-core_kx.c:1648 msgid "# sessions terminated by key expiration" msgstr "" -#: src/core/gnunet-service-core_kx.c:1742 -#: src/core/gnunet-service-core_kx.c:1768 +#: src/core/gnunet-service-core_kx.c:1737 +#: src/core/gnunet-service-core_kx.c:1763 msgid "# bytes dropped (duplicates)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1755 +#: src/core/gnunet-service-core_kx.c:1750 msgid "# bytes dropped (out of sequence)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1797 +#: src/core/gnunet-service-core_kx.c:1792 msgid "# bytes dropped (ancient message)" msgstr "" -#: src/core/gnunet-service-core_kx.c:1805 +#: src/core/gnunet-service-core_kx.c:1800 msgid "# bytes of payload decrypted" msgstr "" -#: src/core/gnunet-service-core_sessions.c:260 -#: src/core/gnunet-service-core_sessions.c:350 -#: src/dht/gnunet-service-dht_neighbours.c:733 -#: src/dht/gnunet-service-dht_neighbours.c:795 -#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522 -#: src/topology/gnunet-daemon-topology.c:617 -#: src/topology/gnunet-daemon-topology.c:719 -#: src/transport/gnunet-service-transport_neighbours.c:721 -#: src/transport/gnunet-service-transport_neighbours.c:729 +#: src/core/gnunet-service-core_sessions.c:255 +#: src/core/gnunet-service-core_sessions.c:345 +#: src/dht/gnunet-service-dht_neighbours.c:728 +#: src/dht/gnunet-service-dht_neighbours.c:790 +#: src/fs/gnunet-service-fs_cp.c:610 src/fs/gnunet-service-fs_cp.c:1517 +#: src/topology/gnunet-daemon-topology.c:612 +#: src/topology/gnunet-daemon-topology.c:714 +#: src/transport/gnunet-service-transport_neighbours.c:716 +#: src/transport/gnunet-service-transport_neighbours.c:724 msgid "# peers connected" msgstr "" -#: src/core/gnunet-service-core_sessions.c:296 +#: src/core/gnunet-service-core_sessions.c:291 msgid "# type map refreshes sent" msgstr "" -#: src/core/gnunet-service-core_sessions.c:416 +#: src/core/gnunet-service-core_sessions.c:411 #, fuzzy msgid "# outdated typemap confirmations received" msgstr "保存配置失败。" -#: src/core/gnunet-service-core_sessions.c:433 +#: src/core/gnunet-service-core_sessions.c:428 #, fuzzy msgid "# valid typemap confirmations received" msgstr "保存配置失败。" -#: src/core/gnunet-service-core_typemap.c:169 -#: src/core/gnunet-service-core_typemap.c:181 +#: src/core/gnunet-service-core_typemap.c:164 +#: src/core/gnunet-service-core_typemap.c:176 msgid "# type maps received" msgstr "" -#: src/core/gnunet-service-core_typemap.c:212 +#: src/core/gnunet-service-core_typemap.c:207 msgid "# updates to my type map" msgstr "" -#: src/credential/credential_misc.c:88 +#: src/credential/credential_misc.c:83 #, fuzzy, c-format msgid "Unable to parse CRED record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888 -#: src/namestore/plugin_rest_namestore.c:1022 +#: src/credential/gnunet-credential.c:259 src/namestore/gnunet-namestore.c:883 +#: src/namestore/plugin_rest_namestore.c:1017 #, c-format msgid "Ego `%s' not known to identity service\n" msgstr "" -#: src/credential/gnunet-credential.c:280 -#: src/credential/gnunet-credential.c:434 +#: src/credential/gnunet-credential.c:275 +#: src/credential/gnunet-credential.c:429 #, fuzzy, c-format msgid "Issuer public key `%s' is not well-formed\n" msgstr "“%s”的参数无效。\n" -#: src/credential/gnunet-credential.c:361 -#: src/credential/gnunet-credential.c:423 +#: src/credential/gnunet-credential.c:356 +#: src/credential/gnunet-credential.c:418 #, fuzzy, c-format msgid "Issuer public key not well-formed\n" msgstr "“%s”的参数无效。\n" -#: src/credential/gnunet-credential.c:372 -#: src/credential/gnunet-credential.c:444 +#: src/credential/gnunet-credential.c:367 +#: src/credential/gnunet-credential.c:439 #, fuzzy, c-format msgid "Failed to connect to CREDENTIAL\n" msgstr "初始化“%s”服务失败。\n" -#: src/credential/gnunet-credential.c:379 +#: src/credential/gnunet-credential.c:374 #, c-format msgid "You must provide issuer the attribute\n" msgstr "" -#: src/credential/gnunet-credential.c:387 +#: src/credential/gnunet-credential.c:382 #, c-format msgid "ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:403 +#: src/credential/gnunet-credential.c:398 #, c-format msgid "Subject public key needed\n" msgstr "" -#: src/credential/gnunet-credential.c:414 +#: src/credential/gnunet-credential.c:409 #, fuzzy, c-format msgid "Subject public key `%s' is not well-formed\n" msgstr "“%s”的参数无效。\n" -#: src/credential/gnunet-credential.c:451 +#: src/credential/gnunet-credential.c:446 #, c-format msgid "You must provide issuer and subject attributes\n" msgstr "" -#: src/credential/gnunet-credential.c:504 +#: src/credential/gnunet-credential.c:499 #, c-format msgid "Issuer ego required\n" msgstr "" -#: src/credential/gnunet-credential.c:516 +#: src/credential/gnunet-credential.c:511 #, c-format msgid "Please specify name to lookup, subject key and issuer key!\n" msgstr "" -#: src/credential/gnunet-credential.c:536 +#: src/credential/gnunet-credential.c:531 msgid "create credential" msgstr "" -#: src/credential/gnunet-credential.c:540 +#: src/credential/gnunet-credential.c:535 msgid "verify credential against attribute" msgstr "" -#: src/credential/gnunet-credential.c:545 +#: src/credential/gnunet-credential.c:540 msgid "The public key of the subject to lookup the credential for" msgstr "" -#: src/credential/gnunet-credential.c:550 +#: src/credential/gnunet-credential.c:545 msgid "The name of the credential presented by the subject" msgstr "" -#: src/credential/gnunet-credential.c:555 +#: src/credential/gnunet-credential.c:550 msgid "The public key of the authority to verify the credential against" msgstr "" -#: src/credential/gnunet-credential.c:560 +#: src/credential/gnunet-credential.c:555 #, fuzzy msgid "The ego to use" msgstr "消息尺寸" -#: src/credential/gnunet-credential.c:565 +#: src/credential/gnunet-credential.c:560 msgid "The issuer attribute to verify against or to issue" msgstr "" -#: src/credential/gnunet-credential.c:570 +#: src/credential/gnunet-credential.c:565 msgid "The time to live for the credential" msgstr "" -#: src/credential/gnunet-credential.c:574 +#: src/credential/gnunet-credential.c:569 msgid "collect credentials" msgstr "" -#: src/credential/gnunet-credential.c:588 +#: src/credential/gnunet-credential.c:583 #, fuzzy msgid "GNUnet credential resolver tool" msgstr "GNUnet 错误日志" -#: src/credential/gnunet-service-credential.c:1138 src/gns/gnunet-gns.c:184 -#: src/gns/gnunet-gns-helper-service-w32.c:727 +#: src/credential/gnunet-service-credential.c:1133 src/gns/gnunet-gns.c:179 +#: src/gns/gnunet-gns-helper-service-w32.c:722 #, fuzzy, c-format msgid "Failed to connect to GNS\n" msgstr "初始化“%s”服务失败。\n" -#: src/credential/gnunet-service-credential.c:1144 -#: src/namestore/gnunet-namestore.c:914 -#: src/namestore/gnunet-namestore-fcfsd.c:1084 -#: src/namestore/plugin_rest_namestore.c:1035 +#: src/credential/gnunet-service-credential.c:1139 +#: src/namestore/gnunet-namestore.c:909 +#: src/namestore/gnunet-namestore-fcfsd.c:1079 +#: src/namestore/plugin_rest_namestore.c:1030 #, fuzzy, c-format msgid "Failed to connect to namestore\n" msgstr "初始化“%s”服务失败。\n" -#: src/credential/plugin_gnsrecord_credential.c:186 +#: src/credential/plugin_gnsrecord_credential.c:181 #, fuzzy, c-format msgid "Unable to parse ATTR record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669 +#: src/credential/plugin_rest_credential.c:1123 src/gns/plugin_rest_gns.c:664 msgid "GNS REST API initialized\n" msgstr "" -#: src/datacache/datacache.c:119 src/datacache/datacache.c:311 -#: src/datastore/gnunet-service-datastore.c:757 +#: src/datacache/datacache.c:114 src/datacache/datacache.c:306 +#: src/datastore/gnunet-service-datastore.c:752 msgid "# bytes stored" msgstr "" -#: src/datacache/datacache.c:123 src/datacache/datacache.c:315 +#: src/datacache/datacache.c:118 src/datacache/datacache.c:310 msgid "# items stored" msgstr "" -#: src/datacache/datacache.c:206 +#: src/datacache/datacache.c:201 #, c-format msgid "Loading `%s' datacache plugin\n" msgstr "" -#: src/datacache/datacache.c:217 +#: src/datacache/datacache.c:212 #, c-format msgid "Failed to load datacache plugin for `%s'\n" msgstr "" -#: src/datacache/datacache.c:344 +#: src/datacache/datacache.c:340 msgid "# requests received" msgstr "" -#: src/datacache/datacache.c:354 +#: src/datacache/datacache.c:350 msgid "# requests filtered by bloom filter" msgstr "" -#: src/datacache/datacache.c:384 +#: src/datacache/datacache.c:380 msgid "# requests for random value received" msgstr "" -#: src/datacache/datacache.c:416 +#: src/datacache/datacache.c:412 msgid "# proximity search requests received" msgstr "" -#: src/datacache/plugin_datacache_heap.c:550 +#: src/datacache/plugin_datacache_heap.c:545 #, fuzzy msgid "Heap datacache running\n" msgstr "sqlite 数据仓库" -#: src/datacache/plugin_datacache_sqlite.c:118 -#: src/datacache/plugin_datacache_sqlite.c:127 -#: src/datastore/plugin_datastore_mysql.c:892 -#: src/datastore/plugin_datastore_sqlite.c:58 -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80 -#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49 -#: src/namecache/plugin_namecache_sqlite.c:52 -#: src/namestore/plugin_namestore_sqlite.c:53 -#: src/peerstore/plugin_peerstore_sqlite.c:52 -#: src/psycstore/plugin_psycstore_mysql.c:62 -#: src/testbed/generate-underlay-topology.c:47 -#: src/testbed/gnunet-daemon-latency-logger.c:52 -#: src/testbed/gnunet-daemon-testbed-underlay.c:56 -#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52 -#: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39 -#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821 -#: src/scalarproduct/scalarproduct.h:35 +#: src/datacache/plugin_datacache_sqlite.c:113 +#: src/datacache/plugin_datacache_sqlite.c:122 +#: src/datastore/plugin_datastore_mysql.c:887 +#: src/datastore/plugin_datastore_sqlite.c:53 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/identity-provider/plugin_identity_provider_sqlite.c:47 src/my/my.c:75 +#: src/my/my.c:87 src/mysql/mysql.c:37 src/mysql/mysql.c:44 +#: src/namecache/plugin_namecache_sqlite.c:47 +#: src/namestore/plugin_namestore_sqlite.c:48 +#: src/peerstore/plugin_peerstore_sqlite.c:47 +#: src/psycstore/plugin_psycstore_mysql.c:57 +#: src/testbed/generate-underlay-topology.c:42 +#: src/testbed/gnunet-daemon-latency-logger.c:47 +#: src/testbed/gnunet-daemon-testbed-underlay.c:51 +#: src/testbed/testbed_api_hosts.c:64 src/util/crypto_ecc.c:47 +#: src/util/crypto_ecc_setup.c:36 src/util/crypto_mpi.c:34 +#: src/include/gnunet_common.h:807 src/include/gnunet_common.h:816 +#: src/scalarproduct/scalarproduct.h:30 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/datacache/plugin_datacache_sqlite.c:862 -#: src/datastore/plugin_datastore_sqlite.c:508 -#: src/identity-provider/plugin_identity_provider_sqlite.c:336 -#: src/namecache/plugin_namecache_sqlite.c:329 -#: src/namestore/plugin_namestore_sqlite.c:264 +#: src/datacache/plugin_datacache_sqlite.c:857 +#: src/datastore/plugin_datastore_sqlite.c:503 +#: src/identity-provider/plugin_identity_provider_sqlite.c:331 +#: src/namecache/plugin_namecache_sqlite.c:324 +#: src/namestore/plugin_namestore_sqlite.c:259 msgid "Tried to close sqlite without finalizing all prepared statements.\n" msgstr "" -#: src/datastore/datastore_api.c:348 +#: src/datastore/datastore_api.c:343 #, fuzzy msgid "DATASTORE disconnected" msgstr "“%s”已连接到“%s”。\n" -#: src/datastore/datastore_api.c:468 +#: src/datastore/datastore_api.c:463 #, fuzzy msgid "Disconnected from DATASTORE" msgstr "“%s”已连接到“%s”。\n" -#: src/datastore/datastore_api.c:569 +#: src/datastore/datastore_api.c:564 msgid "# queue overflows" msgstr "" -#: src/datastore/datastore_api.c:599 +#: src/datastore/datastore_api.c:594 msgid "# queue entries created" msgstr "" -#: src/datastore/datastore_api.c:760 +#: src/datastore/datastore_api.c:755 msgid "# status messages received" msgstr "" -#: src/datastore/datastore_api.c:814 +#: src/datastore/datastore_api.c:809 msgid "# Results received" msgstr "" -#: src/datastore/datastore_api.c:920 +#: src/datastore/datastore_api.c:915 msgid "# datastore connections (re)created" msgstr "" -#: src/datastore/datastore_api.c:1034 +#: src/datastore/datastore_api.c:1029 msgid "# PUT requests executed" msgstr "" -#: src/datastore/datastore_api.c:1095 +#: src/datastore/datastore_api.c:1090 msgid "# RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1160 +#: src/datastore/datastore_api.c:1155 msgid "# RELEASE RESERVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1238 +#: src/datastore/datastore_api.c:1233 msgid "# REMOVE requests executed" msgstr "" -#: src/datastore/datastore_api.c:1298 +#: src/datastore/datastore_api.c:1293 msgid "# GET REPLICATION requests executed" msgstr "" -#: src/datastore/datastore_api.c:1360 +#: src/datastore/datastore_api.c:1355 msgid "# GET ZERO ANONYMITY requests executed" msgstr "" -#: src/datastore/datastore_api.c:1441 +#: src/datastore/datastore_api.c:1436 msgid "# GET requests executed" msgstr "" -#: src/datastore/gnunet-datastore.c:189 +#: src/datastore/gnunet-datastore.c:184 #, c-format msgid "Dumped % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:217 src/datastore/gnunet-datastore.c:229 +#: src/datastore/gnunet-datastore.c:212 src/datastore/gnunet-datastore.c:224 #, c-format msgid "Short write to file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:261 +#: src/datastore/gnunet-datastore.c:256 #, fuzzy msgid "Error queueing datastore GET operation\n" msgstr "创建用户出错" -#: src/datastore/gnunet-datastore.c:287 src/datastore/gnunet-datastore.c:412 +#: src/datastore/gnunet-datastore.c:282 src/datastore/gnunet-datastore.c:407 #, fuzzy, c-format msgid "Unable to open dump file: %s\n" msgstr "发送消息失败。\n" -#: src/datastore/gnunet-datastore.c:326 +#: src/datastore/gnunet-datastore.c:321 #, fuzzy, c-format msgid "Failed to store item: %s, aborting\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/datastore/gnunet-datastore.c:340 +#: src/datastore/gnunet-datastore.c:335 #, c-format msgid "Inserted % records\n" msgstr "" -#: src/datastore/gnunet-datastore.c:349 src/datastore/gnunet-datastore.c:363 +#: src/datastore/gnunet-datastore.c:344 src/datastore/gnunet-datastore.c:358 #, c-format msgid "Short read from file: %zd bytes expecting %zd\n" msgstr "" -#: src/datastore/gnunet-datastore.c:389 +#: src/datastore/gnunet-datastore.c:384 #, fuzzy msgid "Error queueing datastore PUT operation\n" msgstr "创建用户出错" -#: src/datastore/gnunet-datastore.c:432 +#: src/datastore/gnunet-datastore.c:427 msgid "Input file is not of a supported format\n" msgstr "" -#: src/datastore/gnunet-datastore.c:458 +#: src/datastore/gnunet-datastore.c:453 #, fuzzy msgid "Failed connecting to the datastore.\n" msgstr "初始化“%s”服务失败。\n" -#: src/datastore/gnunet-datastore.c:470 +#: src/datastore/gnunet-datastore.c:465 #, c-format msgid "Please choose at least one operation: %s, %s\n" msgstr "" -#: src/datastore/gnunet-datastore.c:493 +#: src/datastore/gnunet-datastore.c:488 #, fuzzy msgid "Dump all records from the datastore" msgstr "发送消息失败。\n" -#: src/datastore/gnunet-datastore.c:497 +#: src/datastore/gnunet-datastore.c:492 msgid "Insert records into the datastore" msgstr "" -#: src/datastore/gnunet-datastore.c:502 +#: src/datastore/gnunet-datastore.c:497 msgid "File to dump or insert" msgstr "" -#: src/datastore/gnunet-datastore.c:511 +#: src/datastore/gnunet-datastore.c:506 #, fuzzy msgid "Manipulate GNUnet datastore" msgstr "更改配置文件中的一个值" -#: src/datastore/gnunet-service-datastore.c:338 +#: src/datastore/gnunet-service-datastore.c:333 msgid "# bytes expired" msgstr "" -#: src/datastore/gnunet-service-datastore.c:420 +#: src/datastore/gnunet-service-datastore.c:415 msgid "# bytes purged (low-priority)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:562 +#: src/datastore/gnunet-service-datastore.c:557 msgid "# results found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:603 +#: src/datastore/gnunet-service-datastore.c:598 #, c-format msgid "" "Insufficient space (%llu bytes are available) to satisfy RESERVE request for " "%llu bytes\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:614 +#: src/datastore/gnunet-service-datastore.c:609 #, c-format msgid "" "The requested amount (%llu bytes) is larger than the cache size (%llu " "bytes)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:620 +#: src/datastore/gnunet-service-datastore.c:615 msgid "" "Insufficient space to satisfy request and requested amount is larger than " "cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:627 +#: src/datastore/gnunet-service-datastore.c:622 msgid "Insufficient space to satisfy request" msgstr "" -#: src/datastore/gnunet-service-datastore.c:634 -#: src/datastore/gnunet-service-datastore.c:689 -#: src/datastore/gnunet-service-datastore.c:837 -#: src/datastore/gnunet-service-datastore.c:1469 +#: src/datastore/gnunet-service-datastore.c:629 +#: src/datastore/gnunet-service-datastore.c:684 +#: src/datastore/gnunet-service-datastore.c:832 +#: src/datastore/gnunet-service-datastore.c:1464 msgid "# reserved" msgstr "" -#: src/datastore/gnunet-service-datastore.c:707 +#: src/datastore/gnunet-service-datastore.c:702 msgid "Could not find matching reservation" msgstr "" -#: src/datastore/gnunet-service-datastore.c:773 +#: src/datastore/gnunet-service-datastore.c:768 #, c-format msgid "Need %llu bytes more space (%llu allowed, using %llu)\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:876 +#: src/datastore/gnunet-service-datastore.c:871 msgid "# GET requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:907 +#: src/datastore/gnunet-service-datastore.c:902 msgid "# GET KEY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:920 +#: src/datastore/gnunet-service-datastore.c:915 msgid "# requests filtered by bloomfilter" msgstr "" -#: src/datastore/gnunet-service-datastore.c:956 +#: src/datastore/gnunet-service-datastore.c:951 msgid "# GET REPLICATION requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:989 +#: src/datastore/gnunet-service-datastore.c:984 msgid "# GET ZERO ANONYMITY requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1036 +#: src/datastore/gnunet-service-datastore.c:1031 msgid "Content not found" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1043 +#: src/datastore/gnunet-service-datastore.c:1038 msgid "# bytes removed (explicit request)" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1088 +#: src/datastore/gnunet-service-datastore.c:1083 msgid "# REMOVE requests received" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1137 +#: src/datastore/gnunet-service-datastore.c:1132 #, c-format msgid "" "Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1143 -#: src/datastore/gnunet-service-datastore.c:1318 +#: src/datastore/gnunet-service-datastore.c:1138 +#: src/datastore/gnunet-service-datastore.c:1313 #, c-format msgid "New payload: %lld\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1197 +#: src/datastore/gnunet-service-datastore.c:1192 #, c-format msgid "Loading `%s' datastore plugin\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1209 +#: src/datastore/gnunet-service-datastore.c:1204 #, fuzzy, c-format msgid "Failed to load datastore plugin for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/datastore/gnunet-service-datastore.c:1269 +#: src/datastore/gnunet-service-datastore.c:1264 msgid "Bloomfilter construction complete.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1325 +#: src/datastore/gnunet-service-datastore.c:1320 msgid "Rebuilding bloomfilter. Please be patient.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1336 +#: src/datastore/gnunet-service-datastore.c:1331 msgid "Plugin does not support get_keys function. Please fix!\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1506 +#: src/datastore/gnunet-service-datastore.c:1501 #, c-format msgid "# bytes used in file-sharing datastore `%s'" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1522 +#: src/datastore/gnunet-service-datastore.c:1517 msgid "# quota" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1527 +#: src/datastore/gnunet-service-datastore.c:1522 msgid "# cache size" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1543 +#: src/datastore/gnunet-service-datastore.c:1538 #, c-format msgid "Could not use specified filename `%s' for bloomfilter.\n" msgstr "" -#: src/datastore/gnunet-service-datastore.c:1561 -#: src/datastore/gnunet-service-datastore.c:1577 +#: src/datastore/gnunet-service-datastore.c:1556 +#: src/datastore/gnunet-service-datastore.c:1572 #, fuzzy, c-format msgid "Failed to remove bogus bloomfilter file `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/datastore/gnunet-service-datastore.c:1609 +#: src/datastore/gnunet-service-datastore.c:1604 #, fuzzy msgid "Failed to initialize bloomfilter.\n" msgstr "初始化“%s”服务失败。\n" -#: src/datastore/plugin_datastore_heap.c:893 +#: src/datastore/plugin_datastore_heap.c:888 #, fuzzy msgid "Heap database running\n" msgstr "sqlite 数据仓库" -#: src/datastore/plugin_datastore_mysql.c:371 -#: src/datastore/plugin_datastore_mysql.c:423 -#: src/datastore/plugin_datastore_mysql.c:1075 +#: src/datastore/plugin_datastore_mysql.c:366 +#: src/datastore/plugin_datastore_mysql.c:418 +#: src/datastore/plugin_datastore_mysql.c:1070 msgid "MySQL statement run failure" msgstr "" -#: src/datastore/plugin_datastore_mysql.c:410 -#: src/datastore/plugin_datastore_sqlite.c:678 +#: src/datastore/plugin_datastore_mysql.c:405 +#: src/datastore/plugin_datastore_sqlite.c:673 #, fuzzy msgid "Data too large" msgstr "迭代次数" -#: src/datastore/plugin_datastore_mysql.c:848 +#: src/datastore/plugin_datastore_mysql.c:843 #, fuzzy, c-format msgid "`%s' for `%s' failed at %s:%d with error: %s\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/datastore/plugin_datastore_mysql.c:1180 -#: src/psycstore/plugin_psycstore_mysql.c:1936 +#: src/datastore/plugin_datastore_mysql.c:1175 +#: src/psycstore/plugin_psycstore_mysql.c:1931 msgid "Mysql database running\n" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:274 -#: src/datastore/plugin_datastore_postgres.c:891 +#: src/datastore/plugin_datastore_postgres.c:271 +#: src/datastore/plugin_datastore_postgres.c:888 msgid "Postgress exec failure" msgstr "" -#: src/datastore/plugin_datastore_postgres.c:852 +#: src/datastore/plugin_datastore_postgres.c:849 #, fuzzy msgid "Failed to drop table from database.\n" msgstr "发送消息失败。\n" -#: src/datastore/plugin_datastore_postgres.c:950 -#: src/psycstore/plugin_psycstore_postgres.c:1506 +#: src/datastore/plugin_datastore_postgres.c:947 +#: src/psycstore/plugin_psycstore_postgres.c:1501 msgid "Postgres database running\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:66 -#: src/testbed/generate-underlay-topology.c:50 -#: src/testbed/gnunet-daemon-latency-logger.c:55 -#: src/testbed/gnunet-daemon-testbed-underlay.c:59 +#: src/datastore/plugin_datastore_sqlite.c:61 +#: src/testbed/generate-underlay-topology.c:45 +#: src/testbed/gnunet-daemon-latency-logger.c:50 +#: src/testbed/gnunet-daemon-testbed-underlay.c:54 #, fuzzy, c-format msgid "`%s' failed at %s:%u with error: %s" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/datastore/plugin_datastore_sqlite.c:271 -#: src/identity-provider/plugin_identity_provider_sqlite.c:212 -#: src/namecache/plugin_namecache_sqlite.c:209 -#: src/namestore/plugin_namestore_sqlite.c:205 -#: src/peerstore/plugin_peerstore_sqlite.c:535 -#: src/psycstore/plugin_psycstore_sqlite.c:325 +#: src/datastore/plugin_datastore_sqlite.c:266 +#: src/identity-provider/plugin_identity_provider_sqlite.c:207 +#: src/namecache/plugin_namecache_sqlite.c:204 +#: src/namestore/plugin_namestore_sqlite.c:200 +#: src/peerstore/plugin_peerstore_sqlite.c:530 +#: src/psycstore/plugin_psycstore_sqlite.c:320 #, c-format msgid "Unable to initialize SQLite: %s.\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/datastore/plugin_datastore_sqlite.c:629 +#: src/datastore/plugin_datastore_sqlite.c:624 msgid "sqlite bind failure" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1322 +#: src/datastore/plugin_datastore_sqlite.c:1321 msgid "sqlite version to old to determine size, assuming zero\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1356 +#: src/datastore/plugin_datastore_sqlite.c:1355 #, c-format msgid "" "Using sqlite page utilization to estimate payload (%llu pages of size %llu " "bytes)\n" msgstr "" -#: src/datastore/plugin_datastore_sqlite.c:1400 -#: src/identity-provider/plugin_identity_provider_sqlite.c:711 -#: src/namecache/plugin_namecache_sqlite.c:640 -#: src/namestore/plugin_namestore_sqlite.c:754 +#: src/datastore/plugin_datastore_sqlite.c:1399 +#: src/identity-provider/plugin_identity_provider_sqlite.c:706 +#: src/namecache/plugin_namecache_sqlite.c:635 +#: src/namestore/plugin_namestore_sqlite.c:749 #, fuzzy msgid "Sqlite database running\n" msgstr "sqlite 数据仓库" -#: src/datastore/plugin_datastore_template.c:253 +#: src/datastore/plugin_datastore_template.c:248 msgid "Template database running\n" msgstr "" -#: src/dht/gnunet-dht-get.c:158 +#: src/dht/gnunet-dht-get.c:153 #, c-format msgid "" "Result %d, type %d:\n" "%.*s\n" msgstr "" -#: src/dht/gnunet-dht-get.c:159 +#: src/dht/gnunet-dht-get.c:154 #, c-format msgid "Result %d, type %d:\n" msgstr "" -#: src/dht/gnunet-dht-get.c:204 +#: src/dht/gnunet-dht-get.c:199 msgid "Must provide key for DHT GET!\n" msgstr "" -#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257 +#: src/dht/gnunet-dht-get.c:205 src/dht/gnunet-dht-monitor.c:252 #, fuzzy msgid "Failed to connect to DHT service!\n" msgstr "初始化“%s”服务失败。\n" -#: src/dht/gnunet-dht-get.c:219 +#: src/dht/gnunet-dht-get.c:214 msgid "Issueing DHT GET with key" msgstr "" -#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307 -#: src/dht/gnunet-dht-put.c:198 +#: src/dht/gnunet-dht-get.c:243 src/dht/gnunet-dht-monitor.c:302 +#: src/dht/gnunet-dht-put.c:193 msgid "the query key" msgstr "" -#: src/dht/gnunet-dht-get.c:253 +#: src/dht/gnunet-dht-get.c:248 msgid "how many parallel requests (replicas) to create" msgstr "" -#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313 +#: src/dht/gnunet-dht-get.c:253 src/dht/gnunet-dht-monitor.c:308 msgid "the type of data to look for" msgstr "" -#: src/dht/gnunet-dht-get.c:263 +#: src/dht/gnunet-dht-get.c:258 msgid "how long to execute this query before giving up?" msgstr "" -#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202 +#: src/dht/gnunet-dht-get.c:262 src/dht/gnunet-dht-put.c:197 msgid "use DHT's demultiplex everywhere option" msgstr "" -#: src/dht/gnunet-dht-get.c:280 +#: src/dht/gnunet-dht-get.c:275 msgid "Issue a GET request to the GNUnet DHT, prints results." msgstr "" -#: src/dht/gnunet-dht-monitor.c:319 +#: src/dht/gnunet-dht-monitor.c:314 msgid "how long should the monitor command run" msgstr "" -#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372 -#: src/nse/gnunet-nse-profiler.c:878 +#: src/dht/gnunet-dht-monitor.c:319 src/fs/gnunet-download.c:367 +#: src/nse/gnunet-nse-profiler.c:873 msgid "be verbose (print progress information)" msgstr "" -#: src/dht/gnunet-dht-monitor.c:337 +#: src/dht/gnunet-dht-monitor.c:332 msgid "Prints all packets that go through the DHT." msgstr "" -#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253 +#: src/dht/gnunet_dht_profiler.c:911 src/testbed/gnunet-testbed-profiler.c:248 #, fuzzy, c-format msgid "Exiting as the number of peers is %u\n" msgstr "增加 TCP/IP 的最大连接数" -#: src/dht/gnunet_dht_profiler.c:949 +#: src/dht/gnunet_dht_profiler.c:944 src/rps/gnunet-rps-profiler.c:2651 #, fuzzy msgid "number of peers to start" msgstr "迭代次数" -#: src/dht/gnunet_dht_profiler.c:954 +#: src/dht/gnunet_dht_profiler.c:949 msgid "number of PUTs to perform per peer" msgstr "" -#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860 -#: src/testbed/gnunet-testbed-profiler.c:304 +#: src/dht/gnunet_dht_profiler.c:954 src/nse/gnunet-nse-profiler.c:855 +#: src/testbed/gnunet-testbed-profiler.c:299 msgid "name of the file with the login information for the testbed" msgstr "" -#: src/dht/gnunet_dht_profiler.c:964 +#: src/dht/gnunet_dht_profiler.c:959 msgid "delay between rounds for collecting statistics (default: 30 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:969 +#: src/dht/gnunet_dht_profiler.c:964 msgid "delay to start doing PUTs (default: 1 sec)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:974 +#: src/dht/gnunet_dht_profiler.c:969 msgid "delay to start doing GETs (default: 5 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:979 +#: src/dht/gnunet_dht_profiler.c:974 msgid "replication degree for DHT PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:984 +#: src/dht/gnunet_dht_profiler.c:979 msgid "chance that a peer is selected at random for PUTs" msgstr "" -#: src/dht/gnunet_dht_profiler.c:989 +#: src/dht/gnunet_dht_profiler.c:984 msgid "timeout for DHT PUT and GET requests (default: 1 min)" msgstr "" -#: src/dht/gnunet_dht_profiler.c:1009 +#: src/dht/gnunet_dht_profiler.c:1004 #, fuzzy msgid "Measure quality and performance of the DHT service." msgstr "无法访问该服务" -#: src/dht/gnunet-dht-put.c:134 +#: src/dht/gnunet-dht-put.c:129 msgid "Must provide KEY and DATA for DHT put!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:142 +#: src/dht/gnunet-dht-put.c:137 #, fuzzy msgid "Could not connect to DHT service!\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/dht/gnunet-dht-put.c:153 +#: src/dht/gnunet-dht-put.c:148 #, c-format msgid "Issuing put request for `%s' with data `%s'!\n" msgstr "" -#: src/dht/gnunet-dht-put.c:188 +#: src/dht/gnunet-dht-put.c:183 msgid "the data to insert under the key" msgstr "" -#: src/dht/gnunet-dht-put.c:193 +#: src/dht/gnunet-dht-put.c:188 msgid "how long to store this entry in the dht (in seconds)" msgstr "" -#: src/dht/gnunet-dht-put.c:207 +#: src/dht/gnunet-dht-put.c:202 msgid "how many replicas to create" msgstr "" -#: src/dht/gnunet-dht-put.c:211 +#: src/dht/gnunet-dht-put.c:206 msgid "use DHT's record route option" msgstr "" -#: src/dht/gnunet-dht-put.c:216 +#: src/dht/gnunet-dht-put.c:211 msgid "the type to insert data as" msgstr "" -#: src/dht/gnunet-dht-put.c:233 +#: src/dht/gnunet-dht-put.c:228 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY." msgstr "" -#: src/dht/gnunet-service-dht_clients.c:369 +#: src/dht/gnunet-service-dht_clients.c:364 msgid "# GET requests from clients injected" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:483 +#: src/dht/gnunet-service-dht_clients.c:478 msgid "# PUT requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:616 +#: src/dht/gnunet-service-dht_clients.c:611 msgid "# GET requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:842 +#: src/dht/gnunet-service-dht_clients.c:837 msgid "# GET STOP requests received from clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1027 +#: src/dht/gnunet-service-dht_clients.c:1022 msgid "# Key match, type mismatches in REPLY to CLIENT" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1042 +#: src/dht/gnunet-service-dht_clients.c:1037 msgid "# Duplicate REPLIES to CLIENT request dropped" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1088 +#: src/dht/gnunet-service-dht_clients.c:1083 #, c-format msgid "Unsupported block type (%u) in request!\n" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1095 +#: src/dht/gnunet-service-dht_clients.c:1090 msgid "# RESULTS queued for clients" msgstr "" -#: src/dht/gnunet-service-dht_clients.c:1173 +#: src/dht/gnunet-service-dht_clients.c:1168 msgid "# REPLIES ignored for CLIENTS (no match)" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:73 +#: src/dht/gnunet-service-dht_datacache.c:68 #, c-format msgid "%s request received, but have no datacache!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:83 +#: src/dht/gnunet-service-dht_datacache.c:78 msgid "# ITEMS stored in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:202 +#: src/dht/gnunet-service-dht_datacache.c:197 msgid "# Good RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:214 +#: src/dht/gnunet-service-dht_datacache.c:209 msgid "# Duplicate RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:220 +#: src/dht/gnunet-service-dht_datacache.c:215 msgid "# Invalid RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:226 +#: src/dht/gnunet-service-dht_datacache.c:221 msgid "# Irrelevant RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:238 +#: src/dht/gnunet-service-dht_datacache.c:233 msgid "# Unsupported RESULTS found in datacache" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:242 +#: src/dht/gnunet-service-dht_datacache.c:237 #, c-format msgid "Unsupported block type (%u) in local response!\n" msgstr "" -#: src/dht/gnunet-service-dht_datacache.c:277 +#: src/dht/gnunet-service-dht_datacache.c:272 msgid "# GET requests given to datacache" msgstr "" -#: src/dht/gnunet-service-dht_hello.c:86 +#: src/dht/gnunet-service-dht_hello.c:81 msgid "# HELLOs obtained from peerinfo" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:672 +#: src/dht/gnunet-service-dht_neighbours.c:667 msgid "# FIND PEER messages initiated" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:843 +#: src/dht/gnunet-service-dht_neighbours.c:838 msgid "# requests TTL-dropped" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1046 -#: src/dht/gnunet-service-dht_neighbours.c:1089 +#: src/dht/gnunet-service-dht_neighbours.c:1041 +#: src/dht/gnunet-service-dht_neighbours.c:1084 msgid "# Peers excluded from routing due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1063 -#: src/dht/gnunet-service-dht_neighbours.c:1105 +#: src/dht/gnunet-service-dht_neighbours.c:1058 +#: src/dht/gnunet-service-dht_neighbours.c:1100 msgid "# Peer selection failed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1262 +#: src/dht/gnunet-service-dht_neighbours.c:1257 msgid "# PUT requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1295 +#: src/dht/gnunet-service-dht_neighbours.c:1290 msgid "# PUT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1306 -#: src/dht/gnunet-service-dht_neighbours.c:1446 -#: src/dht/gnunet-service-dht_neighbours.c:1549 +#: src/dht/gnunet-service-dht_neighbours.c:1301 +#: src/dht/gnunet-service-dht_neighbours.c:1441 +#: src/dht/gnunet-service-dht_neighbours.c:1544 msgid "# P2P messages dropped due to full queue" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1391 +#: src/dht/gnunet-service-dht_neighbours.c:1386 msgid "# GET requests routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1434 +#: src/dht/gnunet-service-dht_neighbours.c:1429 msgid "# GET messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1564 +#: src/dht/gnunet-service-dht_neighbours.c:1559 msgid "# RESULT messages queued for transmission" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1663 +#: src/dht/gnunet-service-dht_neighbours.c:1658 msgid "# P2P PUT requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1667 +#: src/dht/gnunet-service-dht_neighbours.c:1662 msgid "# P2P PUT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1893 +#: src/dht/gnunet-service-dht_neighbours.c:1888 msgid "# FIND PEER requests ignored due to Bloomfilter" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:1901 +#: src/dht/gnunet-service-dht_neighbours.c:1896 msgid "# FIND PEER requests ignored due to lack of HELLO" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2062 +#: src/dht/gnunet-service-dht_neighbours.c:2057 msgid "# P2P GET requests received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2066 +#: src/dht/gnunet-service-dht_neighbours.c:2061 msgid "# P2P GET bytes received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2131 +#: src/dht/gnunet-service-dht_neighbours.c:2126 msgid "# P2P FIND PEER requests processed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2152 +#: src/dht/gnunet-service-dht_neighbours.c:2147 msgid "# P2P GET requests ONLY routed" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2334 +#: src/dht/gnunet-service-dht_neighbours.c:2329 msgid "# P2P RESULTS received" msgstr "" -#: src/dht/gnunet-service-dht_neighbours.c:2338 +#: src/dht/gnunet-service-dht_neighbours.c:2333 msgid "# P2P RESULT bytes received" msgstr "" -#: src/dht/gnunet-service-dht_nse.c:59 +#: src/dht/gnunet-service-dht_nse.c:54 msgid "# Network size estimates received" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:223 +#: src/dht/gnunet-service-dht_routing.c:218 msgid "# Good REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:237 +#: src/dht/gnunet-service-dht_routing.c:232 msgid "# Duplicate REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:243 +#: src/dht/gnunet-service-dht_routing.c:238 msgid "# Invalid REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:249 +#: src/dht/gnunet-service-dht_routing.c:244 msgid "# Irrelevant REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:261 +#: src/dht/gnunet-service-dht_routing.c:256 msgid "# Unsupported REPLIES matched against routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:339 +#: src/dht/gnunet-service-dht_routing.c:334 msgid "# Entries removed from routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:415 +#: src/dht/gnunet-service-dht_routing.c:410 msgid "# Entries added to routing table" msgstr "" -#: src/dht/gnunet-service-dht_routing.c:437 +#: src/dht/gnunet-service-dht_routing.c:432 msgid "# DHT requests combined" msgstr "" -#: src/dht/plugin_block_dht.c:189 +#: src/dht/plugin_block_dht.c:184 #, c-format msgid "Block not of type %u\n" msgstr "" -#: src/dht/plugin_block_dht.c:198 +#: src/dht/plugin_block_dht.c:193 msgid "Size mismatch for block\n" msgstr "" -#: src/dht/plugin_block_dht.c:209 +#: src/dht/plugin_block_dht.c:204 #, c-format msgid "Block of type %u is malformed\n" msgstr "" -#: src/dns/dnsparser.c:254 +#: src/dns/dnsparser.c:249 #, fuzzy, c-format msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsparser.c:823 +#: src/dns/dnsparser.c:818 #, fuzzy, c-format msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsstub.c:233 +#: src/dns/dnsstub.c:228 #, fuzzy, c-format msgid "Could not bind to any port: %s\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/dns/dnsstub.c:364 +#: src/dns/dnsstub.c:359 #, c-format msgid "Received DNS response that is too small (%u bytes)" msgstr "" -#: src/dns/dnsstub.c:511 +#: src/dns/dnsstub.c:506 #, fuzzy, c-format msgid "Failed to send DNS request to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/dnsstub.c:517 +#: src/dns/dnsstub.c:512 #, fuzzy, c-format msgid "Sent DNS request to %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358 +#: src/dns/gnunet-dns-monitor.c:348 src/dns/gnunet-dns-monitor.c:353 msgid "only monitor DNS queries" msgstr "" -#: src/dns/gnunet-dns-monitor.c:370 +#: src/dns/gnunet-dns-monitor.c:365 msgid "Monitor DNS queries." msgstr "" -#: src/dns/gnunet-dns-redirector.c:237 +#: src/dns/gnunet-dns-redirector.c:232 msgid "set A records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:243 +#: src/dns/gnunet-dns-redirector.c:238 msgid "set AAAA records" msgstr "" -#: src/dns/gnunet-dns-redirector.c:256 +#: src/dns/gnunet-dns-redirector.c:251 msgid "Change DNS replies to point elsewhere." msgstr "" -#: src/dns/gnunet-service-dns.c:462 +#: src/dns/gnunet-service-dns.c:457 msgid "# DNS requests answered via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:610 +#: src/dns/gnunet-service-dns.c:605 msgid "# DNS exit failed (failed to open socket)" msgstr "" -#: src/dns/gnunet-service-dns.c:740 +#: src/dns/gnunet-service-dns.c:735 msgid "# External DNS response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:815 +#: src/dns/gnunet-service-dns.c:810 msgid "# Client response discarded (no matching request)" msgstr "" -#: src/dns/gnunet-service-dns.c:930 +#: src/dns/gnunet-service-dns.c:925 msgid "Received malformed IPv4-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:946 +#: src/dns/gnunet-service-dns.c:941 msgid "Received malformed IPv6-UDP packet on TUN interface.\n" msgstr "" -#: src/dns/gnunet-service-dns.c:955 +#: src/dns/gnunet-service-dns.c:950 #, c-format msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n" msgstr "" -#: src/dns/gnunet-service-dns.c:965 +#: src/dns/gnunet-service-dns.c:960 msgid "DNS interceptor got non-DNS packet (dropped)\n" msgstr "" -#: src/dns/gnunet-service-dns.c:967 +#: src/dns/gnunet-service-dns.c:962 msgid "# Non-DNS UDP packet received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1034 +#: src/dns/gnunet-service-dns.c:1029 msgid "# DNS requests received via TUN interface" msgstr "" -#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565 +#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3560 #, fuzzy msgid "need a valid IPv4 or IPv6 address\n" msgstr "无效的进程优先级“%s”\n" -#: src/dns/gnunet-service-dns.c:1092 +#: src/dns/gnunet-service-dns.c:1087 #, c-format msgid "`%s' must be installed SUID, will not run DNS interceptor\n" msgstr "" -#: src/dv/gnunet-dv.c:175 +#: src/dv/gnunet-dv.c:170 #, fuzzy msgid "Print information about DV state" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/exit/gnunet-daemon-exit.c:960 +#: src/exit/gnunet-daemon-exit.c:955 msgid "# TCP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1061 +#: src/exit/gnunet-daemon-exit.c:1056 msgid "# ICMP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1340 +#: src/exit/gnunet-daemon-exit.c:1335 msgid "# UDP packets sent via TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572 -#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701 -#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953 -#: src/exit/gnunet-daemon-exit.c:2207 +#: src/exit/gnunet-daemon-exit.c:1459 src/exit/gnunet-daemon-exit.c:1567 +#: src/exit/gnunet-daemon-exit.c:1614 src/exit/gnunet-daemon-exit.c:1696 +#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1948 +#: src/exit/gnunet-daemon-exit.c:2202 msgid "# Bytes received from CADET" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1467 +#: src/exit/gnunet-daemon-exit.c:1462 msgid "# UDP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1575 +#: src/exit/gnunet-daemon-exit.c:1570 msgid "# UDP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1615 +#: src/exit/gnunet-daemon-exit.c:1610 msgid "# TCP service creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1704 +#: src/exit/gnunet-daemon-exit.c:1699 msgid "# TCP IP-exit creation requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1788 +#: src/exit/gnunet-daemon-exit.c:1783 msgid "# TCP DATA requests dropped (no session)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1825 +#: src/exit/gnunet-daemon-exit.c:1820 msgid "# TCP data requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:1956 +#: src/exit/gnunet-daemon-exit.c:1951 msgid "# ICMP IP-exit requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279 -#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828 -#: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105 +#: src/exit/gnunet-daemon-exit.c:2017 src/exit/gnunet-daemon-exit.c:2274 +#: src/exit/gnunet-daemon-exit.c:2629 src/vpn/gnunet-service-vpn.c:823 +#: src/vpn/gnunet-service-vpn.c:986 src/vpn/gnunet-service-vpn.c:2100 msgid "# ICMPv4 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338 -#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887 -#: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158 +#: src/exit/gnunet-daemon-exit.c:2076 src/exit/gnunet-daemon-exit.c:2333 +#: src/exit/gnunet-daemon-exit.c:2666 src/vpn/gnunet-service-vpn.c:882 +#: src/vpn/gnunet-service-vpn.c:1019 src/vpn/gnunet-service-vpn.c:2153 msgid "# ICMPv6 packets dropped (type not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2210 +#: src/exit/gnunet-daemon-exit.c:2205 msgid "# ICMP service requests received via cadet" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985 -#: src/vpn/gnunet-service-vpn.c:2096 +#: src/exit/gnunet-daemon-exit.c:2259 src/vpn/gnunet-service-vpn.c:980 +#: src/vpn/gnunet-service-vpn.c:2091 msgid "# ICMPv4 packets dropped (impossible PT to v6)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875 -#: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141 +#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:870 +#: src/vpn/gnunet-service-vpn.c:2125 src/vpn/gnunet-service-vpn.c:2136 msgid "# ICMPv6 packets dropped (impossible PT to v4)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068 +#: src/exit/gnunet-daemon-exit.c:2397 src/exit/gnunet-daemon-exit.c:3063 #, fuzzy msgid "# Inbound CADET channels created" msgstr "" "\n" "按任意键继续\n" -#: src/exit/gnunet-daemon-exit.c:2522 +#: src/exit/gnunet-daemon-exit.c:2517 #, c-format msgid "Got duplicate service records for `%s:%u'\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2541 +#: src/exit/gnunet-daemon-exit.c:2536 #, fuzzy msgid "# Messages transmitted via cadet channels" msgstr "" "\n" "按任意键继续\n" -#: src/exit/gnunet-daemon-exit.c:2719 +#: src/exit/gnunet-daemon-exit.c:2714 msgid "# ICMP packets dropped (not allowed)" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2727 +#: src/exit/gnunet-daemon-exit.c:2722 msgid "ICMP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2801 +#: src/exit/gnunet-daemon-exit.c:2796 msgid "UDP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2873 +#: src/exit/gnunet-daemon-exit.c:2868 msgid "TCP Packet dropped, have no matching connection information\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2921 +#: src/exit/gnunet-daemon-exit.c:2916 msgid "# Packets received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2935 +#: src/exit/gnunet-daemon-exit.c:2930 msgid "# Bytes received from TUN" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2961 +#: src/exit/gnunet-daemon-exit.c:2956 msgid "IPv4 packet options received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:2988 +#: src/exit/gnunet-daemon-exit.c:2983 #, c-format msgid "IPv4 packet with unsupported next header %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3034 +#: src/exit/gnunet-daemon-exit.c:3029 #, c-format msgid "IPv6 packet with unsupported next header %d received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3042 +#: src/exit/gnunet-daemon-exit.c:3037 #, c-format msgid "Packet from unknown protocol %u received. Ignored.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255 +#: src/exit/gnunet-daemon-exit.c:3240 src/exit/gnunet-daemon-exit.c:3250 #, fuzzy, c-format msgid "Option `%s' for domain `%s' is not formatted correctly!\n" msgstr "%s：选项“%s”有歧义\n" -#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277 +#: src/exit/gnunet-daemon-exit.c:3264 src/exit/gnunet-daemon-exit.c:3272 #, c-format msgid "`%s' is not a valid port number (for domain `%s')!" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3318 +#: src/exit/gnunet-daemon-exit.c:3313 #, c-format msgid "No addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345 +#: src/exit/gnunet-daemon-exit.c:3327 src/exit/gnunet-daemon-exit.c:3340 #, c-format msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3357 +#: src/exit/gnunet-daemon-exit.c:3352 #, c-format msgid "No IP addresses found for hostname `%s' of service `%s'!\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3501 +#: src/exit/gnunet-daemon-exit.c:3496 msgid "" "This system does not support IPv4, will disable IPv4 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3509 +#: src/exit/gnunet-daemon-exit.c:3504 msgid "" "This system does not support IPv6, will disable IPv6 functions despite them " "being enabled in the configuration\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3516 +#: src/exit/gnunet-daemon-exit.c:3511 msgid "" "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use " "ENABLE_IPv4=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3522 +#: src/exit/gnunet-daemon-exit.c:3517 msgid "" "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use " "ENABLE_IPv6=YES\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3690 +#: src/exit/gnunet-daemon-exit.c:3685 msgid "Must be a number" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3805 +#: src/exit/gnunet-daemon-exit.c:3800 #, c-format msgid "`%s' must be installed SUID, EXIT will not work\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204 +#: src/exit/gnunet-daemon-exit.c:3812 src/pt/gnunet-daemon-pt.c:1199 msgid "No useful service enabled. Exiting.\n" msgstr "" -#: src/exit/gnunet-daemon-exit.c:3966 +#: src/exit/gnunet-daemon-exit.c:3961 msgid "Daemon to run to provide an IP exit node for the VPN" msgstr "" -#: src/fragmentation/defragmentation.c:275 +#: src/fragmentation/defragmentation.c:270 msgid "# acknowledgements sent for fragment" msgstr "" -#: src/fragmentation/defragmentation.c:468 -#: src/transport/plugin_transport_wlan.c:1554 +#: src/fragmentation/defragmentation.c:463 +#: src/transport/plugin_transport_wlan.c:1549 msgid "# fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:538 +#: src/fragmentation/defragmentation.c:533 msgid "# duplicate fragments received" msgstr "" -#: src/fragmentation/defragmentation.c:556 +#: src/fragmentation/defragmentation.c:551 msgid "# messages defragmented" msgstr "" -#: src/fragmentation/fragmentation.c:240 +#: src/fragmentation/fragmentation.c:235 msgid "# fragments transmitted" msgstr "" -#: src/fragmentation/fragmentation.c:245 +#: src/fragmentation/fragmentation.c:240 msgid "# fragments retransmitted" msgstr "" -#: src/fragmentation/fragmentation.c:278 +#: src/fragmentation/fragmentation.c:273 msgid "# fragments wrap arounds" msgstr "" -#: src/fragmentation/fragmentation.c:325 +#: src/fragmentation/fragmentation.c:320 msgid "# messages fragmented" msgstr "" -#: src/fragmentation/fragmentation.c:331 +#: src/fragmentation/fragmentation.c:326 msgid "# total size of fragmented messages" msgstr "" -#: src/fragmentation/fragmentation.c:456 +#: src/fragmentation/fragmentation.c:451 msgid "# fragment acknowledgements received" msgstr "" -#: src/fragmentation/fragmentation.c:463 +#: src/fragmentation/fragmentation.c:458 msgid "# bits removed from fragmentation ACKs" msgstr "" -#: src/fragmentation/fragmentation.c:487 +#: src/fragmentation/fragmentation.c:482 msgid "# fragmentation transmissions completed" msgstr "" -#: src/fs/fs_api.c:499 +#: src/fs/fs_api.c:494 #, fuzzy, c-format msgid "Could not open file `%s': %s" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_api.c:510 +#: src/fs/fs_api.c:505 #, fuzzy, c-format msgid "Could not read file `%s': %s" msgstr "无法解析“%s”(%s)：%s\n" -#: src/fs/fs_api.c:518 +#: src/fs/fs_api.c:513 #, c-format msgid "Short read reading from file `%s'!" msgstr "" -#: src/fs/fs_api.c:1126 +#: src/fs/fs_api.c:1121 #, fuzzy, c-format msgid "Failed to resume publishing information `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_api.c:1646 +#: src/fs/fs_api.c:1641 #, c-format msgid "Failure while resuming publishing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:1662 +#: src/fs/fs_api.c:1657 #, fuzzy, c-format msgid "Failed to resume publishing operation `%s': %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_api.c:2322 +#: src/fs/fs_api.c:2317 #, c-format msgid "Failure while resuming unindexing operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2332 +#: src/fs/fs_api.c:2327 #, fuzzy, c-format msgid "Failed to resume unindexing operation `%s': %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_api.c:2460 src/fs/fs_api.c:2706 +#: src/fs/fs_api.c:2455 src/fs/fs_api.c:2701 #, fuzzy, c-format msgid "Failed to resume sub-download `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_api.c:2478 +#: src/fs/fs_api.c:2473 #, fuzzy, c-format msgid "Failed to resume sub-search `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_api.c:2493 src/fs/fs_api.c:2512 src/fs/fs_api.c:3016 +#: src/fs/fs_api.c:2488 src/fs/fs_api.c:2507 src/fs/fs_api.c:3011 #, c-format msgid "Failure while resuming search operation `%s': %s\n" msgstr "" -#: src/fs/fs_api.c:2696 +#: src/fs/fs_api.c:2691 #, fuzzy, c-format msgid "Failed to resume sub-download `%s': could not open file `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_api.c:2959 +#: src/fs/fs_api.c:2954 msgid "Could not resume running search, will resume as paused search\n" msgstr "" -#: src/fs/fs_api.c:3054 +#: src/fs/fs_api.c:3049 #, c-format msgid "Failure while resuming download operation `%s': %s\n" msgstr "" -#: src/fs/fs_directory.c:213 +#: src/fs/fs_directory.c:208 msgid "MAGIC mismatch. This is not a GNUnet directory.\n" msgstr "" -#: src/fs/fs_download.c:310 +#: src/fs/fs_download.c:305 msgid "" "Recursive downloads of directories larger than 4 GB are not supported on 32-" "bit systems\n" msgstr "" -#: src/fs/fs_download.c:335 +#: src/fs/fs_download.c:330 msgid "Directory too large for system address space\n" msgstr "" -#: src/fs/fs_download.c:347 +#: src/fs/fs_download.c:342 #, c-format msgid "" "Failed to access full directroy contents of `%s' for recursive download\n" msgstr "" -#: src/fs/fs_download.c:534 src/fs/fs_download.c:546 +#: src/fs/fs_download.c:529 src/fs/fs_download.c:541 #, fuzzy, c-format msgid "Failed to open file `%s' for writing" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:956 +#: src/fs/fs_download.c:951 #, c-format msgid "Failed to create directory for recursive download of `%s'\n" msgstr "" -#: src/fs/fs_download.c:1047 +#: src/fs/fs_download.c:1042 #, c-format msgid "" "Internal error or bogus download URI (expected %u bytes at depth %u and " "offset %llu/%llu, got %u bytes)" msgstr "" -#: src/fs/fs_download.c:1075 +#: src/fs/fs_download.c:1070 msgid "internal error decrypting content" msgstr "" -#: src/fs/fs_download.c:1099 +#: src/fs/fs_download.c:1094 #, fuzzy, c-format msgid "Download failed: could not open file `%s': %s" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:1111 +#: src/fs/fs_download.c:1106 #, fuzzy, c-format msgid "Failed to seek to offset %llu in file `%s': %s" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_download.c:1120 +#: src/fs/fs_download.c:1115 #, fuzzy, c-format msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_download.c:1220 +#: src/fs/fs_download.c:1215 #, fuzzy msgid "internal error decoding tree" msgstr "未知错误。\n" -#: src/fs/fs_download.c:1885 +#: src/fs/fs_download.c:1880 #, fuzzy msgid "Invalid URI" msgstr "无效条目。\n" -#: src/fs/fs_getopt.c:226 +#: src/fs/fs_getopt.c:221 #, c-format msgid "" "Unknown metadata type in metadata option `%s'. Using metadata type " "`unknown' instead.\n" msgstr "" -#: src/fs/fs_list_indexed.c:152 +#: src/fs/fs_list_indexed.c:147 #, fuzzy, c-format msgid "Failed to receive response from `%s' service.\n" msgstr "“%s”的参数无效。\n" -#: src/fs/fs_list_indexed.c:196 +#: src/fs/fs_list_indexed.c:191 #, fuzzy, c-format msgid "Failed to not connect to `%s' service.\n" msgstr "初始化“%s”服务失败。\n" -#: src/fs/fs_misc.c:128 +#: src/fs/fs_misc.c:123 #, c-format msgid "Did not find mime type `%s' in extension list.\n" msgstr "" -#: src/fs/fs_namespace.c:207 +#: src/fs/fs_namespace.c:202 #, fuzzy, c-format msgid "Failed to open `%s' for writing: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_namespace.c:232 +#: src/fs/fs_namespace.c:227 #, fuzzy, c-format msgid "Failed to write `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/fs_namespace.c:324 +#: src/fs/fs_namespace.c:319 #, fuzzy, c-format msgid "Failed to read `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/fs_namespace.c:470 +#: src/fs/fs_namespace.c:465 msgid "Failed to connect to datastore." msgstr "" -#: src/fs/fs_publish.c:127 src/fs/fs_publish.c:438 +#: src/fs/fs_publish.c:122 src/fs/fs_publish.c:433 #, c-format msgid "Publishing failed: %s" msgstr "" -#: src/fs/fs_publish.c:724 src/fs/fs_publish.c:778 src/fs/fs_publish.c:823 -#: src/fs/fs_publish.c:844 src/fs/fs_publish.c:874 src/fs/fs_publish.c:1140 +#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:773 src/fs/fs_publish.c:818 +#: src/fs/fs_publish.c:839 src/fs/fs_publish.c:869 src/fs/fs_publish.c:1135 #, c-format msgid "Can not index file `%s': %s. Will try to insert instead.\n" msgstr "" -#: src/fs/fs_publish.c:780 +#: src/fs/fs_publish.c:775 #, fuzzy msgid "error on index-start request to `fs' service" msgstr "初始化“%s”服务失败。\n" -#: src/fs/fs_publish.c:825 +#: src/fs/fs_publish.c:820 msgid "failed to compute hash" msgstr "" -#: src/fs/fs_publish.c:845 +#: src/fs/fs_publish.c:840 msgid "filename too long" msgstr "" -#: src/fs/fs_publish.c:876 +#: src/fs/fs_publish.c:871 msgid "could not connect to `fs' service" msgstr "" -#: src/fs/fs_publish.c:902 +#: src/fs/fs_publish.c:897 #, fuzzy, c-format msgid "Failed to get file identifiers for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_publish.c:991 src/fs/fs_publish.c:1027 +#: src/fs/fs_publish.c:986 src/fs/fs_publish.c:1022 msgid "Can not create LOC URI. Will continue with CHK instead.\n" msgstr "" -#: src/fs/fs_publish.c:1094 +#: src/fs/fs_publish.c:1089 #, c-format msgid "Recursive upload failed at `%s': %s" msgstr "" -#: src/fs/fs_publish.c:1102 +#: src/fs/fs_publish.c:1097 #, c-format msgid "Recursive upload failed: %s" msgstr "" -#: src/fs/fs_publish.c:1142 +#: src/fs/fs_publish.c:1137 msgid "needs to be an actual file" msgstr "" -#: src/fs/fs_publish.c:1381 +#: src/fs/fs_publish.c:1376 #, fuzzy, c-format msgid "Datastore failure: %s" msgstr "“%s”已连接到“%s”。\n" -#: src/fs/fs_publish.c:1472 +#: src/fs/fs_publish.c:1467 #, c-format msgid "Reserving space for %u entries and %llu bytes for publication\n" msgstr "" -#: src/fs/fs_publish_ksk.c:220 +#: src/fs/fs_publish_ksk.c:215 msgid "Could not connect to datastore." msgstr "" -#: src/fs/fs_publish_ublock.c:241 +#: src/fs/fs_publish_ublock.c:236 #, fuzzy msgid "Internal error." msgstr "未知错误。\n" -#: src/fs/fs_search.c:822 src/fs/fs_search.c:892 +#: src/fs/fs_search.c:817 src/fs/fs_search.c:887 #, fuzzy, c-format msgid "Failed to parse URI `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/fs_search.c:979 +#: src/fs/fs_search.c:974 #, c-format msgid "Got result with unknown block type `%d', ignoring" msgstr "" -#: src/fs/fs_unindex.c:63 +#: src/fs/fs_unindex.c:58 msgid "Failed to find given position in file" msgstr "" -#: src/fs/fs_unindex.c:68 +#: src/fs/fs_unindex.c:63 #, fuzzy msgid "Failed to read file" msgstr "发送消息失败。\n" -#: src/fs/fs_unindex.c:275 +#: src/fs/fs_unindex.c:270 #, fuzzy msgid "Error communicating with `fs' service." msgstr "连接 %s:%u 出错。守护程序在运行吗？\n" -#: src/fs/fs_unindex.c:326 +#: src/fs/fs_unindex.c:321 msgid "Failed to connect to FS service for unindexing." msgstr "" -#: src/fs/fs_unindex.c:376 src/fs/fs_unindex.c:388 +#: src/fs/fs_unindex.c:371 src/fs/fs_unindex.c:383 #, fuzzy msgid "Failed to get KSKs from directory scan." msgstr "解析配置文件“%s”失败\n" -#: src/fs/fs_unindex.c:384 +#: src/fs/fs_unindex.c:379 #, fuzzy, c-format msgid "Internal error scanning `%s'.\n" msgstr "未知错误。\n" -#: src/fs/fs_unindex.c:443 +#: src/fs/fs_unindex.c:438 #, fuzzy, c-format msgid "Failed to remove UBlock: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_unindex.c:588 src/fs/fs_unindex.c:652 +#: src/fs/fs_unindex.c:583 src/fs/fs_unindex.c:647 #, fuzzy msgid "Failed to connect to `datastore' service." msgstr "初始化“%s”服务失败。\n" -#: src/fs/fs_unindex.c:665 +#: src/fs/fs_unindex.c:660 #, fuzzy msgid "Failed to open file for unindexing." msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/fs_unindex.c:704 +#: src/fs/fs_unindex.c:699 msgid "Failed to compute hash of file." msgstr "" -#: src/fs/fs_uri.c:234 +#: src/fs/fs_uri.c:229 #, no-c-format msgid "Malformed KSK URI (`%' must be followed by HEX number)" msgstr "" -#: src/fs/fs_uri.c:293 +#: src/fs/fs_uri.c:288 msgid "Malformed KSK URI (must not begin or end with `+')" msgstr "" -#: src/fs/fs_uri.c:311 +#: src/fs/fs_uri.c:306 msgid "Malformed KSK URI (`++' not allowed)" msgstr "" -#: src/fs/fs_uri.c:318 +#: src/fs/fs_uri.c:313 msgid "Malformed KSK URI (quotes not balanced)" msgstr "" -#: src/fs/fs_uri.c:388 +#: src/fs/fs_uri.c:383 msgid "Malformed SKS URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:429 +#: src/fs/fs_uri.c:424 msgid "Malformed CHK URI (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:444 +#: src/fs/fs_uri.c:439 msgid "Malformed CHK URI (failed to decode CHK)" msgstr "" -#: src/fs/fs_uri.c:523 +#: src/fs/fs_uri.c:518 msgid "LOC URI malformed (wrong syntax)" msgstr "" -#: src/fs/fs_uri.c:538 +#: src/fs/fs_uri.c:533 msgid "LOC URI malformed (no CHK)" msgstr "" -#: src/fs/fs_uri.c:548 +#: src/fs/fs_uri.c:543 msgid "LOC URI malformed (missing LOC)" msgstr "" -#: src/fs/fs_uri.c:556 +#: src/fs/fs_uri.c:551 msgid "LOC URI malformed (wrong syntax for public key)" msgstr "" -#: src/fs/fs_uri.c:564 +#: src/fs/fs_uri.c:559 msgid "LOC URI malformed (could not decode public key)" msgstr "" -#: src/fs/fs_uri.c:570 +#: src/fs/fs_uri.c:565 msgid "LOC URI malformed (could not find signature)" msgstr "" -#: src/fs/fs_uri.c:576 +#: src/fs/fs_uri.c:571 msgid "LOC URI malformed (wrong syntax for signature)" msgstr "" -#: src/fs/fs_uri.c:585 +#: src/fs/fs_uri.c:580 msgid "LOC URI malformed (could not decode signature)" msgstr "" -#: src/fs/fs_uri.c:591 +#: src/fs/fs_uri.c:586 msgid "LOC URI malformed (wrong syntax for expiration time)" msgstr "" -#: src/fs/fs_uri.c:597 +#: src/fs/fs_uri.c:592 msgid "LOC URI malformed (could not parse expiration time)" msgstr "" -#: src/fs/fs_uri.c:609 +#: src/fs/fs_uri.c:604 msgid "LOC URI malformed (signature failed validation)" msgstr "" -#: src/fs/fs_uri.c:643 +#: src/fs/fs_uri.c:638 #, fuzzy msgid "invalid argument" msgstr "“%s”的参数无效。\n" -#: src/fs/fs_uri.c:655 +#: src/fs/fs_uri.c:650 msgid "Unrecognized URI type" msgstr "" -#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086 +#: src/fs/fs_uri.c:1054 src/fs/fs_uri.c:1081 msgid "No keywords specified!\n" msgstr "" -#: src/fs/fs_uri.c:1092 +#: src/fs/fs_uri.c:1087 msgid "Number of double-quotes not balanced!\n" msgstr "" -#: src/fs/gnunet-auto-share.c:232 +#: src/fs/gnunet-auto-share.c:227 #, fuzzy, c-format msgid "Failed to load state: %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/gnunet-auto-share.c:285 src/fs/gnunet-auto-share.c:295 -#: src/fs/gnunet-auto-share.c:305 +#: src/fs/gnunet-auto-share.c:280 src/fs/gnunet-auto-share.c:290 +#: src/fs/gnunet-auto-share.c:300 #, fuzzy, c-format msgid "Failed to save state to file %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/gnunet-auto-share.c:407 +#: src/fs/gnunet-auto-share.c:402 #, c-format msgid "Publication of `%s' done\n" msgstr "" -#: src/fs/gnunet-auto-share.c:494 +#: src/fs/gnunet-auto-share.c:489 #, c-format msgid "Publishing `%s'\n" msgstr "" -#: src/fs/gnunet-auto-share.c:504 +#: src/fs/gnunet-auto-share.c:499 #, fuzzy, c-format msgid "Failed to run `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/gnunet-auto-share.c:713 +#: src/fs/gnunet-auto-share.c:708 #, c-format msgid "" "You must specify one and only one directory name for automatic publication.\n" msgstr "" -#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:900 +#: src/fs/gnunet-auto-share.c:762 src/fs/gnunet-publish.c:895 msgid "set the desired LEVEL of sender-anonymity" msgstr "" -#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 +#: src/fs/gnunet-auto-share.c:767 src/fs/gnunet-publish.c:899 msgid "disable adding the creation time to the metadata of the uploaded file" msgstr "" -#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909 +#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904 msgid "do not use libextractor to add keywords or metadata" msgstr "" -#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944 +#: src/fs/gnunet-auto-share.c:778 src/fs/gnunet-publish.c:939 msgid "specify the priority of the content" msgstr "" -#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956 +#: src/fs/gnunet-auto-share.c:784 src/fs/gnunet-publish.c:951 msgid "set the desired replication LEVEL" msgstr "" -#: src/fs/gnunet-auto-share.c:813 +#: src/fs/gnunet-auto-share.c:808 msgid "Automatically publish files from a directory on GNUnet" msgstr "" -#: src/fs/gnunet-daemon-fsprofiler.c:648 +#: src/fs/gnunet-daemon-fsprofiler.c:643 msgid "Daemon to use file-sharing to measure its performance." msgstr "" -#: src/fs/gnunet-directory.c:53 +#: src/fs/gnunet-directory.c:48 #, c-format msgid "\t\n" msgstr "" -#: src/fs/gnunet-directory.c:105 +#: src/fs/gnunet-directory.c:100 #, c-format msgid "Directory `%s' meta data:\n" msgstr "" -#: src/fs/gnunet-directory.c:108 +#: src/fs/gnunet-directory.c:103 #, c-format msgid "Directory `%s' contents:\n" msgstr "" -#: src/fs/gnunet-directory.c:143 +#: src/fs/gnunet-directory.c:138 #, fuzzy msgid "You must specify a filename to inspect.\n" msgstr "您必须指定一个昵称\n" -#: src/fs/gnunet-directory.c:156 +#: src/fs/gnunet-directory.c:151 #, fuzzy, c-format msgid "Failed to read directory `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/gnunet-directory.c:165 +#: src/fs/gnunet-directory.c:160 #, fuzzy, c-format msgid "`%s' is not a GNUnet directory\n" msgstr "更改 GNUnet 目录的权限出错" -#: src/fs/gnunet-directory.c:194 +#: src/fs/gnunet-directory.c:189 #, fuzzy msgid "Display contents of a GNUnet directory" msgstr "更改 GNUnet 目录的权限出错" -#: src/fs/gnunet-download.c:139 +#: src/fs/gnunet-download.c:134 #, fuzzy, c-format msgid "Starting download `%s'.\n" msgstr "未知的命令“%s”。\n" -#: src/fs/gnunet-download.c:149 +#: src/fs/gnunet-download.c:144 #, fuzzy msgid "" msgstr "未知错误" -#: src/fs/gnunet-download.c:158 +#: src/fs/gnunet-download.c:153 #, c-format msgid "" "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to " "download\n" msgstr "" -#: src/fs/gnunet-download.c:184 +#: src/fs/gnunet-download.c:179 #, c-format msgid "Error downloading: %s.\n" msgstr "" -#: src/fs/gnunet-download.c:201 +#: src/fs/gnunet-download.c:196 #, c-format msgid "Downloading `%s' done (%s/s).\n" msgstr "" -#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295 -#: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107 +#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:290 +#: src/fs/gnunet-search.c:207 src/fs/gnunet-unindex.c:102 #, c-format msgid "Unexpected status: %d\n" msgstr "" -#: src/fs/gnunet-download.c:246 +#: src/fs/gnunet-download.c:241 #, fuzzy msgid "You need to specify a URI argument.\n" msgstr "您必须指定一个昵称\n" -#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726 +#: src/fs/gnunet-download.c:248 src/fs/gnunet-publish.c:721 #, fuzzy, c-format msgid "Failed to parse URI: %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/fs/gnunet-download.c:264 +#: src/fs/gnunet-download.c:259 msgid "Only CHK or LOC URIs supported.\n" msgstr "" -#: src/fs/gnunet-download.c:273 +#: src/fs/gnunet-download.c:268 msgid "Target filename must be specified.\n" msgstr "" -#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870 -#: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139 +#: src/fs/gnunet-download.c:286 src/fs/gnunet-publish.c:865 +#: src/fs/gnunet-search.c:265 src/fs/gnunet-unindex.c:134 #, fuzzy, c-format msgid "Could not initialize `%s' subsystem.\n" msgstr "初始化“%s”服务失败。\n" -#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313 +#: src/fs/gnunet-download.c:334 src/fs/gnunet-search.c:308 msgid "set the desired LEVEL of receiver-anonymity" msgstr "" -#: src/fs/gnunet-download.c:344 +#: src/fs/gnunet-download.c:339 msgid "delete incomplete downloads (when aborted with CTRL-C)" msgstr "" -#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319 +#: src/fs/gnunet-download.c:344 src/fs/gnunet-search.c:314 msgid "only search the local peer (no P2P network search)" msgstr "" -#: src/fs/gnunet-download.c:354 +#: src/fs/gnunet-download.c:349 msgid "write the file to FILENAME" msgstr "" -#: src/fs/gnunet-download.c:359 +#: src/fs/gnunet-download.c:354 msgid "set the maximum number of parallel downloads that is allowed" msgstr "" -#: src/fs/gnunet-download.c:364 +#: src/fs/gnunet-download.c:359 msgid "set the maximum number of parallel requests for blocks that is allowed" msgstr "" -#: src/fs/gnunet-download.c:368 +#: src/fs/gnunet-download.c:363 msgid "download a GNUnet directory recursively" msgstr "" -#: src/fs/gnunet-download.c:386 +#: src/fs/gnunet-download.c:381 msgid "" "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/" "chk/...)" msgstr "" -#: src/fs/gnunet-fs.c:119 +#: src/fs/gnunet-fs.c:114 msgid "print a list of all indexed files" msgstr "" -#: src/fs/gnunet-fs.c:130 +#: src/fs/gnunet-fs.c:125 msgid "Special file-sharing operations" msgstr "" -#: src/fs/gnunet-fs-profiler.c:211 +#: src/fs/gnunet-fs-profiler.c:206 msgid "run the experiment with COUNT peers" msgstr "" -#: src/fs/gnunet-fs-profiler.c:217 +#: src/fs/gnunet-fs-profiler.c:212 msgid "specifies name of a file with the HOSTS the testbed should use" msgstr "" -#: src/fs/gnunet-fs-profiler.c:223 +#: src/fs/gnunet-fs-profiler.c:218 msgid "automatically terminate experiment after DELAY" msgstr "" -#: src/fs/gnunet-fs-profiler.c:233 +#: src/fs/gnunet-fs-profiler.c:228 msgid "run a testbed to measure file-sharing performance" msgstr "" -#: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231 +#: src/fs/gnunet-publish.c:214 src/fs/gnunet-publish.c:226 #, c-format msgid "Publishing `%s' at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-publish.c:239 +#: src/fs/gnunet-publish.c:234 #, c-format msgid "Error publishing: %s.\n" msgstr "" -#: src/fs/gnunet-publish.c:246 +#: src/fs/gnunet-publish.c:241 #, c-format msgid "Publishing `%s' done.\n" msgstr "" -#: src/fs/gnunet-publish.c:251 +#: src/fs/gnunet-publish.c:246 #, c-format msgid "URI is `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:259 +#: src/fs/gnunet-publish.c:254 #, c-format msgid "Namespace URI is `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:275 +#: src/fs/gnunet-publish.c:270 msgid "Starting cleanup after abort\n" msgstr "" -#: src/fs/gnunet-publish.c:282 +#: src/fs/gnunet-publish.c:277 msgid "Cleanup after abort completed.\n" msgstr "" -#: src/fs/gnunet-publish.c:288 +#: src/fs/gnunet-publish.c:283 msgid "Cleanup after abort failed.\n" msgstr "" -#: src/fs/gnunet-publish.c:430 +#: src/fs/gnunet-publish.c:425 #, fuzzy, c-format msgid "Meta data for file `%s' (%s)\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/gnunet-publish.c:435 +#: src/fs/gnunet-publish.c:430 #, fuzzy, c-format msgid "Keywords for file `%s' (%s)\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/fs/gnunet-publish.c:589 +#: src/fs/gnunet-publish.c:584 #, fuzzy msgid "Could not publish\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/fs/gnunet-publish.c:614 +#: src/fs/gnunet-publish.c:609 msgid "Could not start publishing.\n" msgstr "" -#: src/fs/gnunet-publish.c:648 +#: src/fs/gnunet-publish.c:643 #, fuzzy, c-format msgid "Scanning directory `%s'.\n" msgstr "解析配置文件“%s”失败\n" -#: src/fs/gnunet-publish.c:652 +#: src/fs/gnunet-publish.c:647 #, fuzzy, c-format msgid "Scanning file `%s'.\n" msgstr "未知的命令“%s”。\n" -#: src/fs/gnunet-publish.c:658 +#: src/fs/gnunet-publish.c:653 #, c-format msgid "There was trouble processing file `%s', skipping it.\n" msgstr "" -#: src/fs/gnunet-publish.c:665 +#: src/fs/gnunet-publish.c:660 msgid "Preprocessing complete.\n" msgstr "" -#: src/fs/gnunet-publish.c:670 +#: src/fs/gnunet-publish.c:665 #, fuzzy, c-format msgid "Extracting meta data from file `%s' complete.\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/gnunet-publish.c:677 +#: src/fs/gnunet-publish.c:672 msgid "Meta data extraction has finished.\n" msgstr "" -#: src/fs/gnunet-publish.c:686 +#: src/fs/gnunet-publish.c:681 #, fuzzy msgid "Internal error scanning directory.\n" msgstr "未知错误。\n" -#: src/fs/gnunet-publish.c:714 +#: src/fs/gnunet-publish.c:709 #, c-format msgid "Selected pseudonym `%s' unknown\n" msgstr "" -#: src/fs/gnunet-publish.c:747 +#: src/fs/gnunet-publish.c:742 #, fuzzy, c-format msgid "Failed to access `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/gnunet-publish.c:761 +#: src/fs/gnunet-publish.c:756 msgid "" "Failed to start meta directory scanner. Is gnunet-helper-publish-fs " "installed?\n" msgstr "" -#: src/fs/gnunet-publish.c:817 +#: src/fs/gnunet-publish.c:812 #, c-format msgid "Cannot extract metadata from a URI!\n" msgstr "" -#: src/fs/gnunet-publish.c:824 +#: src/fs/gnunet-publish.c:819 #, c-format msgid "You must specify one and only one filename for insertion.\n" msgstr "" -#: src/fs/gnunet-publish.c:830 +#: src/fs/gnunet-publish.c:825 #, c-format msgid "You must NOT specify an URI and a filename.\n" msgstr "" -#: src/fs/gnunet-publish.c:838 src/vpn/gnunet-vpn.c:210 +#: src/fs/gnunet-publish.c:833 src/vpn/gnunet-vpn.c:205 #, c-format msgid "Option `%s' is required when using option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:849 src/fs/gnunet-publish.c:857 -#: src/transport/gnunet-transport.c:1282 src/transport/gnunet-transport.c:1309 +#: src/fs/gnunet-publish.c:844 src/fs/gnunet-publish.c:852 +#: src/transport/gnunet-transport.c:1277 src/transport/gnunet-transport.c:1304 #, c-format msgid "Option `%s' makes no sense without option `%s'.\n" msgstr "" -#: src/fs/gnunet-publish.c:913 +#: src/fs/gnunet-publish.c:908 msgid "" "print list of extracted keywords that would be used, but do not perform " "upload" msgstr "" -#: src/fs/gnunet-publish.c:919 +#: src/fs/gnunet-publish.c:914 msgid "" "add an additional keyword for the top-level file or directory (this option " "can be specified multiple times)" msgstr "" -#: src/fs/gnunet-publish.c:925 +#: src/fs/gnunet-publish.c:920 msgid "set the meta-data for the given TYPE to the given VALUE" msgstr "" -#: src/fs/gnunet-publish.c:930 +#: src/fs/gnunet-publish.c:925 msgid "" "do not index, perform full insertion (stores entire file in encrypted form " "in GNUnet database)" msgstr "" -#: src/fs/gnunet-publish.c:937 +#: src/fs/gnunet-publish.c:932 msgid "" "specify ID of an updated version to be published in the future (for " "namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:950 +#: src/fs/gnunet-publish.c:945 msgid "publish the files under the pseudonym NAME (place file into namespace)" msgstr "" -#: src/fs/gnunet-publish.c:960 +#: src/fs/gnunet-publish.c:955 msgid "" "only simulate the process but do not do any actual publishing (useful to " "compute URIs)" msgstr "" -#: src/fs/gnunet-publish.c:966 +#: src/fs/gnunet-publish.c:961 msgid "" "set the ID of this version of the publication (for namespace insertions only)" msgstr "" -#: src/fs/gnunet-publish.c:973 +#: src/fs/gnunet-publish.c:968 msgid "" "URI to be published (can be used instead of passing a file to add keywords " "to the file with the respective URI)" msgstr "" -#: src/fs/gnunet-publish.c:989 +#: src/fs/gnunet-publish.c:984 msgid "Publish a file or directory on GNUnet" msgstr "" -#: src/fs/gnunet-search.c:127 +#: src/fs/gnunet-search.c:122 #, c-format msgid "Failed to write directory with search results to `%s'\n" msgstr "" -#: src/fs/gnunet-search.c:204 +#: src/fs/gnunet-search.c:199 #, fuzzy, c-format msgid "Error searching: %s.\n" msgstr "创建用户出错" -#: src/fs/gnunet-search.c:260 +#: src/fs/gnunet-search.c:255 msgid "Could not create keyword URI from arguments.\n" msgstr "" -#: src/fs/gnunet-search.c:284 +#: src/fs/gnunet-search.c:279 msgid "Could not start searching.\n" msgstr "" -#: src/fs/gnunet-search.c:325 +#: src/fs/gnunet-search.c:320 msgid "write search results to file starting with PREFIX" msgstr "" -#: src/fs/gnunet-search.c:331 +#: src/fs/gnunet-search.c:326 msgid "automatically terminate search after DELAY" msgstr "" -#: src/fs/gnunet-search.c:340 +#: src/fs/gnunet-search.c:335 msgid "automatically terminate search after VALUE results are found" msgstr "" -#: src/fs/gnunet-search.c:353 +#: src/fs/gnunet-search.c:348 msgid "Search GNUnet for files that were published on GNUnet" msgstr "" -#: src/fs/gnunet-service-fs.c:377 src/fs/gnunet-service-fs.c:882 +#: src/fs/gnunet-service-fs.c:372 src/fs/gnunet-service-fs.c:877 msgid "# client searches active" msgstr "" -#: src/fs/gnunet-service-fs.c:436 +#: src/fs/gnunet-service-fs.c:431 msgid "# replies received for local clients" msgstr "" -#: src/fs/gnunet-service-fs.c:605 +#: src/fs/gnunet-service-fs.c:600 msgid "# running average P2P latency (ms)" msgstr "" -#: src/fs/gnunet-service-fs.c:657 src/fs/gnunet-service-fs_cp.c:564 +#: src/fs/gnunet-service-fs.c:652 src/fs/gnunet-service-fs_cp.c:559 msgid "# Loopback routes suppressed" msgstr "" -#: src/fs/gnunet-service-fs.c:836 +#: src/fs/gnunet-service-fs.c:831 msgid "# client searches received" msgstr "" -#: src/fs/gnunet-service-fs.c:875 +#: src/fs/gnunet-service-fs.c:870 msgid "# client searches updated (merged content seen list)" msgstr "" -#: src/fs/gnunet-service-fs.c:1046 +#: src/fs/gnunet-service-fs.c:1041 #, c-format msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n" msgstr "" -#: src/fs/gnunet-service-fs.c:1286 +#: src/fs/gnunet-service-fs.c:1281 #, fuzzy msgid "FS service is lacking HOSTKEY configuration setting. Exiting.\n" msgstr "立即保存配置？" -#: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355 -#: src/topology/gnunet-daemon-topology.c:1202 +#: src/fs/gnunet-service-fs.c:1306 src/hostlist/gnunet-daemon-hostlist.c:350 +#: src/topology/gnunet-daemon-topology.c:1197 #, fuzzy, c-format msgid "Failed to connect to `%s' service.\n" msgstr "初始化“%s”服务失败。\n" -#: src/fs/gnunet-service-fs_cadet_client.c:370 +#: src/fs/gnunet-service-fs_cadet_client.c:365 msgid "# replies received via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_client.c:384 +#: src/fs/gnunet-service-fs_cadet_client.c:379 msgid "# replies received via cadet dropped" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:265 +#: src/fs/gnunet-service-fs_cadet_server.c:260 msgid "# queries received via CADET not answered" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:320 +#: src/fs/gnunet-service-fs_cadet_server.c:315 msgid "# Blocks transferred via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:346 +#: src/fs/gnunet-service-fs_cadet_server.c:341 msgid "# queries received via cadet" msgstr "" -#: src/fs/gnunet-service-fs_cadet_server.c:388 +#: src/fs/gnunet-service-fs_cadet_server.c:383 #, fuzzy msgid "# cadet client connections rejected" msgstr "" "\n" "按任意键继续\n" -#: src/fs/gnunet-service-fs_cadet_server.c:395 -#: src/fs/gnunet-service-fs_cadet_server.c:435 +#: src/fs/gnunet-service-fs_cadet_server.c:390 +#: src/fs/gnunet-service-fs_cadet_server.c:430 #, fuzzy msgid "# cadet connections active" msgstr "" "\n" "按任意键继续\n" -#: src/fs/gnunet-service-fs_cp.c:686 +#: src/fs/gnunet-service-fs_cp.c:681 msgid "# migration stop messages received" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:690 +#: src/fs/gnunet-service-fs_cp.c:685 #, c-format msgid "Migration of content to peer `%s' blocked for %s\n" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345 +#: src/fs/gnunet-service-fs_cp.c:718 src/fs/gnunet-service-fs_cp.c:1340 msgid "# P2P searches active" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:818 +#: src/fs/gnunet-service-fs_cp.c:813 msgid "# artificial delays introduced (ms)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:875 +#: src/fs/gnunet-service-fs_cp.c:870 msgid "# replies dropped due to type mismatch" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:883 +#: src/fs/gnunet-service-fs_cp.c:878 msgid "# replies received for other peers" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:897 +#: src/fs/gnunet-service-fs_cp.c:892 msgid "# replies dropped due to insufficient cover traffic" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:944 +#: src/fs/gnunet-service-fs_cp.c:939 msgid "# P2P searches destroyed due to ultimate reply" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1015 +#: src/fs/gnunet-service-fs_cp.c:1010 msgid "# requests done for free (low load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1040 +#: src/fs/gnunet-service-fs_cp.c:1035 msgid "# request dropped, priority insufficient" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1050 +#: src/fs/gnunet-service-fs_cp.c:1045 msgid "# requests done for a price (normal load)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1148 +#: src/fs/gnunet-service-fs_cp.c:1143 msgid "# requests dropped due to higher-TTL request" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1205 +#: src/fs/gnunet-service-fs_cp.c:1200 msgid "# GET requests received (from other peers)" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1228 +#: src/fs/gnunet-service-fs_cp.c:1223 msgid "# requests dropped due to missing reverse route" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1241 +#: src/fs/gnunet-service-fs_cp.c:1236 msgid "# requests dropped due to full reply queue" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1297 +#: src/fs/gnunet-service-fs_cp.c:1292 msgid "# requests dropped due TTL underflow" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1341 +#: src/fs/gnunet-service-fs_cp.c:1336 msgid "# P2P query messages received and processed" msgstr "" -#: src/fs/gnunet-service-fs_cp.c:1708 +#: src/fs/gnunet-service-fs_cp.c:1703 msgid "# migration stop messages sent" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:134 -#: src/fs/gnunet-service-fs_indexing.c:195 +#: src/fs/gnunet-service-fs_indexing.c:129 +#: src/fs/gnunet-service-fs_indexing.c:190 #, fuzzy, c-format msgid "Could not open `%s'.\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/fs/gnunet-service-fs_indexing.c:151 +#: src/fs/gnunet-service-fs_indexing.c:146 #, fuzzy, c-format msgid "Error writing `%s'.\n" msgstr "创建用户出错" -#: src/fs/gnunet-service-fs_indexing.c:253 +#: src/fs/gnunet-service-fs_indexing.c:248 #, fuzzy, c-format msgid "Failed to delete bogus block: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/fs/gnunet-service-fs_indexing.c:331 +#: src/fs/gnunet-service-fs_indexing.c:326 msgid "# index blocks removed: original file inaccessible" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:357 +#: src/fs/gnunet-service-fs_indexing.c:352 #, fuzzy, c-format msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/fs/gnunet-service-fs_indexing.c:361 +#: src/fs/gnunet-service-fs_indexing.c:356 msgid "not indexed" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:394 +#: src/fs/gnunet-service-fs_indexing.c:389 #, c-format msgid "Indexed file `%s' changed at offset %llu\n" msgstr "" -#: src/fs/gnunet-service-fs_indexing.c:518 +#: src/fs/gnunet-service-fs_indexing.c:513 #, c-format msgid "" "Index request received for file `%s' is already indexed as `%s'. Permitting " "anyway.\n" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:265 +#: src/fs/gnunet-service-fs_pe.c:260 msgid "# average retransmission delay (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:427 +#: src/fs/gnunet-service-fs_pe.c:422 msgid "# delay heap timeout (ms)" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:438 +#: src/fs/gnunet-service-fs_pe.c:433 msgid "# query plans executed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:466 +#: src/fs/gnunet-service-fs_pe.c:461 msgid "# query messages sent to other peers" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:536 +#: src/fs/gnunet-service-fs_pe.c:531 msgid "# requests merged" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:546 +#: src/fs/gnunet-service-fs_pe.c:541 msgid "# requests refreshed" msgstr "" -#: src/fs/gnunet-service-fs_pe.c:606 src/fs/gnunet-service-fs_pe.c:709 -#: src/fs/gnunet-service-fs_pe.c:788 +#: src/fs/gnunet-service-fs_pe.c:601 src/fs/gnunet-service-fs_pe.c:704 +#: src/fs/gnunet-service-fs_pe.c:783 msgid "# query plan entries" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:330 +#: src/fs/gnunet-service-fs_pr.c:325 msgid "# Pending requests created" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:430 src/fs/gnunet-service-fs_pr.c:677 +#: src/fs/gnunet-service-fs_pr.c:425 src/fs/gnunet-service-fs_pr.c:672 msgid "# Pending requests active" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:858 +#: src/fs/gnunet-service-fs_pr.c:853 msgid "# replies received and matched" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:894 +#: src/fs/gnunet-service-fs_pr.c:889 msgid "# duplicate replies discarded (bloomfilter)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:903 +#: src/fs/gnunet-service-fs_pr.c:898 msgid "# irrelevant replies discarded" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:918 +#: src/fs/gnunet-service-fs_pr.c:913 #, c-format msgid "Unsupported block type %u\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:935 +#: src/fs/gnunet-service-fs_pr.c:930 msgid "# results found locally" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1065 +#: src/fs/gnunet-service-fs_pr.c:1060 msgid "# Datastore `PUT' failures" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1093 +#: src/fs/gnunet-service-fs_pr.c:1088 msgid "# storage requests dropped due to high load" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1131 +#: src/fs/gnunet-service-fs_pr.c:1126 msgid "# Replies received from DHT" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1262 +#: src/fs/gnunet-service-fs_pr.c:1257 msgid "# Replies received from CADET" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1314 +#: src/fs/gnunet-service-fs_pr.c:1309 #, c-format msgid "Datastore lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1335 +#: src/fs/gnunet-service-fs_pr.c:1330 #, c-format msgid "On-demand lookup already took %s!\n" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1395 +#: src/fs/gnunet-service-fs_pr.c:1390 msgid "# requested DBLOCK or IBLOCK not found" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1454 +#: src/fs/gnunet-service-fs_pr.c:1449 msgid "# Datastore lookups concluded (error queueing)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1509 +#: src/fs/gnunet-service-fs_pr.c:1504 msgid "# Datastore lookups concluded (no results)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1524 +#: src/fs/gnunet-service-fs_pr.c:1519 msgid "# Datastore lookups concluded (seen all)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1548 +#: src/fs/gnunet-service-fs_pr.c:1543 msgid "# Datastore lookups aborted (more than MAX_RESULTS)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1562 +#: src/fs/gnunet-service-fs_pr.c:1557 msgid "# on-demand blocks matched requests" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1583 +#: src/fs/gnunet-service-fs_pr.c:1578 msgid "# on-demand lookups performed successfully" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1588 +#: src/fs/gnunet-service-fs_pr.c:1583 msgid "# on-demand lookups failed" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1626 +#: src/fs/gnunet-service-fs_pr.c:1621 msgid "# Datastore lookups concluded (found last result)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1639 +#: src/fs/gnunet-service-fs_pr.c:1634 msgid "# Datastore lookups concluded (load too high)" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1693 +#: src/fs/gnunet-service-fs_pr.c:1688 msgid "# Datastore lookups initiated" msgstr "" -#: src/fs/gnunet-service-fs_pr.c:1749 +#: src/fs/gnunet-service-fs_pr.c:1744 msgid "# GAP PUT messages received" msgstr "" -#: src/fs/gnunet-service-fs_push.c:646 +#: src/fs/gnunet-service-fs_push.c:641 msgid "time required, content pushing disabled" msgstr "" -#: src/fs/gnunet-unindex.c:89 +#: src/fs/gnunet-unindex.c:84 #, c-format msgid "Unindexing at %llu/%llu (%s remaining)\n" msgstr "" -#: src/fs/gnunet-unindex.c:95 +#: src/fs/gnunet-unindex.c:90 #, c-format msgid "Error unindexing: %s.\n" msgstr "" -#: src/fs/gnunet-unindex.c:100 +#: src/fs/gnunet-unindex.c:95 msgid "Unindexing done.\n" msgstr "" -#: src/fs/gnunet-unindex.c:129 +#: src/fs/gnunet-unindex.c:124 #, c-format msgid "You must specify one and only one filename for unindexing.\n" msgstr "" -#: src/fs/gnunet-unindex.c:146 +#: src/fs/gnunet-unindex.c:141 msgid "Could not start unindex operation.\n" msgstr "" -#: src/fs/gnunet-unindex.c:178 +#: src/fs/gnunet-unindex.c:173 msgid "Unindex a file that was previously indexed with gnunet-publish." msgstr "" -#: src/gns/gns_tld_api.c:276 +#: src/gns/gns_tld_api.c:271 msgid "Expected a base32-encoded public zone key\n" msgstr "" -#: src/gns/gnunet-bcd.c:127 +#: src/gns/gnunet-bcd.c:122 #, c-format msgid "Refusing `%s' request to HTTP server\n" msgstr "" -#: src/gns/gnunet-bcd.c:357 +#: src/gns/gnunet-bcd.c:352 #, c-format msgid "Invalid port number %u. Exiting.\n" msgstr "" -#: src/gns/gnunet-bcd.c:362 +#: src/gns/gnunet-bcd.c:357 #, fuzzy, c-format msgid "Businesscard HTTP server starts on %u\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-bcd.c:376 +#: src/gns/gnunet-bcd.c:371 #, fuzzy, c-format msgid "Could not start businesscard HTTP server on port %u\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-bcd.c:522 +#: src/gns/gnunet-bcd.c:517 msgid "Run HTTP serve on port PORT (default is 8888)" msgstr "" -#: src/gns/gnunet-bcd.c:535 +#: src/gns/gnunet-bcd.c:530 msgid "GNUnet HTTP server to create business cards" msgstr "" -#: src/gns/gnunet-dns2gns.c:203 +#: src/gns/gnunet-dns2gns.c:198 #, fuzzy msgid "Failed to pack DNS response into UDP packet!\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-dns2gns.c:404 +#: src/gns/gnunet-dns2gns.c:399 #, c-format msgid "Cannot parse DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:420 +#: src/gns/gnunet-dns2gns.c:415 #, c-format msgid "Received malformed DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:428 +#: src/gns/gnunet-dns2gns.c:423 #, c-format msgid "Received unsupported DNS request from %s\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:587 +#: src/gns/gnunet-dns2gns.c:582 msgid "No DNS server specified!\n" msgstr "" -#: src/gns/gnunet-dns2gns.c:687 +#: src/gns/gnunet-dns2gns.c:682 msgid "IP of recursive DNS resolver to use (required)" msgstr "" -#: src/gns/gnunet-dns2gns.c:692 +#: src/gns/gnunet-dns2gns.c:687 msgid "UDP port to listen on for inbound DNS requests; default: 2853" msgstr "" -#: src/gns/gnunet-dns2gns.c:709 +#: src/gns/gnunet-dns2gns.c:704 msgid "GNUnet DNS-to-GNS proxy (a DNS server)" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:582 +#: src/gns/gnunet-gns-benchmark.c:577 msgid "how long to wait between queries" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:587 +#: src/gns/gnunet-gns-benchmark.c:582 msgid "how long to wait for an answer" msgstr "" -#: src/gns/gnunet-gns-benchmark.c:591 +#: src/gns/gnunet-gns-benchmark.c:586 msgid "look for GNS2DNS records instead of ANY" msgstr "" -#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346 +#: src/gns/gnunet-gns.c:194 src/gns/plugin_rest_gns.c:341 #, c-format msgid "Invalid typename specified, assuming `ANY'\n" msgstr "" -#: src/gns/gnunet-gns.c:233 +#: src/gns/gnunet-gns.c:228 msgid "Lookup a record for the given name" msgstr "" -#: src/gns/gnunet-gns.c:238 +#: src/gns/gnunet-gns.c:233 msgid "Specify the type of the record to lookup" msgstr "" -#: src/gns/gnunet-gns.c:242 +#: src/gns/gnunet-gns.c:237 msgid "No unneeded output" msgstr "" -#: src/gns/gnunet-gns.c:258 +#: src/gns/gnunet-gns.c:253 #, fuzzy msgid "GNUnet GNS resolver tool" msgstr "GNUnet 错误日志" -#: src/gns/gnunet-gns-helper-service-w32.c:602 +#: src/gns/gnunet-gns-helper-service-w32.c:597 msgid "Not ready to process requests, lacking ego data\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422 +#: src/gns/gnunet-gns-helper-service-w32.c:696 src/gns/plugin_rest_gns.c:417 msgid "" "Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-" "gns-import.sh?\n" msgstr "" -#: src/gns/gnunet-gns-helper-service-w32.c:739 +#: src/gns/gnunet-gns-helper-service-w32.c:734 #, fuzzy, c-format msgid "Failed to connect to identity service\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-import.c:452 +#: src/gns/gnunet-gns-import.c:447 msgid "This program will import some GNS authorities into your GNS namestore." msgstr "" -#: src/gns/gnunet-gns-proxy.c:111 -#: src/hostlist/gnunet-daemon-hostlist_client.c:535 -#: src/hostlist/gnunet-daemon-hostlist_client.c:753 -#: src/hostlist/gnunet-daemon-hostlist_client.c:759 -#: src/hostlist/gnunet-daemon-hostlist_client.c:811 -#: src/hostlist/gnunet-daemon-hostlist_client.c:820 -#: src/hostlist/gnunet-daemon-hostlist_client.c:931 +#: src/gns/gnunet-gns-proxy.c:106 +#: src/hostlist/gnunet-daemon-hostlist_client.c:530 +#: src/hostlist/gnunet-daemon-hostlist_client.c:748 +#: src/hostlist/gnunet-daemon-hostlist_client.c:754 +#: src/hostlist/gnunet-daemon-hostlist_client.c:806 +#: src/hostlist/gnunet-daemon-hostlist_client.c:815 +#: src/hostlist/gnunet-daemon-hostlist_client.c:926 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1021 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1031 -#: src/transport/plugin_transport_http_client.c:598 -#: src/transport/plugin_transport_http_client.c:616 +#: src/transport/plugin_transport_http_client.c:593 +#: src/transport/plugin_transport_http_client.c:611 #, c-format msgid "%s failed at %s:%d: `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:956 +#: src/gns/gnunet-gns-proxy.c:951 #, fuzzy, c-format msgid "Unsupported CURL TLS backend %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:979 +#: src/gns/gnunet-gns-proxy.c:974 #, fuzzy, c-format msgid "Failed to fetch CN from cert: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:1002 +#: src/gns/gnunet-gns-proxy.c:997 #, fuzzy, c-format msgid "Failed to initialize DANE: %s\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/gns/gnunet-gns-proxy.c:1015 +#: src/gns/gnunet-gns-proxy.c:1010 #, fuzzy, c-format msgid "Failed to parse DANE record: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-gns-proxy.c:1030 +#: src/gns/gnunet-gns-proxy.c:1025 #, fuzzy, c-format msgid "Failed to verify TLS connection using DANE: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:1040 +#: src/gns/gnunet-gns-proxy.c:1035 #, c-format msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1064 +#: src/gns/gnunet-gns-proxy.c:1059 #, c-format msgid "TLS certificate subject name (%s) does not match `%s'\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:1182 +#: src/gns/gnunet-gns-proxy.c:1177 #, c-format msgid "Cookie domain `%s' supplied by server is invalid\n" msgstr "" -#: src/gns/gnunet-gns-proxy.c:2017 +#: src/gns/gnunet-gns-proxy.c:2012 #, fuzzy, c-format msgid "Unsupported HTTP method `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:2538 +#: src/gns/gnunet-gns-proxy.c:2533 #, fuzzy, c-format msgid "Unable to import private key from file `%s'\n" msgstr "无法创建用户账户：" -#: src/gns/gnunet-gns-proxy.c:2570 +#: src/gns/gnunet-gns-proxy.c:2565 #, fuzzy, c-format msgid "Unable to import certificate from `%s'\n" msgstr "无法保存配置文件“%s”：" -#: src/gns/gnunet-gns-proxy.c:2769 +#: src/gns/gnunet-gns-proxy.c:2764 #, fuzzy, c-format msgid "Failed to start HTTPS server for `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:2794 src/rest/gnunet-rest-server.c:658 +#: src/gns/gnunet-gns-proxy.c:2789 src/rest/gnunet-rest-server.c:653 #, fuzzy msgid "Failed to pass client to MHD\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-gns-proxy.c:3122 +#: src/gns/gnunet-gns-proxy.c:3117 #, fuzzy, c-format msgid "Unsupported socks version %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3151 +#: src/gns/gnunet-gns-proxy.c:3146 #, fuzzy, c-format msgid "Unsupported socks command %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3232 +#: src/gns/gnunet-gns-proxy.c:3227 #, fuzzy, c-format msgid "Unsupported socks address type %d\n" msgstr "未知的命令“%s”。\n" -#: src/gns/gnunet-gns-proxy.c:3522 +#: src/gns/gnunet-gns-proxy.c:3517 #, fuzzy, c-format msgid "Failed to load X.509 key and certificate from `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/gnunet-gns-proxy.c:3650 +#: src/gns/gnunet-gns-proxy.c:3645 msgid "listen on specified port (default: 7777)" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3655 +#: src/gns/gnunet-gns-proxy.c:3650 msgid "pem file to use as CA" msgstr "" -#: src/gns/gnunet-gns-proxy.c:3681 +#: src/gns/gnunet-gns-proxy.c:3676 msgid "GNUnet GNS proxy" msgstr "" -#: src/gns/gnunet-service-gns.c:513 +#: src/gns/gnunet-service-gns.c:508 #, fuzzy msgid "Properly base32-encoded public key required" msgstr "“%s”的参数无效。\n" -#: src/gns/gnunet-service-gns.c:549 +#: src/gns/gnunet-service-gns.c:544 #, fuzzy msgid "Failed to connect to the namecache!\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-service-gns.c:568 -#: src/zonemaster/gnunet-service-zonemaster.c:875 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440 +#: src/gns/gnunet-service-gns.c:563 +#: src/zonemaster/gnunet-service-zonemaster.c:870 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:435 #, fuzzy msgid "Could not connect to DHT!\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/gns/gnunet-service-gns_interceptor.c:259 +#: src/gns/gnunet-service-gns_interceptor.c:254 msgid "Error converting GNS response to DNS response!\n" msgstr "" -#: src/gns/gnunet-service-gns_interceptor.c:366 +#: src/gns/gnunet-service-gns_interceptor.c:361 #, fuzzy msgid "Failed to connect to the DNS service!\n" msgstr "初始化“%s”服务失败。\n" -#: src/gns/gnunet-service-gns_resolver.c:713 +#: src/gns/gnunet-service-gns_resolver.c:708 #, c-format msgid "Protocol `%s' unknown, skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:724 +#: src/gns/gnunet-service-gns_resolver.c:719 #, c-format msgid "Service `%s' unknown for protocol `%s', skipping labels.\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:927 +#: src/gns/gnunet-service-gns_resolver.c:922 #, fuzzy msgid "Failed to parse DNS response\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-service-gns_resolver.c:1102 +#: src/gns/gnunet-service-gns_resolver.c:1097 #, c-format msgid "Skipping record of unsupported type %d\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1796 +#: src/gns/gnunet-service-gns_resolver.c:1791 #, c-format msgid "GNS lookup resulted in DNS name that is too long (`%s')\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:1839 +#: src/gns/gnunet-service-gns_resolver.c:1834 msgid "GNS lookup failed (zero records found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2253 +#: src/gns/gnunet-service-gns_resolver.c:2248 msgid "GNS lookup recursion failed (no delegation record found)\n" msgstr "" -#: src/gns/gnunet-service-gns_resolver.c:2276 +#: src/gns/gnunet-service-gns_resolver.c:2271 #, fuzzy, c-format msgid "Failed to cache GNS resolution: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/gns/gnunet-service-gns_resolver.c:2563 +#: src/gns/gnunet-service-gns_resolver.c:2558 #, c-format msgid "Zone %s was revoked, resolution fails\n" msgstr "" -#: src/gns/plugin_gnsrecord_gns.c:181 +#: src/gns/plugin_gnsrecord_gns.c:176 #, fuzzy, c-format msgid "Unable to parse PKEY record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:212 +#: src/gns/plugin_gnsrecord_gns.c:207 #, fuzzy, c-format msgid "Unable to parse GNS2DNS record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:233 +#: src/gns/plugin_gnsrecord_gns.c:228 #, fuzzy, c-format msgid "Failed to serialize GNS2DNS record with value `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:258 +#: src/gns/plugin_gnsrecord_gns.c:253 #, fuzzy, c-format msgid "Unable to parse VPN record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_gnsrecord_gns.c:294 +#: src/gns/plugin_gnsrecord_gns.c:289 #, fuzzy, c-format msgid "Unable to parse BOX record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gns/plugin_rest_gns.c:384 +#: src/gns/plugin_rest_gns.c:379 msgid "Ego for not found, cannot perform lookup.\n" msgstr "" -#: src/gnsrecord/plugin_gnsrecord_dns.c:359 +#: src/gnsrecord/plugin_gnsrecord_dns.c:354 #, fuzzy, c-format msgid "Unable to parse IPv4 address `%s'\n" msgstr "无效的进程优先级“%s”\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:380 +#: src/gnsrecord/plugin_gnsrecord_dns.c:375 #, fuzzy, c-format msgid "Failed to serialize NS record with value `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:402 +#: src/gnsrecord/plugin_gnsrecord_dns.c:397 #, fuzzy, c-format msgid "Failed to serialize CNAME record with value `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:487 +#: src/gnsrecord/plugin_gnsrecord_dns.c:482 #, fuzzy, c-format msgid "Failed to serialize CERT record with %u bytes\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:523 +#: src/gnsrecord/plugin_gnsrecord_dns.c:518 #, fuzzy, c-format msgid "Unable to parse SOA record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:542 +#: src/gnsrecord/plugin_gnsrecord_dns.c:537 #, fuzzy, c-format msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:565 +#: src/gnsrecord/plugin_gnsrecord_dns.c:560 #, fuzzy, c-format msgid "Failed to serialize PTR record with value `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:588 +#: src/gnsrecord/plugin_gnsrecord_dns.c:583 #, fuzzy, c-format msgid "Unable to parse MX record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:603 +#: src/gnsrecord/plugin_gnsrecord_dns.c:598 #, fuzzy, c-format msgid "Failed to serialize MX record with hostname `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:630 +#: src/gnsrecord/plugin_gnsrecord_dns.c:625 #, fuzzy, c-format msgid "Unable to parse SRV record `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:646 +#: src/gnsrecord/plugin_gnsrecord_dns.c:641 #, fuzzy, c-format msgid "Failed to serialize SRV record with target `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:663 +#: src/gnsrecord/plugin_gnsrecord_dns.c:658 #, fuzzy, c-format msgid "Unable to parse IPv6 address `%s'\n" msgstr "无效的进程优先级“%s”\n" -#: src/gnsrecord/plugin_gnsrecord_dns.c:687 -#: src/gnsrecord/plugin_gnsrecord_dns.c:703 +#: src/gnsrecord/plugin_gnsrecord_dns.c:682 +#: src/gnsrecord/plugin_gnsrecord_dns.c:698 #, fuzzy, c-format msgid "Unable to parse TLSA record string `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/hello/gnunet-hello.c:126 +#: src/hello/gnunet-hello.c:121 msgid "Call with name of HELLO file to modify.\n" msgstr "" -#: src/hello/gnunet-hello.c:132 +#: src/hello/gnunet-hello.c:127 #, fuzzy, c-format msgid "Error accessing file `%s': %s\n" msgstr "创建用户出错" -#: src/hello/gnunet-hello.c:140 +#: src/hello/gnunet-hello.c:135 #, c-format msgid "File `%s' is too big to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:147 +#: src/hello/gnunet-hello.c:142 #, c-format msgid "File `%s' is too small to be a HELLO\n" msgstr "" -#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:198 +#: src/hello/gnunet-hello.c:152 src/hello/gnunet-hello.c:193 #, fuzzy, c-format msgid "Error opening file `%s': %s\n" msgstr "创建用户出错" -#: src/hello/gnunet-hello.c:174 +#: src/hello/gnunet-hello.c:169 #, c-format msgid "Did not find well-formed HELLO in file `%s'\n" msgstr "" -#: src/hello/gnunet-hello.c:210 +#: src/hello/gnunet-hello.c:205 #, fuzzy, c-format msgid "Error writing HELLO to file `%s': %s\n" msgstr "创建用户出错" -#: src/hello/gnunet-hello.c:219 +#: src/hello/gnunet-hello.c:214 #, c-format msgid "Modified %u addresses, wrote %u bytes\n" msgstr "" -#: src/hello/hello.c:1110 +#: src/hello/hello.c:1105 #, fuzzy msgid "Failed to parse HELLO message: missing expiration time\n" msgstr "保存配置失败。" -#: src/hello/hello.c:1119 +#: src/hello/hello.c:1114 #, fuzzy msgid "Failed to parse HELLO message: invalid expiration time\n" msgstr "保存配置失败。" -#: src/hello/hello.c:1129 +#: src/hello/hello.c:1124 #, fuzzy msgid "Failed to parse HELLO message: malformed\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/hello/hello.c:1140 +#: src/hello/hello.c:1135 msgid "Failed to parse HELLO message: missing transport plugin\n" msgstr "" -#: src/hello/hello.c:1158 +#: src/hello/hello.c:1153 #, c-format msgid "Plugin `%s' not found, skipping address\n" msgstr "" -#: src/hello/hello.c:1166 +#: src/hello/hello.c:1161 #, c-format msgid "Plugin `%s' does not support URIs yet\n" msgstr "" -#: src/hello/hello.c:1181 +#: src/hello/hello.c:1176 #, fuzzy, c-format msgid "Failed to parse `%s' as an address for plugin `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/hostlist/gnunet-daemon-hostlist.c:316 +#: src/hostlist/gnunet-daemon-hostlist.c:311 msgid "" "None of the functions for the hostlist daemon were enabled. I have no " "reason to run!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:376 +#: src/hostlist/gnunet-daemon-hostlist.c:371 msgid "advertise our hostlist to other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:381 +#: src/hostlist/gnunet-daemon-hostlist.c:376 msgid "" "bootstrap using hostlists (it is highly recommended that you always use this " "option)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:385 +#: src/hostlist/gnunet-daemon-hostlist.c:380 msgid "enable learning about hostlist servers from other peers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:390 +#: src/hostlist/gnunet-daemon-hostlist.c:385 msgid "provide a hostlist server" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist.c:406 +#: src/hostlist/gnunet-daemon-hostlist.c:401 msgid "GNUnet hostlist server and client" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:349 +#: src/hostlist/gnunet-daemon-hostlist_client.c:344 msgid "# bytes downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:370 -#: src/hostlist/gnunet-daemon-hostlist_client.c:403 +#: src/hostlist/gnunet-daemon-hostlist_client.c:365 +#: src/hostlist/gnunet-daemon-hostlist_client.c:398 msgid "# invalid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:373 -#: src/hostlist/gnunet-daemon-hostlist_client.c:406 +#: src/hostlist/gnunet-daemon-hostlist_client.c:368 +#: src/hostlist/gnunet-daemon-hostlist_client.c:401 #, c-format msgid "Invalid `%s' message received from hostlist at `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:391 +#: src/hostlist/gnunet-daemon-hostlist_client.c:386 msgid "# valid HELLOs downloaded from hostlist servers" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:661 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1407 +#: src/hostlist/gnunet-daemon-hostlist_client.c:656 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1402 msgid "# advertised hostlist URIs" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:691 +#: src/hostlist/gnunet-daemon-hostlist_client.c:686 #, c-format msgid "# advertised URI `%s' downloaded" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:734 +#: src/hostlist/gnunet-daemon-hostlist_client.c:729 #, c-format msgid "" "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI " "gets dismissed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:862 +#: src/hostlist/gnunet-daemon-hostlist_client.c:857 #, c-format msgid "Timeout trying to download hostlist from `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:876 +#: src/hostlist/gnunet-daemon-hostlist_client.c:871 #, c-format msgid "Download limit of %u bytes exceeded, stopping download\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:896 +#: src/hostlist/gnunet-daemon-hostlist_client.c:891 #, fuzzy, c-format msgid "Download of hostlist from `%s' failed: `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:902 +#: src/hostlist/gnunet-daemon-hostlist_client.c:897 #, c-format msgid "Download of hostlist `%s' completed.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:910 +#: src/hostlist/gnunet-daemon-hostlist_client.c:905 #, c-format msgid "Adding successfully tested hostlist `%s' datastore.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:963 +#: src/hostlist/gnunet-daemon-hostlist_client.c:958 #, c-format msgid "Bootstrapping using hostlist at `%s'.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:971 +#: src/hostlist/gnunet-daemon-hostlist_client.c:966 msgid "# hostlist downloads initiated" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1098 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1665 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1093 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1660 msgid "# milliseconds between hostlist downloads" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1107 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1102 #, c-format msgid "Have %u/%u connections. Will consider downloading hostlist in %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1166 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1187 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1161 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1182 msgid "# active connections" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1348 #, c-format msgid "Loading saved hostlist entries from file `%s' \n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1358 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1353 #, c-format msgid "Hostlist file `%s' does not exist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1367 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1362 #, fuzzy, c-format msgid "Could not open file `%s' for reading to load hostlists: %s\n" msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1401 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1396 #, c-format msgid "%u hostlist URIs loaded from file\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1404 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1399 msgid "# hostlist URIs read from file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1450 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1445 #, fuzzy, c-format msgid "Could not open file `%s' for writing to save hostlists: %s\n" msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1457 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1452 #, c-format msgid "Writing %u hostlist URIs to `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1481 -#: src/hostlist/gnunet-daemon-hostlist_client.c:1498 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1476 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 #, c-format msgid "Error writing hostlist URIs to file `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1493 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1488 msgid "# hostlist URIs written to file" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1595 -#: src/transport/plugin_transport_http_client.c:2274 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1590 +#: src/transport/plugin_transport_http_client.c:2269 #, c-format msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1624 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1619 msgid "Learning is enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1638 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1633 msgid "Learning is not enabled on this peer\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_client.c:1651 +#: src/hostlist/gnunet-daemon-hostlist_client.c:1646 #, c-format msgid "" "Since learning is not enabled on this peer, hostlist file `%s' was removed\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:176 +#: src/hostlist/gnunet-daemon-hostlist_server.c:171 msgid "bytes in hostlist" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:201 +#: src/hostlist/gnunet-daemon-hostlist_server.c:196 msgid "expired addresses encountered" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:237 -#: src/hostlist/gnunet-daemon-hostlist_server.c:531 -#: src/peerinfo-tool/gnunet-peerinfo.c:385 -#: src/peerinfo-tool/gnunet-peerinfo.c:534 -#: src/topology/gnunet-daemon-topology.c:862 +#: src/hostlist/gnunet-daemon-hostlist_server.c:232 +#: src/hostlist/gnunet-daemon-hostlist_server.c:526 +#: src/peerinfo-tool/gnunet-peerinfo.c:380 +#: src/peerinfo-tool/gnunet-peerinfo.c:529 +#: src/topology/gnunet-daemon-topology.c:857 #, c-format msgid "Error in communication with PEERINFO service: %s\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:261 +#: src/hostlist/gnunet-daemon-hostlist_server.c:256 msgid "HELLOs without addresses encountered (ignored)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:278 +#: src/hostlist/gnunet-daemon-hostlist_server.c:273 msgid "bytes not included in hostlist (size limit)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:382 +#: src/hostlist/gnunet-daemon-hostlist_server.c:377 #, c-format msgid "Refusing `%s' request to hostlist server\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:385 +#: src/hostlist/gnunet-daemon-hostlist_server.c:380 msgid "hostlist requests refused (not HTTP GET)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:397 +#: src/hostlist/gnunet-daemon-hostlist_server.c:392 #, c-format msgid "Refusing `%s' request with %llu bytes of upload data\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:401 +#: src/hostlist/gnunet-daemon-hostlist_server.c:396 msgid "hostlist requests refused (upload data)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:408 +#: src/hostlist/gnunet-daemon-hostlist_server.c:403 msgid "Could not handle hostlist request since I do not have a response yet\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:411 +#: src/hostlist/gnunet-daemon-hostlist_server.c:406 msgid "hostlist requests refused (not ready)" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:416 +#: src/hostlist/gnunet-daemon-hostlist_server.c:411 msgid "Received request for our hostlist\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:418 +#: src/hostlist/gnunet-daemon-hostlist_server.c:413 msgid "hostlist requests processed" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:466 +#: src/hostlist/gnunet-daemon-hostlist_server.c:461 msgid "# hostlist advertisements send" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:679 -#: src/transport/gnunet-service-transport.c:2815 +#: src/hostlist/gnunet-daemon-hostlist_server.c:674 +#: src/transport/gnunet-service-transport.c:2810 msgid "Could not access PEERINFO service. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:691 +#: src/hostlist/gnunet-daemon-hostlist_server.c:686 #, c-format msgid "Invalid port number %llu. Exiting.\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:703 +#: src/hostlist/gnunet-daemon-hostlist_server.c:698 #, c-format msgid "Hostlist service starts on %s:%llu\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:718 +#: src/hostlist/gnunet-daemon-hostlist_server.c:713 #, c-format msgid "Address to obtain hostlist: `%s'\n" msgstr "" -#: src/hostlist/gnunet-daemon-hostlist_server.c:731 +#: src/hostlist/gnunet-daemon-hostlist_server.c:726 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "“%s”不可用。\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:748 +#: src/hostlist/gnunet-daemon-hostlist_server.c:743 #, fuzzy msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n" msgstr "“%s”不可用。\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:769 +#: src/hostlist/gnunet-daemon-hostlist_server.c:764 #, fuzzy, c-format msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n" msgstr "“%s”不可用。\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:789 +#: src/hostlist/gnunet-daemon-hostlist_server.c:784 #, fuzzy, c-format msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n" msgstr "“%s”不可用。\n" -#: src/hostlist/gnunet-daemon-hostlist_server.c:829 +#: src/hostlist/gnunet-daemon-hostlist_server.c:824 #, c-format msgid "Could not start hostlist HTTP server on port %u\n" msgstr "" -#: src/identity/gnunet-identity.c:179 +#: src/identity/gnunet-identity.c:174 #, fuzzy, c-format msgid "Failed to create ego: %s\n" msgstr "发送消息失败。\n" -#: src/identity/gnunet-identity.c:201 +#: src/identity/gnunet-identity.c:196 #, fuzzy, c-format msgid "Failed to set default ego: %s\n" msgstr "发送消息失败。\n" -#: src/identity/gnunet-identity.c:356 +#: src/identity/gnunet-identity.c:351 msgid "create ego NAME" msgstr "" -#: src/identity/gnunet-identity.c:362 +#: src/identity/gnunet-identity.c:357 msgid "delete ego NAME " msgstr "" -#: src/identity/gnunet-identity.c:367 +#: src/identity/gnunet-identity.c:362 msgid "display all egos" msgstr "" -#: src/identity/gnunet-identity.c:373 +#: src/identity/gnunet-identity.c:368 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)" msgstr "" -#: src/identity/gnunet-identity.c:378 +#: src/identity/gnunet-identity.c:373 msgid "run in monitor mode egos" msgstr "" -#: src/identity/gnunet-identity.c:384 +#: src/identity/gnunet-identity.c:379 msgid "" "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)" msgstr "" -#: src/identity/gnunet-identity.c:398 +#: src/identity/gnunet-identity.c:393 msgid "Maintain egos" msgstr "" -#: src/identity/gnunet-service-identity.c:390 +#: src/identity/gnunet-service-identity.c:385 msgid "no default known" msgstr "" -#: src/identity/gnunet-service-identity.c:412 +#: src/identity/gnunet-service-identity.c:407 msgid "default configured, but ego unknown (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:501 -#: src/identity/gnunet-service-identity.c:773 -#: src/identity/gnunet-service-identity.c:895 +#: src/identity/gnunet-service-identity.c:496 +#: src/identity/gnunet-service-identity.c:768 +#: src/identity/gnunet-service-identity.c:890 #, fuzzy, c-format msgid "Failed to write subsystem default identifier map to `%s'.\n" msgstr "解析配置文件“%s”失败\n" -#: src/identity/gnunet-service-identity.c:508 +#: src/identity/gnunet-service-identity.c:503 msgid "Unknown ego specified for service (internal error)" msgstr "" -#: src/identity/gnunet-service-identity.c:601 +#: src/identity/gnunet-service-identity.c:596 msgid "identifier already in use for another ego" msgstr "" -#: src/identity/gnunet-service-identity.c:750 +#: src/identity/gnunet-service-identity.c:745 msgid "target name already exists" msgstr "" -#: src/identity/gnunet-service-identity.c:789 -#: src/identity/gnunet-service-identity.c:912 +#: src/identity/gnunet-service-identity.c:784 +#: src/identity/gnunet-service-identity.c:907 msgid "no matching ego found" msgstr "" -#: src/identity/gnunet-service-identity.c:946 +#: src/identity/gnunet-service-identity.c:941 #, fuzzy, c-format msgid "Failed to parse ego information in `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/identity/gnunet-service-identity.c:1004 +#: src/identity/gnunet-service-identity.c:999 #, fuzzy, c-format msgid "Failed to parse subsystem identity configuration file `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/identity/gnunet-service-identity.c:1014 +#: src/identity/gnunet-service-identity.c:1009 #, fuzzy, c-format msgid "Failed to create directory `%s' for storing egos\n" msgstr "解析配置文件“%s”失败\n" -#: src/identity/plugin_rest_identity.c:968 +#: src/identity/plugin_rest_identity.c:963 msgid "Identity REST API initialized\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:424 +#: src/identity-provider/gnunet-idp.c:419 #, fuzzy msgid "Ego is required\n" msgstr "%s：选项“%s”有歧义\n" -#: src/identity-provider/gnunet-idp.c:432 +#: src/identity-provider/gnunet-idp.c:427 msgid "Attribute value missing!\n" msgstr "" -#: src/identity-provider/gnunet-idp.c:440 +#: src/identity-provider/gnunet-idp.c:435 #, fuzzy msgid "Requesting party key is required!\n" msgstr "设置要使用的昵称(必须)" -#: src/identity-provider/gnunet-idp.c:463 +#: src/identity-provider/gnunet-idp.c:458 msgid "Add attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:469 +#: src/identity-provider/gnunet-idp.c:464 msgid "Attribute value" msgstr "" -#: src/identity-provider/gnunet-idp.c:474 +#: src/identity-provider/gnunet-idp.c:469 msgid "Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:479 +#: src/identity-provider/gnunet-idp.c:474 msgid "Audience (relying party)" msgstr "" -#: src/identity-provider/gnunet-idp.c:483 +#: src/identity-provider/gnunet-idp.c:478 msgid "List attributes for Ego" msgstr "" -#: src/identity-provider/gnunet-idp.c:488 +#: src/identity-provider/gnunet-idp.c:483 msgid "Issue a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:493 +#: src/identity-provider/gnunet-idp.c:488 msgid "Consume a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:498 +#: src/identity-provider/gnunet-idp.c:493 msgid "Revoke a ticket" msgstr "" -#: src/identity-provider/gnunet-idp.c:503 +#: src/identity-provider/gnunet-idp.c:498 msgid "Type of attribute" msgstr "" -#: src/identity-provider/gnunet-idp.c:508 +#: src/identity-provider/gnunet-idp.c:503 msgid "Expiration interval of the attribute" msgstr "" -#: src/identity-provider/identity_provider_api.c:436 +#: src/identity-provider/identity_provider_api.c:431 #, fuzzy msgid "failed to store record\n" msgstr "运行 %s失败：%s %d\n" -#: src/identity-provider/plugin_rest_identity_provider.c:1230 -#: src/identity-provider/plugin_rest_openid_connect.c:2147 +#: src/identity-provider/plugin_rest_identity_provider.c:1225 +#: src/identity-provider/plugin_rest_openid_connect.c:2142 msgid "Identity Provider REST API initialized\n" msgstr "" -#: src/json/json.c:119 +#: src/json/json.c:118 #, fuzzy, c-format msgid "Failed to parse JSON in option `%s': %s (%s)\n" msgstr "解析配置文件“%s”失败\n" -#: src/multicast/gnunet-multicast.c:48 src/multicast/gnunet-multicast.c:72 +#: src/multicast/gnunet-multicast.c:43 src/multicast/gnunet-multicast.c:67 msgid "This command doesn't do anything yet." msgstr "" -#: src/my/my.c:198 src/my/my.c:217 +#: src/my/my.c:193 src/my/my.c:212 #, fuzzy, c-format msgid "%s failed at %s:%d with error: %s\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/mysql/mysql.c:180 +#: src/mysql/mysql.c:175 #, c-format msgid "Trying to use file `%s' for MySQL configuration.\n" msgstr "" -#: src/mysql/mysql.c:187 +#: src/mysql/mysql.c:182 #, fuzzy, c-format msgid "Could not access file `%s': %s\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/namecache/gnunet-namecache.c:107 +#: src/namecache/gnunet-namecache.c:102 #, fuzzy, c-format msgid "No records found for `%s'" msgstr "运行 %s失败：%s %d\n" -#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426 +#: src/namecache/gnunet-namecache.c:117 src/namestore/gnunet-namestore.c:421 #, c-format msgid "\tCorrupt or unsupported record of type %u\n" msgstr "" -#: src/namecache/gnunet-namecache.c:183 +#: src/namecache/gnunet-namecache.c:178 #, fuzzy, c-format msgid "You must specify which zone should be accessed\n" msgstr "您必须指定一个昵称\n" -#: src/namecache/gnunet-namecache.c:193 +#: src/namecache/gnunet-namecache.c:188 #, fuzzy, c-format msgid "Invalid public key for zone `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/namecache/gnunet-namecache.c:201 +#: src/namecache/gnunet-namecache.c:196 #, fuzzy, c-format msgid "You must specify a name\n" msgstr "您必须指定一个接收方！\n" -#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291 +#: src/namecache/gnunet-namecache.c:227 src/namestore/gnunet-namestore.c:1286 msgid "name of the record to add/delete/display" msgstr "" -#: src/namecache/gnunet-namecache.c:238 +#: src/namecache/gnunet-namecache.c:233 msgid "spezifies the public key of the zone to look in" msgstr "" -#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343 +#: src/namecache/gnunet-namecache.c:245 src/namestore/gnunet-namestore.c:1338 #, fuzzy msgid "GNUnet zone manipulation tool" msgstr "GNUnet 配置" -#: src/namecache/namecache_api.c:296 +#: src/namecache/namecache_api.c:291 msgid "Namecache failed to cache block" msgstr "" -#: src/namecache/namecache_api.c:383 +#: src/namecache/namecache_api.c:378 #, fuzzy msgid "Error communicating with namecache service" msgstr "连接 %s:%u 出错。守护程序在运行吗？\n" -#: src/namecache/plugin_namecache_flat.c:121 -#: src/namecache/plugin_namecache_flat.c:255 -#: src/namestore/plugin_namestore_flat.c:150 -#: src/namestore/plugin_namestore_flat.c:385 -#: src/peerstore/plugin_peerstore_flat.c:379 -#: src/peerstore/plugin_peerstore_flat.c:538 +#: src/namecache/plugin_namecache_flat.c:116 +#: src/namecache/plugin_namecache_flat.c:250 +#: src/namestore/plugin_namestore_flat.c:145 +#: src/namestore/plugin_namestore_flat.c:380 +#: src/peerstore/plugin_peerstore_flat.c:374 +#: src/peerstore/plugin_peerstore_flat.c:533 #, fuzzy, c-format msgid "Unable to initialize file: %s.\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/namecache/plugin_namecache_flat.c:132 -#: src/namestore/plugin_namestore_flat.c:161 -#: src/peerstore/plugin_peerstore_flat.c:394 +#: src/namecache/plugin_namecache_flat.c:127 +#: src/namestore/plugin_namestore_flat.c:156 +#: src/peerstore/plugin_peerstore_flat.c:389 #, fuzzy, c-format msgid "Unable to get filesize: %s.\n" msgstr "发送消息失败。\n" -#: src/namecache/plugin_namecache_flat.c:151 -#: src/namestore/plugin_namestore_flat.c:174 -#: src/peerstore/plugin_peerstore_flat.c:406 +#: src/namecache/plugin_namecache_flat.c:146 +#: src/namestore/plugin_namestore_flat.c:169 +#: src/peerstore/plugin_peerstore_flat.c:401 #, fuzzy, c-format msgid "Unable to read file: %s.\n" msgstr "发送消息失败。\n" -#: src/namecache/plugin_namecache_flat.c:410 +#: src/namecache/plugin_namecache_flat.c:405 #, fuzzy msgid "flat plugin running\n" msgstr "sqlite 数据仓库" -#: src/namestore/gnunet-namestore.c:313 +#: src/namestore/gnunet-namestore.c:308 #, c-format msgid "Adding record failed: %s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:343 -#: src/namestore/plugin_rest_namestore.c:572 +#: src/namestore/gnunet-namestore.c:338 +#: src/namestore/plugin_rest_namestore.c:567 #, c-format msgid "Deleting record failed, record does not exist%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:350 -#: src/namestore/plugin_rest_namestore.c:581 +#: src/namestore/gnunet-namestore.c:345 +#: src/namestore/plugin_rest_namestore.c:576 #, c-format msgid "Deleting record failed%s%s\n" msgstr "" -#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638 +#: src/namestore/gnunet-namestore.c:625 src/namestore/gnunet-namestore.c:633 #, c-format msgid "A %s record exists already under `%s', no other records can be added.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664 +#: src/namestore/gnunet-namestore.c:647 src/namestore/gnunet-namestore.c:659 #, c-format msgid "Records already exist under `%s', cannot add `%s' record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:677 +#: src/namestore/gnunet-namestore.c:672 #, c-format msgid "" "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:810 -#: src/namestore/plugin_rest_namestore.c:607 +#: src/namestore/gnunet-namestore.c:805 +#: src/namestore/plugin_rest_namestore.c:602 #, c-format msgid "There are no records under label `%s' that could be deleted.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:851 +#: src/namestore/gnunet-namestore.c:846 #, c-format msgid "" "There are no records under label `%s' that match the request for deletion.\n" msgstr "" -#: src/namestore/gnunet-namestore.c:903 +#: src/namestore/gnunet-namestore.c:898 #, c-format msgid "No options given\n" msgstr "" -#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931 -#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973 -#: src/namestore/gnunet-namestore.c:1027 +#: src/namestore/gnunet-namestore.c:917 src/namestore/gnunet-namestore.c:926 +#: src/namestore/gnunet-namestore.c:945 src/namestore/gnunet-namestore.c:968 +#: src/namestore/gnunet-namestore.c:1022 #, fuzzy, c-format msgid "Missing option `%s' for operation `%s'\n" msgstr "配置文件“%s”已写入。\n" -#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932 -#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975 +#: src/namestore/gnunet-namestore.c:918 src/namestore/gnunet-namestore.c:927 +#: src/namestore/gnunet-namestore.c:946 src/namestore/gnunet-namestore.c:970 msgid "add" msgstr "" -#: src/namestore/gnunet-namestore.c:941 -#: src/namestore/plugin_rest_namestore.c:684 +#: src/namestore/gnunet-namestore.c:936 +#: src/namestore/plugin_rest_namestore.c:679 #, fuzzy, c-format msgid "Unsupported type `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/namestore/gnunet-namestore.c:963 -#: src/namestore/plugin_rest_namestore.c:704 -#: src/namestore/plugin_rest_namestore.c:746 +#: src/namestore/gnunet-namestore.c:958 +#: src/namestore/plugin_rest_namestore.c:699 +#: src/namestore/plugin_rest_namestore.c:741 #, c-format msgid "Value `%s' invalid for record type `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1008 +#: src/namestore/gnunet-namestore.c:1003 #, fuzzy, c-format msgid "Invalid time format `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/namestore/gnunet-namestore.c:1028 +#: src/namestore/gnunet-namestore.c:1023 msgid "del" msgstr "" -#: src/namestore/gnunet-namestore.c:1071 +#: src/namestore/gnunet-namestore.c:1066 #, fuzzy, c-format msgid "Invalid public key for reverse lookup `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/namestore/gnunet-namestore.c:1100 -#: src/peerinfo-tool/gnunet-peerinfo.c:775 +#: src/namestore/gnunet-namestore.c:1095 +#: src/peerinfo-tool/gnunet-peerinfo.c:770 #, fuzzy, c-format msgid "Invalid URI `%s'\n" msgstr "无效条目。\n" -#: src/namestore/gnunet-namestore.c:1135 +#: src/namestore/gnunet-namestore.c:1130 #, fuzzy, c-format msgid "Invalid nick `%s'\n" msgstr "无效条目。\n" -#: src/namestore/gnunet-namestore.c:1175 -#: src/namestore/plugin_rest_namestore.c:1065 +#: src/namestore/gnunet-namestore.c:1170 +#: src/namestore/plugin_rest_namestore.c:1060 #, c-format msgid "No default ego configured in identity service\n" msgstr "" -#: src/namestore/gnunet-namestore.c:1239 -#: src/namestore/plugin_rest_namestore.c:1161 +#: src/namestore/gnunet-namestore.c:1234 +#: src/namestore/plugin_rest_namestore.c:1156 #, fuzzy, c-format msgid "Cannot connect to identity service\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/namestore/gnunet-namestore.c:1264 +#: src/namestore/gnunet-namestore.c:1259 msgid "add record" msgstr "" -#: src/namestore/gnunet-namestore.c:1268 +#: src/namestore/gnunet-namestore.c:1263 msgid "delete record" msgstr "" -#: src/namestore/gnunet-namestore.c:1272 +#: src/namestore/gnunet-namestore.c:1267 msgid "display records" msgstr "" -#: src/namestore/gnunet-namestore.c:1277 +#: src/namestore/gnunet-namestore.c:1272 msgid "" "expiration time for record to use (for adding only), \"never\" is possible" msgstr "" -#: src/namestore/gnunet-namestore.c:1282 +#: src/namestore/gnunet-namestore.c:1277 #, fuzzy msgid "set the desired nick name for the zone" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/namestore/gnunet-namestore.c:1286 +#: src/namestore/gnunet-namestore.c:1281 #, fuzzy msgid "monitor changes in the namestore" msgstr "初始化“%s”服务失败。\n" -#: src/namestore/gnunet-namestore.c:1296 +#: src/namestore/gnunet-namestore.c:1291 #, fuzzy msgid "determine our name for the given PKEY" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/namestore/gnunet-namestore.c:1301 +#: src/namestore/gnunet-namestore.c:1296 msgid "type of the record to add/delete/display" msgstr "" -#: src/namestore/gnunet-namestore.c:1306 +#: src/namestore/gnunet-namestore.c:1301 msgid "URI to import into our zone" msgstr "" -#: src/namestore/gnunet-namestore.c:1311 +#: src/namestore/gnunet-namestore.c:1306 msgid "value of the record to add/delete" msgstr "" -#: src/namestore/gnunet-namestore.c:1315 +#: src/namestore/gnunet-namestore.c:1310 msgid "create or list public record" msgstr "" -#: src/namestore/gnunet-namestore.c:1319 +#: src/namestore/gnunet-namestore.c:1314 msgid "" "create shadow record (only valid if all other records of the same type have " "expired" msgstr "" -#: src/namestore/gnunet-namestore.c:1324 +#: src/namestore/gnunet-namestore.c:1319 msgid "name of the ego controlling the zone" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:520 +#: src/namestore/gnunet-namestore-fcfsd.c:515 #, fuzzy, c-format msgid "Unsupported form value `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/namestore/gnunet-namestore-fcfsd.c:547 +#: src/namestore/gnunet-namestore-fcfsd.c:542 #, fuzzy, c-format msgid "Failed to create record for domain `%s': %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/namestore/gnunet-namestore-fcfsd.c:567 +#: src/namestore/gnunet-namestore-fcfsd.c:562 msgid "Error when mapping zone to name\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:598 +#: src/namestore/gnunet-namestore-fcfsd.c:593 #, c-format msgid "Found existing name `%s' for the given key\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:678 +#: src/namestore/gnunet-namestore-fcfsd.c:673 #, c-format msgid "Found %u existing records for domain `%s'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:736 +#: src/namestore/gnunet-namestore-fcfsd.c:731 #, fuzzy, c-format msgid "Failed to create page for `%s'\n" msgstr "发送消息失败。\n" -#: src/namestore/gnunet-namestore-fcfsd.c:754 +#: src/namestore/gnunet-namestore-fcfsd.c:749 #, fuzzy, c-format msgid "Failed to setup post processor for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/namestore/gnunet-namestore-fcfsd.c:790 +#: src/namestore/gnunet-namestore-fcfsd.c:785 msgid "Domain name must not contain `.'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:799 +#: src/namestore/gnunet-namestore-fcfsd.c:794 msgid "Domain name must not contain `+'\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1019 +#: src/namestore/gnunet-namestore-fcfsd.c:1014 msgid "No ego configured for `fcfsd` subsystem\n" msgstr "" -#: src/namestore/gnunet-namestore-fcfsd.c:1045 +#: src/namestore/gnunet-namestore-fcfsd.c:1040 #, fuzzy msgid "Failed to start HTTP server\n" msgstr "初始化“%s”服务失败。\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1092 +#: src/namestore/gnunet-namestore-fcfsd.c:1087 #, fuzzy msgid "Failed to connect to identity\n" msgstr "初始化“%s”服务失败。\n" -#: src/namestore/gnunet-namestore-fcfsd.c:1130 +#: src/namestore/gnunet-namestore-fcfsd.c:1125 msgid "GNU Name System First Come First Serve name registration service" msgstr "" -#: src/namestore/gnunet-service-namestore.c:750 +#: src/namestore/gnunet-service-namestore.c:745 #, fuzzy, c-format msgid "Failed to replicate block in namecache: %s\n" msgstr "发送消息失败。\n" -#: src/namestore/gnunet-zoneimport.c:2035 +#: src/namestore/gnunet-zoneimport.c:2030 msgid "size to use for the main hash map" msgstr "" -#: src/namestore/gnunet-zoneimport.c:2040 +#: src/namestore/gnunet-zoneimport.c:2035 msgid "minimum expiration time we assume for imported records" msgstr "" -#: src/namestore/namestore_api.c:391 +#: src/namestore/namestore_api.c:386 msgid "Namestore failed to store record\n" msgstr "" -#: src/namestore/plugin_namestore_flat.c:767 +#: src/namestore/plugin_namestore_flat.c:762 #, fuzzy msgid "flat file database running\n" msgstr "sqlite 数据仓库" -#: src/namestore/plugin_namestore_sqlite.c:218 -#: src/namestore/plugin_namestore_sqlite.c:229 +#: src/namestore/plugin_namestore_sqlite.c:213 +#: src/namestore/plugin_namestore_sqlite.c:224 #, fuzzy, c-format msgid "Failed to setup database at `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/namestore/plugin_rest_namestore.c:1206 +#: src/namestore/plugin_rest_namestore.c:1201 msgid "Namestore REST API initialized\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:193 +#: src/nat-auto/gnunet-nat-auto.c:188 #, fuzzy msgid "Suggested configuration changes:\n" msgstr "" "\n" "您的配置更改没有保存。\n" -#: src/nat-auto/gnunet-nat-auto.c:219 +#: src/nat-auto/gnunet-nat-auto.c:214 #, fuzzy, c-format msgid "Failed to write configuration to `%s'\n" msgstr "保存配置失败。" -#: src/nat-auto/gnunet-nat-auto.c:226 +#: src/nat-auto/gnunet-nat-auto.c:221 #, fuzzy, c-format msgid "Wrote updated configuration to `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/nat-auto/gnunet-nat-auto.c:345 +#: src/nat-auto/gnunet-nat-auto.c:340 #, fuzzy msgid "run autoconfiguration" msgstr "配额配置" -#: src/nat-auto/gnunet-nat-auto.c:351 +#: src/nat-auto/gnunet-nat-auto.c:346 msgid "section name providing the configuration for the adapter" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 +#: src/nat-auto/gnunet-nat-auto.c:351 src/nat/gnunet-nat.c:448 msgid "use TCP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458 +#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453 msgid "use UDP" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:366 +#: src/nat-auto/gnunet-nat-auto.c:361 msgid "write configuration file (for autoconfiguration)" msgstr "" -#: src/nat-auto/gnunet-nat-auto.c:378 +#: src/nat-auto/gnunet-nat-auto.c:373 #, fuzzy msgid "GNUnet NAT traversal autoconfiguration" msgstr "GNUnet 配置" -#: src/nat-auto/gnunet-nat-auto_legacy.c:403 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:681 -#: src/nat-auto/nat_auto_api_test.c:405 +#: src/nat-auto/gnunet-nat-auto_legacy.c:398 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:676 +#: src/nat-auto/nat_auto_api_test.c:400 msgid "Failed to connect to `gnunet-nat-server'\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:518 +#: src/nat-auto/gnunet-nat-auto_legacy.c:513 #, c-format msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n" msgstr "" -#: src/nat-auto/gnunet-nat-auto_legacy.c:568 -#: src/nat-auto/nat_auto_api_test.c:571 +#: src/nat-auto/gnunet-nat-auto_legacy.c:563 +#: src/nat-auto/nat_auto_api_test.c:566 #, fuzzy msgid "NAT test failed to start NAT library\n" msgstr "初始化“%s”服务失败。\n" -#: src/nat-auto/gnunet-service-nat-auto.c:342 +#: src/nat-auto/gnunet-service-nat-auto.c:337 msgid "UPnP client `upnpc` command not found, disabling UPnP\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:385 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:380 msgid "NAT traversal with ICMP Server succeeded.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:386 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:381 msgid "NAT traversal with ICMP Server failed.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:405 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:400 msgid "Testing connection reversal with ICMP server.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:437 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:432 #, c-format msgid "Detected external IP `%s'\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:572 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:567 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:590 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:585 #, fuzzy, c-format msgid "Detected internal network address `%s'.\n" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:724 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:719 msgid "upnpc found, enabling its use\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:725 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:720 msgid "upnpc not found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:762 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:757 msgid "test_icmp_server not possible, as we have no public IPv4 address\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:774 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:834 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:769 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:829 msgid "test_icmp_server not possible, as we are not behind NAT\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:786 -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:846 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:781 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:841 msgid "No working gnunet-helper-nat-server found\n" msgstr "" -#: src/nat-auto/gnunet-service-nat-auto_legacy.c:823 +#: src/nat-auto/gnunet-service-nat-auto_legacy.c:818 msgid "test_icmp_client not possible, as we have no internal IPv4 address\n" msgstr "" -#: src/nat-auto/nat_auto_api.c:76 +#: src/nat-auto/nat_auto_api.c:71 msgid "Operation Successful" msgstr "" -#: src/nat-auto/nat_auto_api.c:78 +#: src/nat-auto/nat_auto_api.c:73 msgid "IPC failure" msgstr "" -#: src/nat-auto/nat_auto_api.c:80 +#: src/nat-auto/nat_auto_api.c:75 msgid "Failure in network subsystem, check permissions." msgstr "" -#: src/nat-auto/nat_auto_api.c:82 +#: src/nat-auto/nat_auto_api.c:77 msgid "Encountered timeout while performing operation" msgstr "" -#: src/nat-auto/nat_auto_api.c:84 +#: src/nat-auto/nat_auto_api.c:79 msgid "detected that we are offline" msgstr "" -#: src/nat-auto/nat_auto_api.c:86 +#: src/nat-auto/nat_auto_api.c:81 msgid "`upnpc` command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:88 +#: src/nat-auto/nat_auto_api.c:83 #, fuzzy msgid "Failed to run `upnpc` command" msgstr "运行 %s失败：%s %d\n" -#: src/nat-auto/nat_auto_api.c:90 +#: src/nat-auto/nat_auto_api.c:85 msgid "`upnpc' command took too long, process killed" msgstr "" -#: src/nat-auto/nat_auto_api.c:92 +#: src/nat-auto/nat_auto_api.c:87 msgid "`upnpc' command failed to establish port mapping" msgstr "" -#: src/nat-auto/nat_auto_api.c:94 +#: src/nat-auto/nat_auto_api.c:89 msgid "`external-ip' command not found" msgstr "" -#: src/nat-auto/nat_auto_api.c:96 +#: src/nat-auto/nat_auto_api.c:91 #, fuzzy msgid "Failed to run `external-ip` command" msgstr "运行 %s失败：%s %d\n" -#: src/nat-auto/nat_auto_api.c:98 +#: src/nat-auto/nat_auto_api.c:93 msgid "`external-ip' command output invalid" msgstr "" -#: src/nat-auto/nat_auto_api.c:100 +#: src/nat-auto/nat_auto_api.c:95 msgid "no valid address was returned by `external-ip'" msgstr "" -#: src/nat-auto/nat_auto_api.c:102 +#: src/nat-auto/nat_auto_api.c:97 #, fuzzy msgid "Could not determine interface with internal/local network address" msgstr "无法确定用户界面定义文件。" -#: src/nat-auto/nat_auto_api.c:104 +#: src/nat-auto/nat_auto_api.c:99 msgid "No functioning gnunet-helper-nat-server installation found" msgstr "" -#: src/nat-auto/nat_auto_api.c:106 +#: src/nat-auto/nat_auto_api.c:101 msgid "NAT test could not be initialized" msgstr "" -#: src/nat-auto/nat_auto_api.c:108 +#: src/nat-auto/nat_auto_api.c:103 msgid "NAT test timeout reached" msgstr "" -#: src/nat-auto/nat_auto_api.c:110 +#: src/nat-auto/nat_auto_api.c:105 msgid "could not register NAT" msgstr "" -#: src/nat-auto/nat_auto_api.c:112 +#: src/nat-auto/nat_auto_api.c:107 msgid "No working gnunet-helper-nat-client installation found" msgstr "" -#: src/nat-auto/nat_auto_api_test.c:477 +#: src/nat-auto/nat_auto_api_test.c:472 #, fuzzy, c-format msgid "Failed to find valid PORT in section `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/nat-auto/nat_auto_api_test.c:522 +#: src/nat-auto/nat_auto_api_test.c:517 #, fuzzy, c-format msgid "Failed to create socket bound to `%s' for NAT test: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/nat/gnunet-nat.c:431 +#: src/nat/gnunet-nat.c:426 msgid "which IP and port are we locally using to bind/listen to" msgstr "" -#: src/nat/gnunet-nat.c:437 +#: src/nat/gnunet-nat.c:432 msgid "which remote IP and port should be asked for connection reversal" msgstr "" -#: src/nat/gnunet-nat.c:443 +#: src/nat/gnunet-nat.c:438 msgid "" "name of configuration section to find additional options, such as manual " "host punching data" msgstr "" -#: src/nat/gnunet-nat.c:448 +#: src/nat/gnunet-nat.c:443 msgid "enable STUN processing" msgstr "" -#: src/nat/gnunet-nat.c:463 +#: src/nat/gnunet-nat.c:458 msgid "watch for connection reversal requests" msgstr "" -#: src/nat/gnunet-nat.c:475 +#: src/nat/gnunet-nat.c:470 msgid "GNUnet NAT traversal autoconfigure daemon" msgstr "" -#: src/nat/gnunet-service-nat.c:1339 +#: src/nat/gnunet-service-nat.c:1334 #, c-format msgid "Malformed punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1349 +#: src/nat/gnunet-service-nat.c:1344 #, c-format msgid "Invalid port number in punched hole specification `%s' (lacks port)\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1365 +#: src/nat/gnunet-service-nat.c:1360 #, c-format msgid "Malformed punched hole specification `%s' (lacks `]')\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1376 +#: src/nat/gnunet-service-nat.c:1371 #, c-format msgid "Malformed punched hole specification `%s' (IPv6 address invalid)" msgstr "" -#: src/nat/gnunet-service-nat.c:1841 +#: src/nat/gnunet-service-nat.c:1836 msgid "Connection reversal request failed\n" msgstr "" -#: src/nat/gnunet-service-nat.c:1914 +#: src/nat/gnunet-service-nat.c:1909 msgid "" "UPnP enabled in configuration, but UPnP client `upnpc` command not found, " "disabling UPnP\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:186 +#: src/nat/gnunet-service-nat_helper.c:181 #, c-format msgid "gnunet-helper-nat-server generated malformed address `%s'\n" msgstr "" -#: src/nat/gnunet-service-nat_helper.c:273 +#: src/nat/gnunet-service-nat_helper.c:268 #, fuzzy, c-format msgid "Failed to start %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/nat/gnunet-service-nat_mini.c:196 +#: src/nat/gnunet-service-nat_mini.c:191 msgid "`external-ip' command not found\n" msgstr "" -#: src/nat/gnunet-service-nat_mini.c:656 +#: src/nat/gnunet-service-nat_mini.c:651 msgid "`upnpc' command not found\n" msgstr "" -#: src/nse/gnunet-nse.c:122 +#: src/nse/gnunet-nse.c:117 msgid "Show network size estimates from NSE service." msgstr "" -#: src/nse/gnunet-nse-profiler.c:849 +#: src/nse/gnunet-nse-profiler.c:844 msgid "limit to the number of connections to NSE services, 0 for none" msgstr "" -#: src/nse/gnunet-nse-profiler.c:854 +#: src/nse/gnunet-nse-profiler.c:849 msgid "name of the file for writing connection information and statistics" msgstr "" -#: src/nse/gnunet-nse-profiler.c:866 +#: src/nse/gnunet-nse-profiler.c:861 msgid "name of the file for writing the main results" msgstr "" -#: src/nse/gnunet-nse-profiler.c:873 +#: src/nse/gnunet-nse-profiler.c:868 msgid "Number of peers to run in each round, separated by commas" msgstr "" -#: src/nse/gnunet-nse-profiler.c:884 +#: src/nse/gnunet-nse-profiler.c:879 msgid "delay between rounds" msgstr "" -#: src/nse/gnunet-nse-profiler.c:893 +#: src/nse/gnunet-nse-profiler.c:888 #, fuzzy msgid "Measure quality and performance of the NSE service." msgstr "无法访问该服务" -#: src/nse/gnunet-service-nse.c:1534 -#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276 +#: src/nse/gnunet-service-nse.c:1529 +#: src/revocation/gnunet-service-revocation.c:838 src/util/gnunet-scrypt.c:271 #, fuzzy msgid "Value is too large.\n" msgstr "值不在合法范围内。" -#: src/peerinfo/gnunet-service-peerinfo.c:178 +#: src/peerinfo/gnunet-service-peerinfo.c:173 #, c-format msgid "Removing expired address of transport `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:313 +#: src/peerinfo/gnunet-service-peerinfo.c:308 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s': %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo/gnunet-service-peerinfo.c:334 -#: src/peerinfo/gnunet-service-peerinfo.c:365 +#: src/peerinfo/gnunet-service-peerinfo.c:329 +#: src/peerinfo/gnunet-service-peerinfo.c:360 #, fuzzy, c-format msgid "Failed to parse HELLO in file `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo/gnunet-service-peerinfo.c:449 +#: src/peerinfo/gnunet-service-peerinfo.c:444 msgid "# peers known" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:492 +#: src/peerinfo/gnunet-service-peerinfo.c:487 #, c-format msgid "" "File `%s' in directory `%s' does not match naming convention. Removed.\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:659 +#: src/peerinfo/gnunet-service-peerinfo.c:654 #, fuzzy, c-format msgid "Scanning directory `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo/gnunet-service-peerinfo.c:667 +#: src/peerinfo/gnunet-service-peerinfo.c:662 #, c-format msgid "Still no peers found in `%s'!\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1100 +#: src/peerinfo/gnunet-service-peerinfo.c:1095 #, fuzzy, c-format msgid "Cleaning up directory `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo/gnunet-service-peerinfo.c:1438 +#: src/peerinfo/gnunet-service-peerinfo.c:1433 #, c-format msgid "Importing HELLOs from `%s'\n" msgstr "" -#: src/peerinfo/gnunet-service-peerinfo.c:1451 +#: src/peerinfo/gnunet-service-peerinfo.c:1446 msgid "Skipping import of included HELLOs\n" msgstr "" -#: src/peerinfo/peerinfo_api.c:220 +#: src/peerinfo/peerinfo_api.c:215 msgid "Failed to receive response from `PEERINFO' service." msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:239 +#: src/peerinfo-tool/gnunet-peerinfo.c:234 #, fuzzy, c-format msgid "%sPeer `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:246 +#: src/peerinfo-tool/gnunet-peerinfo.c:241 #, c-format msgid "\tExpires: %s \t %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:299 +#: src/peerinfo-tool/gnunet-peerinfo.c:294 #, fuzzy, c-format msgid "Failure: Cannot convert address to string for peer `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:466 +#: src/peerinfo-tool/gnunet-peerinfo.c:461 #, c-format msgid "Failure: Received invalid %s\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:480 +#: src/peerinfo-tool/gnunet-peerinfo.c:475 #, fuzzy, c-format msgid "Failed to write HELLO with %u bytes to file `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerinfo-tool/gnunet-peerinfo.c:499 +#: src/peerinfo-tool/gnunet-peerinfo.c:494 #, c-format msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:799 +#: src/peerinfo-tool/gnunet-peerinfo.c:794 #, c-format msgid "I am peer `%s'.\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:843 +#: src/peerinfo-tool/gnunet-peerinfo.c:838 msgid "don't resolve host names" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:848 +#: src/peerinfo-tool/gnunet-peerinfo.c:843 msgid "output only the identity strings" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:852 +#: src/peerinfo-tool/gnunet-peerinfo.c:847 msgid "include friend-only information" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:857 +#: src/peerinfo-tool/gnunet-peerinfo.c:852 msgid "output our own identity only" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:862 +#: src/peerinfo-tool/gnunet-peerinfo.c:857 #, fuzzy msgid "list all known peers" msgstr "列出所有网络适配器" -#: src/peerinfo-tool/gnunet-peerinfo.c:868 +#: src/peerinfo-tool/gnunet-peerinfo.c:863 msgid "dump hello to file" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:873 +#: src/peerinfo-tool/gnunet-peerinfo.c:868 msgid "also output HELLO uri(s)" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:879 +#: src/peerinfo-tool/gnunet-peerinfo.c:874 msgid "add given HELLO uri to the database" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo.c:897 +#: src/peerinfo-tool/gnunet-peerinfo.c:892 #, fuzzy msgid "Print information about peers." msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105 -#: src/transport/gnunet-service-transport_plugins.c:168 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:100 +#: src/transport/gnunet-service-transport_plugins.c:163 #, c-format msgid "Starting transport plugins `%s'\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109 -#: src/transport/gnunet-service-transport_plugins.c:173 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:104 +#: src/transport/gnunet-service-transport_plugins.c:168 #, c-format msgid "Loading `%s' transport plugin\n" msgstr "" -#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129 -#: src/transport/gnunet-service-transport_plugins.c:208 +#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:124 +#: src/transport/gnunet-service-transport_plugins.c:203 #, fuzzy, c-format msgid "Failed to load transport plugin for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/peerstore/gnunet-peerstore.c:91 +#: src/peerstore/gnunet-peerstore.c:86 msgid "peerstore" msgstr "" -#: src/peerstore/gnunet-service-peerstore.c:598 +#: src/peerstore/gnunet-service-peerstore.c:593 #, fuzzy, c-format msgid "Could not load database backend `%s'\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/peerstore/peerstore_api.c:350 +#: src/peerstore/peerstore_api.c:345 msgid "timeout" msgstr "" -#: src/peerstore/peerstore_api.c:566 src/peerstore/peerstore_api.c:615 +#: src/peerstore/peerstore_api.c:561 src/peerstore/peerstore_api.c:610 #, fuzzy msgid "Unexpected iteration response, this should not happen.\n" msgstr "输出格式未知，不应出现这种情况。\n" -#: src/peerstore/peerstore_api.c:629 +#: src/peerstore/peerstore_api.c:624 #, fuzzy msgid "Received a malformed response from service." msgstr "“%s”的参数无效。\n" -#: src/peerstore/peerstore_api.c:778 +#: src/peerstore/peerstore_api.c:773 msgid "Received a watch result for a non existing watch.\n" msgstr "" -#: src/peerstore/plugin_peerstore_sqlite.c:453 -#: src/psycstore/plugin_psycstore_sqlite.c:282 +#: src/peerstore/plugin_peerstore_sqlite.c:448 +#: src/psycstore/plugin_psycstore_sqlite.c:277 #, fuzzy, c-format msgid "" "Error executing SQL query: %s\n" " %s\n" msgstr "创建用户出错" -#: src/peerstore/plugin_peerstore_sqlite.c:488 -#: src/psycstore/plugin_psycstore_mysql.c:250 -#: src/psycstore/plugin_psycstore_sqlite.c:259 +#: src/peerstore/plugin_peerstore_sqlite.c:483 +#: src/psycstore/plugin_psycstore_mysql.c:245 +#: src/psycstore/plugin_psycstore_sqlite.c:254 #, fuzzy, c-format msgid "" "Error preparing SQL query: %s\n" " %s\n" msgstr "创建用户出错" -#: src/peerstore/plugin_peerstore_sqlite.c:570 +#: src/peerstore/plugin_peerstore_sqlite.c:565 #, fuzzy, c-format msgid "Unable to create indices: %s.\n" msgstr "发送消息失败。\n" -#: src/pq/pq_prepare.c:80 +#: src/pq/pq_prepare.c:79 #, fuzzy, c-format msgid "PQprepare (`%s' as `%s') failed with error: %s\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/psycstore/gnunet-service-psycstore.c:249 +#: src/psycstore/gnunet-service-psycstore.c:244 #, fuzzy msgid "Failed to store membership information!\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/psycstore/gnunet-service-psycstore.c:271 +#: src/psycstore/gnunet-service-psycstore.c:266 #, fuzzy msgid "Failed to test membership!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:300 +#: src/psycstore/gnunet-service-psycstore.c:295 #, fuzzy msgid "Dropping invalid fragment\n" msgstr "“%s”的参数无效。\n" -#: src/psycstore/gnunet-service-psycstore.c:311 +#: src/psycstore/gnunet-service-psycstore.c:306 #, fuzzy msgid "Failed to store fragment\n" msgstr "运行 %s失败：%s %d\n" -#: src/psycstore/gnunet-service-psycstore.c:368 +#: src/psycstore/gnunet-service-psycstore.c:363 #, fuzzy msgid "Failed to get fragment!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:434 +#: src/psycstore/gnunet-service-psycstore.c:429 #, fuzzy msgid "Failed to get message!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:464 +#: src/psycstore/gnunet-service-psycstore.c:459 #, fuzzy msgid "Failed to get message fragment!\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/psycstore/gnunet-service-psycstore.c:494 +#: src/psycstore/gnunet-service-psycstore.c:489 #, fuzzy msgid "Failed to get master counters!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:675 +#: src/psycstore/gnunet-service-psycstore.c:670 #, fuzzy, c-format msgid "Failed to begin modifying state: %d\n" msgstr "运行 %s失败：%s %d\n" -#: src/psycstore/gnunet-service-psycstore.c:685 +#: src/psycstore/gnunet-service-psycstore.c:680 #, fuzzy, c-format msgid "Failed to modify state: %d\n" msgstr "运行 %s失败：%s %d\n" -#: src/psycstore/gnunet-service-psycstore.c:693 +#: src/psycstore/gnunet-service-psycstore.c:688 #, fuzzy msgid "Failed to end modifying state!\n" msgstr "运行 %s失败：%s %d\n" -#: src/psycstore/gnunet-service-psycstore.c:730 +#: src/psycstore/gnunet-service-psycstore.c:725 msgid "Tried to set invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:744 +#: src/psycstore/gnunet-service-psycstore.c:739 #, fuzzy msgid "Failed to begin synchronizing state!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:761 +#: src/psycstore/gnunet-service-psycstore.c:756 #, fuzzy msgid "Failed to end synchronizing state!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:779 -#: src/psycstore/gnunet-service-psycstore.c:795 +#: src/psycstore/gnunet-service-psycstore.c:774 +#: src/psycstore/gnunet-service-psycstore.c:790 #, fuzzy msgid "Failed to reset state!\n" msgstr "发送消息失败。\n" -#: src/psycstore/gnunet-service-psycstore.c:824 -#: src/psycstore/gnunet-service-psycstore.c:881 +#: src/psycstore/gnunet-service-psycstore.c:819 +#: src/psycstore/gnunet-service-psycstore.c:876 msgid "Tried to get invalid state variable name!\n" msgstr "" -#: src/psycstore/gnunet-service-psycstore.c:851 -#: src/psycstore/gnunet-service-psycstore.c:896 +#: src/psycstore/gnunet-service-psycstore.c:846 +#: src/psycstore/gnunet-service-psycstore.c:891 #, fuzzy msgid "Failed to get state variable!\n" msgstr "发送消息失败。\n" -#: src/psycstore/plugin_psycstore_mysql.c:281 +#: src/psycstore/plugin_psycstore_mysql.c:276 #, fuzzy msgid "Unable to initialize Mysql.\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/psycstore/plugin_psycstore_mysql.c:291 +#: src/psycstore/plugin_psycstore_mysql.c:286 #, fuzzy, c-format msgid "Failed to run SQL statement `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/psycstore/plugin_psycstore_sqlite.c:61 +#: src/psycstore/plugin_psycstore_sqlite.c:56 #, fuzzy, c-format msgid "`%s' failed at %s:%d with error: %s (%d)\n" msgstr "“%s”于 %s:%d 处失败，错误为：%s\n" -#: src/psycstore/plugin_psycstore_sqlite.c:1924 +#: src/psycstore/plugin_psycstore_sqlite.c:1919 #, fuzzy msgid "SQLite database running\n" msgstr "sqlite 数据仓库" -#: src/pt/gnunet-daemon-pt.c:423 +#: src/pt/gnunet-daemon-pt.c:418 msgid "Failed to pack DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:429 +#: src/pt/gnunet-daemon-pt.c:424 msgid "# DNS requests mapped to VPN" msgstr "" -#: src/pt/gnunet-daemon-pt.c:483 +#: src/pt/gnunet-daemon-pt.c:478 msgid "# DNS records modified" msgstr "" -#: src/pt/gnunet-daemon-pt.c:667 +#: src/pt/gnunet-daemon-pt.c:662 msgid "# DNS replies intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:674 +#: src/pt/gnunet-daemon-pt.c:669 msgid "Failed to parse DNS request. Dropping.\n" msgstr "" -#: src/pt/gnunet-daemon-pt.c:712 +#: src/pt/gnunet-daemon-pt.c:707 msgid "# DNS requests dropped (timeout)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:768 +#: src/pt/gnunet-daemon-pt.c:763 msgid "# DNS requests intercepted" msgstr "" -#: src/pt/gnunet-daemon-pt.c:773 +#: src/pt/gnunet-daemon-pt.c:768 msgid "# DNS requests dropped (DNS cadet channel down)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:781 +#: src/pt/gnunet-daemon-pt.c:776 msgid "# DNS requests dropped (malformed)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:876 +#: src/pt/gnunet-daemon-pt.c:871 msgid "# DNS replies received" msgstr "" -#: src/pt/gnunet-daemon-pt.c:893 +#: src/pt/gnunet-daemon-pt.c:888 msgid "# DNS replies dropped (too late?)" msgstr "" -#: src/pt/gnunet-daemon-pt.c:1219 src/pt/gnunet-daemon-pt.c:1228 -#: src/pt/gnunet-daemon-pt.c:1244 src/pt/gnunet-daemon-pt.c:1253 -#: src/pt/gnunet-daemon-pt.c:1262 +#: src/pt/gnunet-daemon-pt.c:1214 src/pt/gnunet-daemon-pt.c:1223 +#: src/pt/gnunet-daemon-pt.c:1239 src/pt/gnunet-daemon-pt.c:1248 +#: src/pt/gnunet-daemon-pt.c:1257 #, fuzzy, c-format msgid "Failed to connect to %s service. Exiting.\n" msgstr "初始化“%s”服务失败。\n" -#: src/pt/gnunet-daemon-pt.c:1307 +#: src/pt/gnunet-daemon-pt.c:1302 msgid "Daemon to run to perform IP protocol translation to GNUnet" msgstr "" -#: src/regex/gnunet-daemon-regexprofiler.c:267 +#: src/regex/gnunet-daemon-regexprofiler.c:262 #, fuzzy, c-format msgid "%s service is lacking key configuration settings (%s). Exiting.\n" msgstr "立即保存配置？" -#: src/regex/gnunet-daemon-regexprofiler.c:380 +#: src/regex/gnunet-daemon-regexprofiler.c:375 msgid "Daemon to announce regular expressions for the peer using cadet." msgstr "" -#: src/regex/gnunet-regex-profiler.c:1386 +#: src/regex/gnunet-regex-profiler.c:1381 msgid "No configuration file given. Exiting\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1427 -#: src/regex/gnunet-regex-simulation-profiler.c:630 +#: src/regex/gnunet-regex-profiler.c:1422 +#: src/regex/gnunet-regex-simulation-profiler.c:625 #, c-format msgid "No policy directory specified on command line. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1433 -#: src/regex/gnunet-regex-simulation-profiler.c:638 +#: src/regex/gnunet-regex-profiler.c:1428 +#: src/regex/gnunet-regex-simulation-profiler.c:633 #, c-format msgid "Specified policies directory does not exist. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1440 +#: src/regex/gnunet-regex-profiler.c:1435 #, fuzzy, c-format msgid "No files found in `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/regex/gnunet-regex-profiler.c:1449 +#: src/regex/gnunet-regex-profiler.c:1444 msgid "No search strings file given. Exiting.\n" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1469 +#: src/regex/gnunet-regex-profiler.c:1464 #, fuzzy msgid "Error loading search strings. Exiting.\n" msgstr "创建用户出错" -#: src/regex/gnunet-regex-profiler.c:1557 +#: src/regex/gnunet-regex-profiler.c:1552 #, fuzzy msgid "name of the file for writing statistics" msgstr "初始化“%s”服务失败。\n" -#: src/regex/gnunet-regex-profiler.c:1563 +#: src/regex/gnunet-regex-profiler.c:1558 msgid "wait TIMEOUT before ending the experiment" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1569 +#: src/regex/gnunet-regex-profiler.c:1564 msgid "directory with policy files" msgstr "" -#: src/regex/gnunet-regex-profiler.c:1576 +#: src/regex/gnunet-regex-profiler.c:1571 #, fuzzy msgid "name of file with input strings" msgstr "初始化“%s”服务失败。\n" -#: src/regex/gnunet-regex-profiler.c:1582 +#: src/regex/gnunet-regex-profiler.c:1577 #, fuzzy msgid "name of file with hosts' names" msgstr "初始化“%s”服务失败。\n" -#: src/regex/gnunet-regex-profiler.c:1595 +#: src/regex/gnunet-regex-profiler.c:1590 msgid "Profiler for regex" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:699 +#: src/regex/gnunet-regex-simulation-profiler.c:694 msgid "name of the table to write DFAs" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:705 +#: src/regex/gnunet-regex-simulation-profiler.c:700 msgid "maximum path compression length" msgstr "" -#: src/regex/gnunet-regex-simulation-profiler.c:719 +#: src/regex/gnunet-regex-simulation-profiler.c:714 msgid "Profiler for regex library" msgstr "" -#: src/regex/regex_api_announce.c:152 +#: src/regex/regex_api_announce.c:147 #, fuzzy, c-format msgid "Regex `%s' is too long!\n" msgstr "服务已删除。\n" -#: src/regex/regex_api_search.c:212 +#: src/regex/regex_api_search.c:207 #, fuzzy, c-format msgid "Search string `%s' is too long!\n" msgstr "服务已删除。\n" -#: src/rest/gnunet-rest-server.c:927 +#: src/rest/gnunet-rest-server.c:922 msgid "listen on specified port (default: 7776)" msgstr "" -#: src/rest/gnunet-rest-server.c:944 +#: src/rest/gnunet-rest-server.c:939 #, fuzzy msgid "GNUnet REST server" msgstr "GNUnet 错误日志" -#: src/revocation/gnunet-revocation.c:129 +#: src/revocation/gnunet-revocation.c:124 #, c-format msgid "Key `%s' is valid\n" msgstr "" -#: src/revocation/gnunet-revocation.c:134 +#: src/revocation/gnunet-revocation.c:129 #, fuzzy, c-format msgid "Key `%s' has been revoked\n" msgstr "服务已删除。\n" -#: src/revocation/gnunet-revocation.c:140 +#: src/revocation/gnunet-revocation.c:135 #, fuzzy msgid "Internal error\n" msgstr "未知错误。\n" -#: src/revocation/gnunet-revocation.c:166 +#: src/revocation/gnunet-revocation.c:161 #, c-format msgid "Key for ego `%s' is still valid, revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:171 +#: src/revocation/gnunet-revocation.c:166 msgid "Revocation failed (!)\n" msgstr "" -#: src/revocation/gnunet-revocation.c:176 +#: src/revocation/gnunet-revocation.c:171 #, c-format msgid "Key for ego `%s' has been successfully revoked\n" msgstr "" -#: src/revocation/gnunet-revocation.c:181 +#: src/revocation/gnunet-revocation.c:176 msgid "Revocation successful.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:186 +#: src/revocation/gnunet-revocation.c:181 msgid "Internal error, key revocation might have failed\n" msgstr "" -#: src/revocation/gnunet-revocation.c:323 +#: src/revocation/gnunet-revocation.c:318 #, c-format msgid "Revocation certificate for `%s' stored in `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:352 +#: src/revocation/gnunet-revocation.c:347 #, c-format msgid "Ego `%s' not found.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:373 +#: src/revocation/gnunet-revocation.c:368 #, c-format msgid "Error: revocation certificate in `%s' is not for `%s'\n" msgstr "" -#: src/revocation/gnunet-revocation.c:393 +#: src/revocation/gnunet-revocation.c:388 msgid "Revocation certificate ready\n" msgstr "" -#: src/revocation/gnunet-revocation.c:403 +#: src/revocation/gnunet-revocation.c:398 msgid "Revocation certificate not ready, calculating proof of work\n" msgstr "" -#: src/revocation/gnunet-revocation.c:437 src/social/gnunet-social.c:1180 +#: src/revocation/gnunet-revocation.c:432 src/social/gnunet-social.c:1175 #, fuzzy, c-format msgid "Public key `%s' malformed\n" msgstr "“%s”的参数无效。\n" -#: src/revocation/gnunet-revocation.c:450 +#: src/revocation/gnunet-revocation.c:445 msgid "" "Testing and revoking at the same time is not allowed, only executing test.\n" msgstr "" -#: src/revocation/gnunet-revocation.c:470 +#: src/revocation/gnunet-revocation.c:465 #, fuzzy msgid "No filename to store revocation certificate given.\n" msgstr "解析配置文件“%s”失败\n" -#: src/revocation/gnunet-revocation.c:491 +#: src/revocation/gnunet-revocation.c:486 #, fuzzy, c-format msgid "Failed to read revocation certificate from `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/revocation/gnunet-revocation.c:516 +#: src/revocation/gnunet-revocation.c:511 #, fuzzy msgid "No action specified. Nothing to do.\n" msgstr "没有指定接口，将使用默认。\n" -#: src/revocation/gnunet-revocation.c:535 +#: src/revocation/gnunet-revocation.c:530 msgid "use NAME for the name of the revocation file" msgstr "" -#: src/revocation/gnunet-revocation.c:541 +#: src/revocation/gnunet-revocation.c:536 msgid "" "revoke the private key associated for the the private key associated with " "the ego NAME " msgstr "" -#: src/revocation/gnunet-revocation.c:546 +#: src/revocation/gnunet-revocation.c:541 msgid "actually perform revocation, otherwise we just do the precomputation" msgstr "" -#: src/revocation/gnunet-revocation.c:552 +#: src/revocation/gnunet-revocation.c:547 msgid "test if the public key KEY has been revoked" msgstr "" -#: src/revocation/gnunet-service-revocation.c:459 +#: src/revocation/gnunet-service-revocation.c:454 msgid "# unsupported revocations received via set union" msgstr "" -#: src/revocation/gnunet-service-revocation.c:468 +#: src/revocation/gnunet-service-revocation.c:463 msgid "# revocation messages received via set union" msgstr "" -#: src/revocation/gnunet-service-revocation.c:473 +#: src/revocation/gnunet-service-revocation.c:468 #, c-format msgid "Error computing revocation set union with %s\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:477 +#: src/revocation/gnunet-service-revocation.c:472 #, fuzzy msgid "# revocation set unions failed" msgstr "" "\n" "按任意键继续\n" -#: src/revocation/gnunet-service-revocation.c:486 +#: src/revocation/gnunet-service-revocation.c:481 msgid "# revocation set unions completed" msgstr "" -#: src/revocation/gnunet-service-revocation.c:525 +#: src/revocation/gnunet-service-revocation.c:520 msgid "SET service crashed, terminating revocation service\n" msgstr "" -#: src/revocation/gnunet-service-revocation.c:867 +#: src/revocation/gnunet-service-revocation.c:862 #, fuzzy msgid "Could not open revocation database file!" msgstr "无法连接到 %s:%u：%s\n" -#: src/rps/gnunet-rps.c:203 +#: src/rps/gnunet-rps.c:198 msgid "Seed a PeerID" msgstr "" -#: src/rps/gnunet-rps.c:207 +#: src/rps/gnunet-rps.c:202 msgid "Get updates of view (0 for infinite updates)" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:220 +#: src/rps/gnunet-rps-profiler.c:2665 +#, fuzzy +msgid "Measure quality and performance of the RPS service." +msgstr "无法访问该服务" + +#: src/scalarproduct/gnunet-scalarproduct.c:215 #, fuzzy msgid "You must specify at least one message ID to check!\n" msgstr "您必须指定一个昵称\n" -#: src/scalarproduct/gnunet-scalarproduct.c:227 +#: src/scalarproduct/gnunet-scalarproduct.c:222 msgid "This program needs a session identifier for comparing vectors.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:240 +#: src/scalarproduct/gnunet-scalarproduct.c:235 #, c-format msgid "" "Tried to set initiator mode, as peer ID was given. However, `%s' is not a " "valid peer identifier.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:258 +#: src/scalarproduct/gnunet-scalarproduct.c:253 msgid "Need elements to compute the scalarproduct, got none.\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:280 +#: src/scalarproduct/gnunet-scalarproduct.c:275 #, fuzzy, c-format msgid "Malformed input, could not parse `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/scalarproduct/gnunet-scalarproduct.c:298 +#: src/scalarproduct/gnunet-scalarproduct.c:293 #, fuzzy, c-format msgid "Could not convert `%s' to int64_t.\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/scalarproduct/gnunet-scalarproduct.c:325 +#: src/scalarproduct/gnunet-scalarproduct.c:320 #, c-format msgid "Failed to initiate computation, were all keys unique?\n" msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:351 -#: src/scalarproduct/gnunet-scalarproduct.c:357 +#: src/scalarproduct/gnunet-scalarproduct.c:346 +#: src/scalarproduct/gnunet-scalarproduct.c:352 msgid "" "A comma separated list of elements to compare as vector with our remote peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:363 +#: src/scalarproduct/gnunet-scalarproduct.c:358 msgid "" "[Optional] peer to calculate our scalarproduct with. If this parameter is " "not given, the service will wait for a remote peer to compute the request." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:369 +#: src/scalarproduct/gnunet-scalarproduct.c:364 msgid "Transaction ID shared with peer." msgstr "" -#: src/scalarproduct/gnunet-scalarproduct.c:379 +#: src/scalarproduct/gnunet-scalarproduct.c:374 msgid "Calculate the Vectorproduct with a GNUnet peer." msgstr "" -#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401 -#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172 -#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063 +#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1396 +#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1340 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1167 +#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1058 #, fuzzy msgid "Connect to CADET failed\n" msgstr "“%s”已连接到“%s”。\n" -#: src/scalarproduct/scalarproduct_api.c:185 +#: src/scalarproduct/scalarproduct_api.c:180 msgid "Keys given to SCALARPRODUCT not unique!\n" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:616 +#: src/secretsharing/gnunet-secretsharing-profiler.c:611 msgid "dkg start delay" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:622 +#: src/secretsharing/gnunet-secretsharing-profiler.c:617 msgid "dkg timeout" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:628 +#: src/secretsharing/gnunet-secretsharing-profiler.c:623 msgid "threshold" msgstr "" -#: src/secretsharing/gnunet-secretsharing-profiler.c:633 +#: src/secretsharing/gnunet-secretsharing-profiler.c:628 msgid "also profile decryption" msgstr "" -#: src/set/gnunet-service-set.c:1989 +#: src/set/gnunet-service-set.c:1984 #, fuzzy msgid "Could not connect to CADET service\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/set/gnunet-set-ibf-profiler.c:252 +#: src/set/gnunet-set-ibf-profiler.c:247 #, fuzzy msgid "number of element in set A-B" msgstr "迭代次数" -#: src/set/gnunet-set-ibf-profiler.c:258 +#: src/set/gnunet-set-ibf-profiler.c:253 #, fuzzy msgid "number of element in set B-A" msgstr "迭代次数" -#: src/set/gnunet-set-ibf-profiler.c:264 +#: src/set/gnunet-set-ibf-profiler.c:259 msgid "number of common elements in A and B" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:270 +#: src/set/gnunet-set-ibf-profiler.c:265 msgid "hash num" msgstr "" -#: src/set/gnunet-set-ibf-profiler.c:276 +#: src/set/gnunet-set-ibf-profiler.c:271 msgid "ibf size" msgstr "" -#: src/set/gnunet-set-profiler.c:444 +#: src/set/gnunet-set-profiler.c:439 msgid "use byzantine mode" msgstr "" -#: src/set/gnunet-set-profiler.c:450 +#: src/set/gnunet-set-profiler.c:445 msgid "force sending full set" msgstr "" -#: src/set/gnunet-set-profiler.c:456 +#: src/set/gnunet-set-profiler.c:451 msgid "number delta operation" msgstr "" -#: src/set/gnunet-set-profiler.c:468 +#: src/set/gnunet-set-profiler.c:463 msgid "operation to execute" msgstr "" -#: src/set/gnunet-set-profiler.c:474 +#: src/set/gnunet-set-profiler.c:469 msgid "element size" msgstr "" -#: src/social/gnunet-social.c:1166 +#: src/social/gnunet-social.c:1161 #, fuzzy msgid "--place missing or invalid.\n" msgstr "“%s”的参数无效。\n" -#: src/social/gnunet-social.c:1217 +#: src/social/gnunet-social.c:1212 msgid "assign --name in state to --data" msgstr "" -#: src/social/gnunet-social.c:1222 +#: src/social/gnunet-social.c:1217 msgid "say good-bye and leave somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1227 +#: src/social/gnunet-social.c:1222 msgid "create a place" msgstr "" -#: src/social/gnunet-social.c:1232 +#: src/social/gnunet-social.c:1227 msgid "destroy a place we were hosting" msgstr "" -#: src/social/gnunet-social.c:1237 +#: src/social/gnunet-social.c:1232 msgid "enter somebody else's place" msgstr "" -#: src/social/gnunet-social.c:1243 +#: src/social/gnunet-social.c:1238 msgid "find state matching name prefix" msgstr "" -#: src/social/gnunet-social.c:1248 +#: src/social/gnunet-social.c:1243 msgid "replay history of messages up to the given --limit" msgstr "" -#: src/social/gnunet-social.c:1253 +#: src/social/gnunet-social.c:1248 msgid "reconnect to a previously created place" msgstr "" -#: src/social/gnunet-social.c:1258 +#: src/social/gnunet-social.c:1253 msgid "publish something to a place we are hosting" msgstr "" -#: src/social/gnunet-social.c:1263 +#: src/social/gnunet-social.c:1258 msgid "reconnect to a previously entered place" msgstr "" -#: src/social/gnunet-social.c:1268 +#: src/social/gnunet-social.c:1263 msgid "search for state matching exact name" msgstr "" -#: src/social/gnunet-social.c:1273 +#: src/social/gnunet-social.c:1268 msgid "submit something to somebody's place" msgstr "" -#: src/social/gnunet-social.c:1278 +#: src/social/gnunet-social.c:1273 msgid "list of egos and subscribed places" msgstr "" -#: src/social/gnunet-social.c:1283 +#: src/social/gnunet-social.c:1278 msgid "extract and replay history between message IDs --start and --until" msgstr "" -#: src/social/gnunet-social.c:1292 +#: src/social/gnunet-social.c:1287 msgid "application ID to use when connecting" msgstr "" -#: src/social/gnunet-social.c:1298 +#: src/social/gnunet-social.c:1293 msgid "message body or state value" msgstr "" -#: src/social/gnunet-social.c:1304 +#: src/social/gnunet-social.c:1299 #, fuzzy msgid "name or public key of ego" msgstr "“%s”的参数无效。\n" -#: src/social/gnunet-social.c:1309 +#: src/social/gnunet-social.c:1304 #, fuzzy msgid "wait for incoming messages" msgstr "发送消息失败。\n" -#: src/social/gnunet-social.c:1315 +#: src/social/gnunet-social.c:1310 msgid "GNS name" msgstr "" -#: src/social/gnunet-social.c:1321 +#: src/social/gnunet-social.c:1316 msgid "peer ID for --guest-enter" msgstr "" -#: src/social/gnunet-social.c:1327 +#: src/social/gnunet-social.c:1322 msgid "name (key) to query from state" msgstr "" -#: src/social/gnunet-social.c:1333 +#: src/social/gnunet-social.c:1328 msgid "method name" msgstr "" -#: src/social/gnunet-social.c:1339 +#: src/social/gnunet-social.c:1334 #, fuzzy msgid "number of messages to replay from history" msgstr "每次迭代所使用的消息数量" -#: src/social/gnunet-social.c:1345 +#: src/social/gnunet-social.c:1340 msgid "key address of place" msgstr "" -#: src/social/gnunet-social.c:1351 +#: src/social/gnunet-social.c:1346 msgid "start message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1356 +#: src/social/gnunet-social.c:1351 msgid "respond to entry requests by admitting all guests" msgstr "" -#: src/social/gnunet-social.c:1362 +#: src/social/gnunet-social.c:1357 msgid "end message ID for history replay" msgstr "" -#: src/social/gnunet-social.c:1367 +#: src/social/gnunet-social.c:1362 msgid "respond to entry requests by refusing all guests" msgstr "" -#: src/social/gnunet-social.c:1377 +#: src/social/gnunet-social.c:1372 msgid "" "gnunet-social - Interact with the social service: enter/leave, send/receive " "messages, access history and state.\n" msgstr "" -#: src/sq/sq.c:50 +#: src/sq/sq.c:49 #, c-format msgid "Failure to bind %u-th SQL parameter\n" msgstr "" -#: src/sq/sq.c:57 +#: src/sq/sq.c:56 msgid "Failure in sqlite3_reset (!)\n" msgstr "" -#: src/sq/sq.c:135 +#: src/sq/sq.c:134 #, fuzzy, c-format msgid "Failed to reset sqlite statement with error: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/statistics/gnunet-service-statistics.c:338 +#: src/statistics/gnunet-service-statistics.c:333 #, c-format msgid "Wrote %llu bytes of statistics to `%s'\n" msgstr "" -#: src/statistics/gnunet-service-statistics.c:1086 +#: src/statistics/gnunet-service-statistics.c:1081 #, c-format msgid "Loading %llu bytes of statistics from `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:158 +#: src/statistics/gnunet-statistics.c:153 #, fuzzy msgid "Failed to obtain statistics.\n" msgstr "初始化“%s”服务失败。\n" -#: src/statistics/gnunet-statistics.c:161 +#: src/statistics/gnunet-statistics.c:156 #, fuzzy, c-format msgid "Failed to obtain statistics from host `%s:%llu'\n" msgstr "初始化“%s”服务失败。\n" -#: src/statistics/gnunet-statistics.c:219 +#: src/statistics/gnunet-statistics.c:214 msgid "Missing argument: subsystem \n" msgstr "" -#: src/statistics/gnunet-statistics.c:227 +#: src/statistics/gnunet-statistics.c:222 msgid "Missing argument: name\n" msgstr "" -#: src/statistics/gnunet-statistics.c:270 +#: src/statistics/gnunet-statistics.c:265 #, c-format msgid "No subsystem or name given\n" msgstr "" -#: src/statistics/gnunet-statistics.c:285 +#: src/statistics/gnunet-statistics.c:280 #, fuzzy, c-format msgid "Failed to initialize watch routine\n" msgstr "初始化“%s”服务失败。\n" -#: src/statistics/gnunet-statistics.c:321 +#: src/statistics/gnunet-statistics.c:316 #, fuzzy, c-format msgid "Invalid argument `%s'\n" msgstr "“%s”的参数无效。\n" -#: src/statistics/gnunet-statistics.c:339 +#: src/statistics/gnunet-statistics.c:334 #, fuzzy, c-format msgid "A port is required to connect to host `%s'\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/statistics/gnunet-statistics.c:347 +#: src/statistics/gnunet-statistics.c:342 #, c-format msgid "A port has to be between 1 and 65535 to connect to host `%s'\n" msgstr "" -#: src/statistics/gnunet-statistics.c:385 +#: src/statistics/gnunet-statistics.c:380 msgid "limit output to statistics for the given NAME" msgstr "" -#: src/statistics/gnunet-statistics.c:390 +#: src/statistics/gnunet-statistics.c:385 msgid "make the value being set persistent" msgstr "" -#: src/statistics/gnunet-statistics.c:396 +#: src/statistics/gnunet-statistics.c:391 msgid "limit output to the given SUBSYSTEM" msgstr "" -#: src/statistics/gnunet-statistics.c:401 +#: src/statistics/gnunet-statistics.c:396 msgid "just print the statistics value" msgstr "" -#: src/statistics/gnunet-statistics.c:406 +#: src/statistics/gnunet-statistics.c:401 msgid "watch value continuously" msgstr "" -#: src/statistics/gnunet-statistics.c:412 +#: src/statistics/gnunet-statistics.c:407 msgid "connect to remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:417 +#: src/statistics/gnunet-statistics.c:412 msgid "port for remote host" msgstr "" -#: src/statistics/gnunet-statistics.c:433 +#: src/statistics/gnunet-statistics.c:428 msgid "Print statistics about GNUnet operations." msgstr "" -#: src/statistics/statistics_api.c:753 +#: src/statistics/statistics_api.c:748 #, fuzzy msgid "Could not save some persistent statistics\n" msgstr "初始化“%s”服务失败。\n" -#: src/testbed/generate-underlay-topology.c:225 +#: src/testbed/generate-underlay-topology.c:220 #, fuzzy msgid "Need at least 2 arguments\n" msgstr "您必须指定一个昵称\n" -#: src/testbed/generate-underlay-topology.c:230 +#: src/testbed/generate-underlay-topology.c:225 msgid "Database filename missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:237 +#: src/testbed/generate-underlay-topology.c:232 msgid "Topology string missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:242 +#: src/testbed/generate-underlay-topology.c:237 #, fuzzy, c-format msgid "Invalid topology: %s\n" msgstr "“%s”的参数无效。\n" -#: src/testbed/generate-underlay-topology.c:255 +#: src/testbed/generate-underlay-topology.c:250 #, c-format msgid "An argument is missing for given topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:261 +#: src/testbed/generate-underlay-topology.c:256 #, fuzzy, c-format msgid "Invalid argument `%s' given as topology argument\n" msgstr "“%s”的参数无效。\n" -#: src/testbed/generate-underlay-topology.c:269 +#: src/testbed/generate-underlay-topology.c:264 #, c-format msgid "Filename argument missing for topology `%s'\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:283 +#: src/testbed/generate-underlay-topology.c:278 #, c-format msgid "Second argument for topology `%s' is missing\n" msgstr "" -#: src/testbed/generate-underlay-topology.c:289 +#: src/testbed/generate-underlay-topology.c:284 #, fuzzy, c-format msgid "Invalid argument `%s'; expecting unsigned int\n" msgstr "“%s”的参数无效。\n" -#: src/testbed/generate-underlay-topology.c:342 -#: src/testbed/gnunet-testbed-profiler.c:283 +#: src/testbed/generate-underlay-topology.c:337 +#: src/testbed/gnunet-testbed-profiler.c:278 msgid "create COUNT number of peers" msgstr "" -#: src/testbed/generate-underlay-topology.c:352 +#: src/testbed/generate-underlay-topology.c:347 msgid "" "Generates SQLite3 database representing a given underlay topology.\n" "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n" @@ -6543,83 +6548,83 @@ msgid "" "content/topology-file-format\n" msgstr "" -#: src/testbed/gnunet-daemon-latency-logger.c:315 +#: src/testbed/gnunet-daemon-latency-logger.c:310 msgid "Daemon to log latency values of connections to neighbours" msgstr "" -#: src/testbed/gnunet-daemon-testbed-blacklist.c:249 +#: src/testbed/gnunet-daemon-testbed-blacklist.c:244 msgid "" "Daemon to restrict incoming transport layer connections during testbed " "deployments" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46 -#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312 +#: src/testbed/gnunet-daemon-testbed-underlay.c:228 src/testing/list-keys.c:46 +#: src/testing/testing.c:283 src/util/gnunet-ecc.c:307 #, c-format msgid "Incorrect hostkey file format: %s\n" msgstr "" -#: src/testbed/gnunet-daemon-testbed-underlay.c:471 +#: src/testbed/gnunet-daemon-testbed-underlay.c:466 msgid "Daemon to restrict underlay network in testbed deployments" msgstr "" -#: src/testbed/gnunet-service-testbed_cpustatus.c:728 +#: src/testbed/gnunet-service-testbed_cpustatus.c:723 #, c-format msgid "" "Cannot open %s for writing load statistics. Not logging load statistics\n" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1159 +#: src/testbed/gnunet-service-testbed_peers.c:1154 #, c-format msgid "%s is stopped" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1161 +#: src/testbed/gnunet-service-testbed_peers.c:1156 #, c-format msgid "%s is starting" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1163 +#: src/testbed/gnunet-service-testbed_peers.c:1158 #, c-format msgid "%s is stopping" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1165 +#: src/testbed/gnunet-service-testbed_peers.c:1160 #, c-format msgid "%s is starting already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1167 +#: src/testbed/gnunet-service-testbed_peers.c:1162 #, c-format msgid "%s is stopping already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1169 +#: src/testbed/gnunet-service-testbed_peers.c:1164 #, c-format msgid "%s is started already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1171 +#: src/testbed/gnunet-service-testbed_peers.c:1166 #, c-format msgid "%s is stopped already" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1173 +#: src/testbed/gnunet-service-testbed_peers.c:1168 #, fuzzy, c-format msgid "%s service is not known to ARM" msgstr "服务已删除。\n" -#: src/testbed/gnunet-service-testbed_peers.c:1175 +#: src/testbed/gnunet-service-testbed_peers.c:1170 #, fuzzy, c-format msgid "%s service failed to start" msgstr "运行 %s失败：%s %d\n" -#: src/testbed/gnunet-service-testbed_peers.c:1177 +#: src/testbed/gnunet-service-testbed_peers.c:1172 #, c-format msgid "%s service can't be started because ARM is shutting down" msgstr "" -#: src/testbed/gnunet-service-testbed_peers.c:1179 +#: src/testbed/gnunet-service-testbed_peers.c:1174 #, c-format msgid "%.s Unknown result code." msgstr "" @@ -6633,176 +6638,176 @@ msgstr "" msgid "Spawning process `%s'\n" msgstr "卸载 GNUnet 服务" -#: src/testbed/gnunet-testbed-profiler.c:289 +#: src/testbed/gnunet-testbed-profiler.c:284 msgid "tolerate COUNT number of continious timeout failures" msgstr "" -#: src/testbed/gnunet-testbed-profiler.c:294 +#: src/testbed/gnunet-testbed-profiler.c:289 msgid "" "run profiler in non-interactive mode where upon testbed setup the profiler " "does not wait for a keystroke but continues to run until a termination " "signal is received" msgstr "" -#: src/testbed/testbed_api.c:410 +#: src/testbed/testbed_api.c:405 #, fuzzy, c-format msgid "Adding host %u failed with error: %s\n" msgstr "“%s”以错误码 %d 失败：%s\n" -#: src/testbed/testbed_api_hosts.c:413 +#: src/testbed/testbed_api_hosts.c:408 #, c-format msgid "Hosts file %s not found\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:421 +#: src/testbed/testbed_api_hosts.c:416 #, c-format msgid "Hosts file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:428 +#: src/testbed/testbed_api_hosts.c:423 #, c-format msgid "Hosts file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_hosts.c:569 +#: src/testbed/testbed_api_hosts.c:564 #, c-format msgid "The function %s is only available when compiled with (--with-ll)\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:818 +#: src/testbed/testbed_api_testbed.c:813 msgid "Linking controllers failed. Exiting" msgstr "" -#: src/testbed/testbed_api_testbed.c:986 +#: src/testbed/testbed_api_testbed.c:981 #, c-format msgid "Host registration failed for a host. Error: %s\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1052 +#: src/testbed/testbed_api_testbed.c:1047 msgid "Controller crash detected. Shutting down.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1141 +#: src/testbed/testbed_api_testbed.c:1136 #, c-format msgid "Host %s cannot start testbed\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1145 +#: src/testbed/testbed_api_testbed.c:1140 msgid "Testbed cannot be started on localhost\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1183 +#: src/testbed/testbed_api_testbed.c:1178 msgid "Cannot start the master controller" msgstr "" -#: src/testbed/testbed_api_testbed.c:1201 +#: src/testbed/testbed_api_testbed.c:1196 msgid "Shutting down testbed due to timeout while setup.\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1261 +#: src/testbed/testbed_api_testbed.c:1256 msgid "No hosts loaded from LoadLeveler. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1273 +#: src/testbed/testbed_api_testbed.c:1268 msgid "No hosts loaded. Need at least one host\n" msgstr "" -#: src/testbed/testbed_api_testbed.c:1297 +#: src/testbed/testbed_api_testbed.c:1292 msgid "Specified topology must be supported by testbed" msgstr "" -#: src/testbed/testbed_api_testbed.c:1347 +#: src/testbed/testbed_api_testbed.c:1342 #, c-format msgid "" "Maximum number of edges a peer can have in a scale free topology cannot be " "more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_testbed.c:1363 +#: src/testbed/testbed_api_testbed.c:1358 #, c-format msgid "" "The number of edges that can established when adding a new node to scale " "free topology cannot be more than %u. Given `%s = %llu'" msgstr "" -#: src/testbed/testbed_api_topology.c:1028 +#: src/testbed/testbed_api_topology.c:1023 #, c-format msgid "Topology file %s not found\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1036 +#: src/testbed/testbed_api_topology.c:1031 #, c-format msgid "Topology file %s has no data\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1044 +#: src/testbed/testbed_api_topology.c:1039 #, c-format msgid "Topology file %s cannot be read\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1066 +#: src/testbed/testbed_api_topology.c:1061 #, fuzzy, c-format msgid "Failed to read peer index from toology file: %s" msgstr "解析配置文件“%s”失败\n" -#: src/testbed/testbed_api_topology.c:1075 -#: src/testbed/testbed_api_topology.c:1099 +#: src/testbed/testbed_api_topology.c:1070 +#: src/testbed/testbed_api_topology.c:1094 #, c-format msgid "Value in given topology file: %s out of range\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1081 -#: src/testbed/testbed_api_topology.c:1105 +#: src/testbed/testbed_api_topology.c:1076 +#: src/testbed/testbed_api_topology.c:1100 #, fuzzy, c-format msgid "Failed to read peer index from topology file: %s" msgstr "解析配置文件“%s”失败\n" -#: src/testbed/testbed_api_topology.c:1087 -#: src/testbed/testbed_api_topology.c:1111 +#: src/testbed/testbed_api_topology.c:1082 +#: src/testbed/testbed_api_topology.c:1106 msgid "Topology file needs more peers than given ones\n" msgstr "" -#: src/testbed/testbed_api_topology.c:1145 +#: src/testbed/testbed_api_topology.c:1140 #, fuzzy, c-format msgid "Ignoring to connect peer %u to peer %u\n" msgstr "无法连接到 %s:%u：%s\n" -#: src/testing/gnunet-testing.c:173 +#: src/testing/gnunet-testing.c:168 #, fuzzy, c-format msgid "Could not extract hostkey %u (offset too large?)\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/testing/gnunet-testing.c:253 +#: src/testing/gnunet-testing.c:248 #, c-format msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n" msgstr "" -#: src/testing/gnunet-testing.c:354 +#: src/testing/gnunet-testing.c:349 #, fuzzy msgid "create unique configuration files" msgstr "更改配置文件中的一个值" -#: src/testing/gnunet-testing.c:359 +#: src/testing/gnunet-testing.c:354 msgid "extract hostkey file from pre-computed hostkey list" msgstr "" -#: src/testing/gnunet-testing.c:365 +#: src/testing/gnunet-testing.c:360 #, fuzzy msgid "" "number of unique configuration files to create, or number of the hostkey to " "extract" msgstr "打印配置文件中的一个值到标准输出" -#: src/testing/gnunet-testing.c:372 +#: src/testing/gnunet-testing.c:367 #, fuzzy msgid "configuration template" msgstr "配置已保存" -#: src/testing/gnunet-testing.c:378 +#: src/testing/gnunet-testing.c:373 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)" msgstr "" -#: src/testing/gnunet-testing.c:391 +#: src/testing/gnunet-testing.c:386 msgid "Command line tool to access the testing library" msgstr "" @@ -6810,1493 +6815,1493 @@ msgstr "" msgid "list COUNT number of keys" msgstr "" -#: src/testing/testing.c:272 +#: src/testing/testing.c:267 #, c-format msgid "Hostkeys file not found: %s\n" msgstr "" -#: src/testing/testing.c:715 +#: src/testing/testing.c:710 #, c-format msgid "Key number %u does not exist\n" msgstr "" -#: src/testing/testing.c:1159 +#: src/testing/testing.c:1154 #, c-format msgid "" "You attempted to create a testbed with more than %u hosts. Please " "precompute more hostkeys first.\n" msgstr "" -#: src/testing/testing.c:1168 +#: src/testing/testing.c:1163 #, fuzzy, c-format msgid "Failed to initialize hostkey for peer %u\n" msgstr "初始化“%s”服务失败。\n" -#: src/testing/testing.c:1178 +#: src/testing/testing.c:1173 msgid "PRIVATE_KEY option in PEER section missing in configuration\n" msgstr "" -#: src/testing/testing.c:1191 +#: src/testing/testing.c:1186 #, fuzzy msgid "Failed to create configuration for peer (not enough free ports?)\n" msgstr "解析配置文件“%s”失败\n" -#: src/testing/testing.c:1205 +#: src/testing/testing.c:1200 #, fuzzy, c-format msgid "Cannot open hostkey file `%s': %s\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/testing/testing.c:1217 +#: src/testing/testing.c:1212 #, fuzzy, c-format msgid "Failed to write hostkey file for peer %u: %s\n" msgstr "发送消息失败。\n" -#: src/testing/testing.c:1242 +#: src/testing/testing.c:1237 #, fuzzy, c-format msgid "Failed to write configuration file `%s' for peer %u: %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/testing/testing.c:1344 +#: src/testing/testing.c:1339 #, fuzzy, c-format msgid "Failed to start `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/testing/testing.c:1647 +#: src/testing/testing.c:1642 #, fuzzy, c-format msgid "Failed to load configuration from %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/topology/friends.c:126 +#: src/topology/friends.c:121 #, fuzzy, c-format msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n" msgstr "配置文件“%s”第 %d 行有语法错误。\n" -#: src/topology/friends.c:180 +#: src/topology/friends.c:175 #, c-format msgid "Directory for file `%s' does not seem to be writable.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:230 +#: src/topology/gnunet-daemon-topology.c:225 msgid "# peers blacklisted" msgstr "" -#: src/topology/gnunet-daemon-topology.c:344 +#: src/topology/gnunet-daemon-topology.c:339 msgid "# connect requests issued to ATS" msgstr "" -#: src/topology/gnunet-daemon-topology.c:538 +#: src/topology/gnunet-daemon-topology.c:533 msgid "# HELLO messages gossipped" msgstr "" -#: src/topology/gnunet-daemon-topology.c:640 -#: src/topology/gnunet-daemon-topology.c:726 +#: src/topology/gnunet-daemon-topology.c:635 +#: src/topology/gnunet-daemon-topology.c:721 msgid "# friends connected" msgstr "" -#: src/topology/gnunet-daemon-topology.c:923 +#: src/topology/gnunet-daemon-topology.c:918 msgid "Failed to connect to core service, can not manage topology!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:956 +#: src/topology/gnunet-daemon-topology.c:951 #, c-format msgid "Found myself `%s' in friend list (useless, ignored)\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:963 +#: src/topology/gnunet-daemon-topology.c:958 #, fuzzy, c-format msgid "Found friend `%s' in configuration\n" msgstr "" "\n" "结束配置。\n" -#: src/topology/gnunet-daemon-topology.c:985 +#: src/topology/gnunet-daemon-topology.c:980 msgid "Encountered errors parsing friends list!\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:988 +#: src/topology/gnunet-daemon-topology.c:983 #, fuzzy msgid "# friends in configuration" msgstr "" "\n" "结束配置。\n" -#: src/topology/gnunet-daemon-topology.c:995 +#: src/topology/gnunet-daemon-topology.c:990 msgid "" "Fewer friends specified than required by minimum friend count. Will only " "connect to friends.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1001 +#: src/topology/gnunet-daemon-topology.c:996 msgid "" "More friendly connections required than target total number of connections.\n" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1054 -#: src/transport/plugin_transport_wlan.c:1517 +#: src/topology/gnunet-daemon-topology.c:1049 +#: src/transport/plugin_transport_wlan.c:1512 msgid "# HELLO messages received" msgstr "" -#: src/topology/gnunet-daemon-topology.c:1232 +#: src/topology/gnunet-daemon-topology.c:1227 msgid "GNUnet topology control" msgstr "" -#: src/transport/gnunet-service-transport_ats.c:141 +#: src/transport/gnunet-service-transport_ats.c:136 msgid "# Addresses given to ATS" msgstr "" -#: src/transport/gnunet-service-transport.c:448 +#: src/transport/gnunet-service-transport.c:443 msgid "# messages dropped due to slow client" msgstr "" -#: src/transport/gnunet-service-transport.c:818 +#: src/transport/gnunet-service-transport.c:813 msgid "# bytes payload dropped (other peer was not connected)" msgstr "" -#: src/transport/gnunet-service-transport.c:1551 +#: src/transport/gnunet-service-transport.c:1546 msgid "# bytes payload discarded due to not connected peer" msgstr "" -#: src/transport/gnunet-service-transport.c:1711 +#: src/transport/gnunet-service-transport.c:1706 msgid "# bytes total received" msgstr "" -#: src/transport/gnunet-service-transport.c:1808 +#: src/transport/gnunet-service-transport.c:1803 msgid "# bytes payload received" msgstr "" -#: src/transport/gnunet-service-transport.c:2125 -#: src/transport/gnunet-service-transport.c:2597 +#: src/transport/gnunet-service-transport.c:2120 +#: src/transport/gnunet-service-transport.c:2592 msgid "# disconnects due to blacklist" msgstr "" -#: src/transport/gnunet-service-transport.c:2601 +#: src/transport/gnunet-service-transport.c:2596 #, fuzzy, c-format msgid "Disallowing connection to peer `%s' on transport %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport.c:2709 +#: src/transport/gnunet-service-transport.c:2704 #, fuzzy, c-format msgid "Adding blacklisting entry for peer `%s'\n" msgstr "卸载 GNUnet 服务" -#: src/transport/gnunet-service-transport.c:2718 +#: src/transport/gnunet-service-transport.c:2713 #, c-format msgid "Adding blacklisting entry for peer `%s':`%s'\n" msgstr "" -#: src/transport/gnunet-service-transport.c:2783 +#: src/transport/gnunet-service-transport.c:2778 #, fuzzy msgid "Transport service is lacking key configuration settings. Exiting.\n" msgstr "立即保存配置？" -#: src/transport/gnunet-service-transport_hello.c:195 +#: src/transport/gnunet-service-transport_hello.c:190 msgid "# refreshed my HELLO" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:806 +#: src/transport/gnunet-service-transport_neighbours.c:801 msgid "# session creation failed" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1053 +#: src/transport/gnunet-service-transport_neighbours.c:1048 msgid "# DISCONNECT messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1176 +#: src/transport/gnunet-service-transport_neighbours.c:1171 msgid "# disconnects due to quota of 0" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1324 -#: src/transport/gnunet-service-transport_neighbours.c:1785 +#: src/transport/gnunet-service-transport_neighbours.c:1319 +#: src/transport/gnunet-service-transport_neighbours.c:1780 msgid "# bytes in message queue for other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1329 +#: src/transport/gnunet-service-transport_neighbours.c:1324 msgid "# messages transmitted to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1335 +#: src/transport/gnunet-service-transport_neighbours.c:1330 msgid "# transmission failures for messages to other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1395 +#: src/transport/gnunet-service-transport_neighbours.c:1390 msgid "# messages timed out while in transport queue" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1479 +#: src/transport/gnunet-service-transport_neighbours.c:1474 msgid "# KEEPALIVES sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1515 +#: src/transport/gnunet-service-transport_neighbours.c:1510 msgid "# KEEPALIVE messages discarded (peer unknown)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1523 +#: src/transport/gnunet-service-transport_neighbours.c:1518 msgid "# KEEPALIVE messages discarded (no session)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1533 +#: src/transport/gnunet-service-transport_neighbours.c:1528 msgid "# KEEPALIVES received in good order" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1578 +#: src/transport/gnunet-service-transport_neighbours.c:1573 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1587 +#: src/transport/gnunet-service-transport_neighbours.c:1582 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1595 +#: src/transport/gnunet-service-transport_neighbours.c:1590 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1604 +#: src/transport/gnunet-service-transport_neighbours.c:1599 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1609 +#: src/transport/gnunet-service-transport_neighbours.c:1604 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1615 +#: src/transport/gnunet-service-transport_neighbours.c:1610 msgid "# KEEPALIVE_RESPONSEs received (OK)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1682 +#: src/transport/gnunet-service-transport_neighbours.c:1677 msgid "# messages discarded due to lack of neighbour record" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1716 +#: src/transport/gnunet-service-transport_neighbours.c:1711 msgid "# bandwidth quota violations by other peers" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1731 +#: src/transport/gnunet-service-transport_neighbours.c:1726 msgid "# ms throttling suggested" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:1854 +#: src/transport/gnunet-service-transport_neighbours.c:1849 #, fuzzy, c-format msgid "Failed to send SYN message to peer `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1874 +#: src/transport/gnunet-service-transport_neighbours.c:1869 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN CONT)" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:1913 +#: src/transport/gnunet-service-transport_neighbours.c:1908 #, fuzzy msgid "# SYN messages sent" msgstr "消息尺寸" -#: src/transport/gnunet-service-transport_neighbours.c:1930 +#: src/transport/gnunet-service-transport_neighbours.c:1925 #, fuzzy, c-format msgid "Failed to transmit SYN message to %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport_neighbours.c:1960 +#: src/transport/gnunet-service-transport_neighbours.c:1955 #, fuzzy msgid "# Failed attempts to switch addresses (failed to send SYN)" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/gnunet-service-transport_neighbours.c:2028 +#: src/transport/gnunet-service-transport_neighbours.c:2023 #, fuzzy, c-format msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-service-transport_neighbours.c:2082 +#: src/transport/gnunet-service-transport_neighbours.c:2077 msgid "# SYN_ACK messages sent" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2099 +#: src/transport/gnunet-service-transport_neighbours.c:2094 #, fuzzy, c-format msgid "Failed to transmit SYN_ACK message to %s\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport_neighbours.c:2262 +#: src/transport/gnunet-service-transport_neighbours.c:2257 msgid "# SYN messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2267 +#: src/transport/gnunet-service-transport_neighbours.c:2262 #, c-format msgid "SYN request from peer `%s' ignored due impending shutdown\n" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:2654 +#: src/transport/gnunet-service-transport_neighbours.c:2649 msgid "# Attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3139 +#: src/transport/gnunet-service-transport_neighbours.c:3134 msgid "# SYN_ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3147 +#: src/transport/gnunet-service-transport_neighbours.c:3142 msgid "# unexpected SYN_ACK messages (no peer)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3165 -#: src/transport/gnunet-service-transport_neighbours.c:3189 +#: src/transport/gnunet-service-transport_neighbours.c:3160 +#: src/transport/gnunet-service-transport_neighbours.c:3184 msgid "# unexpected SYN_ACK messages (not ready)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3201 +#: src/transport/gnunet-service-transport_neighbours.c:3196 msgid "# unexpected SYN_ACK messages (waiting on ATS)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3226 +#: src/transport/gnunet-service-transport_neighbours.c:3221 msgid "# Successful attempts to switch addresses" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3239 +#: src/transport/gnunet-service-transport_neighbours.c:3234 msgid "# unexpected SYN_ACK messages (disconnecting)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3412 +#: src/transport/gnunet-service-transport_neighbours.c:3407 msgid "# ACK messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3448 +#: src/transport/gnunet-service-transport_neighbours.c:3443 msgid "# unexpected ACK messages" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3536 +#: src/transport/gnunet-service-transport_neighbours.c:3531 msgid "# quota messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3543 +#: src/transport/gnunet-service-transport_neighbours.c:3538 msgid "# QUOTA messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3583 +#: src/transport/gnunet-service-transport_neighbours.c:3578 msgid "# disconnect messages ignored (malformed)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3590 +#: src/transport/gnunet-service-transport_neighbours.c:3585 msgid "# DISCONNECT messages received" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3601 +#: src/transport/gnunet-service-transport_neighbours.c:3596 msgid "# disconnect messages ignored (timestamp)" msgstr "" -#: src/transport/gnunet-service-transport_neighbours.c:3736 +#: src/transport/gnunet-service-transport_neighbours.c:3731 msgid "# disconnected from peer upon explicit request" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:158 +#: src/transport/gnunet-service-transport_plugins.c:153 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n" msgstr "" -#: src/transport/gnunet-service-transport_plugins.c:223 -#: src/transport/gnunet-service-transport_plugins.c:231 -#: src/transport/gnunet-service-transport_plugins.c:239 -#: src/transport/gnunet-service-transport_plugins.c:247 -#: src/transport/gnunet-service-transport_plugins.c:255 -#: src/transport/gnunet-service-transport_plugins.c:263 -#: src/transport/gnunet-service-transport_plugins.c:271 -#: src/transport/gnunet-service-transport_plugins.c:279 -#: src/transport/gnunet-service-transport_plugins.c:287 -#: src/transport/gnunet-service-transport_plugins.c:295 -#: src/transport/gnunet-service-transport_plugins.c:303 +#: src/transport/gnunet-service-transport_plugins.c:218 +#: src/transport/gnunet-service-transport_plugins.c:226 +#: src/transport/gnunet-service-transport_plugins.c:234 +#: src/transport/gnunet-service-transport_plugins.c:242 +#: src/transport/gnunet-service-transport_plugins.c:250 +#: src/transport/gnunet-service-transport_plugins.c:258 +#: src/transport/gnunet-service-transport_plugins.c:266 +#: src/transport/gnunet-service-transport_plugins.c:274 +#: src/transport/gnunet-service-transport_plugins.c:282 +#: src/transport/gnunet-service-transport_plugins.c:290 +#: src/transport/gnunet-service-transport_plugins.c:298 #, fuzzy, c-format msgid "Missing function `%s' in transport plugin for `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/gnunet-service-transport_plugins.c:310 +#: src/transport/gnunet-service-transport_plugins.c:305 #, c-format msgid "Did not load plugin `%s' due to missing functions\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:388 +#: src/transport/gnunet-service-transport_validation.c:383 msgid "# Addresses in validation map" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:491 -#: src/transport/gnunet-service-transport_validation.c:677 -#: src/transport/gnunet-service-transport_validation.c:997 -#: src/transport/gnunet-service-transport_validation.c:1609 +#: src/transport/gnunet-service-transport_validation.c:486 +#: src/transport/gnunet-service-transport_validation.c:672 +#: src/transport/gnunet-service-transport_validation.c:992 +#: src/transport/gnunet-service-transport_validation.c:1604 #, fuzzy msgid "# validations running" msgstr "sqlite 数据仓库" -#: src/transport/gnunet-service-transport_validation.c:532 +#: src/transport/gnunet-service-transport_validation.c:527 msgid "# address records discarded (timeout)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:580 +#: src/transport/gnunet-service-transport_validation.c:575 msgid "# address records discarded (blacklist)" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:668 +#: src/transport/gnunet-service-transport_validation.c:663 msgid "# PINGs for address validation sent" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:748 +#: src/transport/gnunet-service-transport_validation.c:743 msgid "# validations delayed by global throttle" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:785 +#: src/transport/gnunet-service-transport_validation.c:780 msgid "# address revalidations started" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1123 +#: src/transport/gnunet-service-transport_validation.c:1118 msgid "# PING message for different peer received" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1174 +#: src/transport/gnunet-service-transport_validation.c:1169 #, c-format msgid "Plugin `%s' not available, cannot confirm having this address\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1187 +#: src/transport/gnunet-service-transport_validation.c:1182 msgid "# failed address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1190 +#: src/transport/gnunet-service-transport_validation.c:1185 #, c-format msgid "Address `%s' is not one of my addresses, not confirming PING\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1198 +#: src/transport/gnunet-service-transport_validation.c:1193 msgid "# successful address checks during validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1211 +#: src/transport/gnunet-service-transport_validation.c:1206 #, c-format msgid "" "Not confirming PING from peer `%s' with address `%s' since I cannot confirm " "having this address.\n" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1266 +#: src/transport/gnunet-service-transport_validation.c:1261 #, fuzzy, c-format msgid "Failed to create PONG signature for peer `%s'\n" msgstr "发送消息失败。\n" -#: src/transport/gnunet-service-transport_validation.c:1317 +#: src/transport/gnunet-service-transport_validation.c:1312 msgid "# PONGs unicast via reliable transport" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1326 +#: src/transport/gnunet-service-transport_validation.c:1321 msgid "# PONGs multicast to all available addresses" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1499 +#: src/transport/gnunet-service-transport_validation.c:1494 msgid "# PONGs dropped, no matching pending validation" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1517 +#: src/transport/gnunet-service-transport_validation.c:1512 msgid "# PONGs dropped, signature expired" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1572 +#: src/transport/gnunet-service-transport_validation.c:1567 msgid "# validations succeeded" msgstr "" -#: src/transport/gnunet-service-transport_validation.c:1627 +#: src/transport/gnunet-service-transport_validation.c:1622 msgid "# HELLOs given to peerinfo" msgstr "" -#: src/transport/gnunet-transport.c:413 +#: src/transport/gnunet-transport.c:408 #, c-format msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:423 +#: src/transport/gnunet-transport.c:418 #, c-format msgid "Received %llu bytes/s (%llu bytes in %s)\n" msgstr "" -#: src/transport/gnunet-transport.c:467 +#: src/transport/gnunet-transport.c:462 #, fuzzy, c-format msgid "Failed to connect to `%s'\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:480 +#: src/transport/gnunet-transport.c:475 #, fuzzy, c-format msgid "Failed to resolve address for peer `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/transport/gnunet-transport.c:494 +#: src/transport/gnunet-transport.c:489 #, fuzzy msgid "Failed to list connections, timeout occured\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:527 +#: src/transport/gnunet-transport.c:522 #, c-format msgid "Transmitting %u bytes\n" msgstr "" -#: src/transport/gnunet-transport.c:561 +#: src/transport/gnunet-transport.c:556 #, c-format msgid "" "Successfully connected to `%s', starting to send benchmark data in %u Kb " "blocks\n" msgstr "" -#: src/transport/gnunet-transport.c:592 +#: src/transport/gnunet-transport.c:587 #, fuzzy, c-format msgid "Disconnected from peer `%s' while benchmarking\n" msgstr "“%s”已连接到“%s”。\n" -#: src/transport/gnunet-transport.c:616 src/transport/gnunet-transport.c:645 +#: src/transport/gnunet-transport.c:611 src/transport/gnunet-transport.c:640 #, c-format msgid "%24s: %-17s %4s (%u connections in total)\n" msgstr "" -#: src/transport/gnunet-transport.c:618 +#: src/transport/gnunet-transport.c:613 #, fuzzy msgid "Connected to" msgstr "“%s”已连接到“%s”。\n" -#: src/transport/gnunet-transport.c:647 +#: src/transport/gnunet-transport.c:642 #, fuzzy msgid "Disconnected from" msgstr "“%s”已连接到“%s”。\n" -#: src/transport/gnunet-transport.c:682 +#: src/transport/gnunet-transport.c:677 #, c-format msgid "Received %u bytes\n" msgstr "" -#: src/transport/gnunet-transport.c:719 +#: src/transport/gnunet-transport.c:714 #, c-format msgid "Peer `%s': %s %s in state `%s' until %s\n" msgstr "" -#: src/transport/gnunet-transport.c:731 +#: src/transport/gnunet-transport.c:726 #, fuzzy, c-format msgid "Peer `%s': %s %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/transport/gnunet-transport.c:1144 +#: src/transport/gnunet-transport.c:1139 #, fuzzy msgid "Monitor disconnected from transport service. Reconnecting.\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:1251 +#: src/transport/gnunet-transport.c:1246 #, c-format msgid "" "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, " "%s, %s %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1264 +#: src/transport/gnunet-transport.c:1259 #, c-format msgid "" "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n" msgstr "" -#: src/transport/gnunet-transport.c:1294 +#: src/transport/gnunet-transport.c:1289 #, fuzzy msgid "Failed to connect to transport service for disconnection\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:1300 +#: src/transport/gnunet-transport.c:1295 msgid "Blacklisting request in place, stop with CTRL-C\n" msgstr "" -#: src/transport/gnunet-transport.c:1325 src/transport/gnunet-transport.c:1355 -#: src/transport/gnunet-transport.c:1408 +#: src/transport/gnunet-transport.c:1320 src/transport/gnunet-transport.c:1350 +#: src/transport/gnunet-transport.c:1403 #, fuzzy msgid "Failed to connect to transport service\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:1362 +#: src/transport/gnunet-transport.c:1357 msgid "Starting to receive benchmark data\n" msgstr "" -#: src/transport/gnunet-transport.c:1433 +#: src/transport/gnunet-transport.c:1428 #, fuzzy msgid "print information for all peers (instead of only connected peers)" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/transport/gnunet-transport.c:1437 +#: src/transport/gnunet-transport.c:1432 msgid "measure how fast we are receiving data from all peers (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1441 +#: src/transport/gnunet-transport.c:1436 #, fuzzy msgid "disconnect from a peer" msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport.c:1445 +#: src/transport/gnunet-transport.c:1440 msgid "provide information about all current connections (once)" msgstr "" -#: src/transport/gnunet-transport.c:1453 +#: src/transport/gnunet-transport.c:1448 msgid "" "provide information about all connects and disconnect events (continuously)" msgstr "" -#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport.c:1452 msgid "do not resolve hostnames" msgstr "" -#: src/transport/gnunet-transport.c:1462 -#: src/transport/gnunet-transport-profiler.c:641 +#: src/transport/gnunet-transport.c:1457 +#: src/transport/gnunet-transport-profiler.c:636 msgid "peer identity" msgstr "" -#: src/transport/gnunet-transport.c:1466 +#: src/transport/gnunet-transport.c:1461 msgid "monitor plugin sessions" msgstr "" -#: src/transport/gnunet-transport.c:1471 +#: src/transport/gnunet-transport.c:1466 msgid "send data for benchmarking to the other peer (until CTRL-C)" msgstr "" -#: src/transport/gnunet-transport.c:1482 -#: src/transport/gnunet-transport-profiler.c:652 +#: src/transport/gnunet-transport.c:1477 +#: src/transport/gnunet-transport-profiler.c:647 #, fuzzy msgid "Direct access to transport service." msgstr "初始化“%s”服务失败。\n" -#: src/transport/gnunet-transport-profiler.c:219 +#: src/transport/gnunet-transport-profiler.c:214 #, c-format msgid "%llu B in %llu ms == %.2f KB/s!\n" msgstr "" -#: src/transport/gnunet-transport-profiler.c:617 +#: src/transport/gnunet-transport-profiler.c:612 msgid "send data to peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:621 +#: src/transport/gnunet-transport-profiler.c:616 msgid "receive data from peer" msgstr "" -#: src/transport/gnunet-transport-profiler.c:626 +#: src/transport/gnunet-transport-profiler.c:621 msgid "iterations" msgstr "" -#: src/transport/gnunet-transport-profiler.c:631 +#: src/transport/gnunet-transport-profiler.c:626 #, fuzzy msgid "number of messages to send" msgstr "每次迭代所使用的消息数量" -#: src/transport/gnunet-transport-profiler.c:636 +#: src/transport/gnunet-transport-profiler.c:631 #, fuzzy msgid "message size to use" msgstr "消息尺寸" -#: src/transport/plugin_transport_http_client.c:1474 -#: src/transport/plugin_transport_http_server.c:2312 -#: src/transport/plugin_transport_http_server.c:3526 -#: src/transport/plugin_transport_tcp.c:3891 -#: src/transport/plugin_transport_tcp.c:3898 -#: src/transport/plugin_transport_xt.c:3899 -#: src/transport/plugin_transport_xt.c:3906 +#: src/transport/plugin_transport_http_client.c:1469 +#: src/transport/plugin_transport_http_server.c:2307 +#: src/transport/plugin_transport_http_server.c:3521 +#: src/transport/plugin_transport_tcp.c:3886 +#: src/transport/plugin_transport_tcp.c:3893 +#: src/transport/plugin_transport_xt.c:3894 +#: src/transport/plugin_transport_xt.c:3901 msgid "TCP_STEALTH not supported on this platform.\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2115 +#: src/transport/plugin_transport_http_client.c:2110 #, c-format msgid "Could not initialize curl multi handle, failed to start %s plugin!\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2164 -#: src/transport/plugin_transport_http_server.c:3241 +#: src/transport/plugin_transport_http_client.c:2159 +#: src/transport/plugin_transport_http_server.c:3236 #, fuzzy, c-format msgid "Shutting down plugin `%s'\n" msgstr "未知的命令“%s”。\n" -#: src/transport/plugin_transport_http_client.c:2181 -#: src/transport/plugin_transport_http_server.c:3311 +#: src/transport/plugin_transport_http_client.c:2176 +#: src/transport/plugin_transport_http_server.c:3306 #, c-format msgid "Shutdown for plugin `%s' complete\n" msgstr "" -#: src/transport/plugin_transport_http_client.c:2215 +#: src/transport/plugin_transport_http_client.c:2210 #, fuzzy, c-format msgid "Maximum number of requests is %u\n" msgstr "增加 TCP/IP 的最大连接数" -#: src/transport/plugin_transport_http_server.c:1756 +#: src/transport/plugin_transport_http_server.c:1751 #, c-format msgid "" "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data " "size %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2028 +#: src/transport/plugin_transport_http_server.c:2023 #, c-format msgid "Accepting connection (%u of %u) from `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2036 +#: src/transport/plugin_transport_http_server.c:2031 #, c-format msgid "" "Server reached maximum number connections (%u), rejecting new connection\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2186 +#: src/transport/plugin_transport_http_server.c:2181 msgid "" "Could not create a new TLS certificate, program `gnunet-transport-" "certificate-creation' could not be started!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2209 +#: src/transport/plugin_transport_http_server.c:2204 #, c-format msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2338 +#: src/transport/plugin_transport_http_server.c:2333 msgid "Could not load or create server certificate! Loading plugin failed!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2650 +#: src/transport/plugin_transport_http_server.c:2645 #, fuzzy msgid "Require valid port number for service in configuration!\n" msgstr "保存配置失败。" -#: src/transport/plugin_transport_http_server.c:2815 +#: src/transport/plugin_transport_http_server.c:2810 #, c-format msgid "Found %u addresses to report to NAT service\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:2901 -#: src/transport/plugin_transport_udp.c:3623 -#: src/transport/plugin_transport_xu.c:2049 +#: src/transport/plugin_transport_http_server.c:2896 +#: src/transport/plugin_transport_udp.c:3618 +#: src/transport/plugin_transport_xu.c:2044 msgid "Disabling IPv6 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3007 +#: src/transport/plugin_transport_http_server.c:3002 #, c-format msgid "IPv4 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3022 +#: src/transport/plugin_transport_http_server.c:3017 #, c-format msgid "IPv6 support is %s\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3028 +#: src/transport/plugin_transport_http_server.c:3023 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3039 +#: src/transport/plugin_transport_http_server.c:3034 #, fuzzy msgid "Port is required! Fix in configuration\n" msgstr "" "\n" "结束配置。\n" -#: src/transport/plugin_transport_http_server.c:3045 +#: src/transport/plugin_transport_http_server.c:3040 #, c-format msgid "Using port %u\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3064 +#: src/transport/plugin_transport_http_server.c:3059 #, c-format msgid "Specific IPv4 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3099 +#: src/transport/plugin_transport_http_server.c:3094 #, c-format msgid "Specific IPv6 address `%s' in configuration file is invalid!\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3174 +#: src/transport/plugin_transport_http_server.c:3169 #, fuzzy, c-format msgid "Using external hostname `%s'\n" msgstr "卸载 GNUnet 服务" -#: src/transport/plugin_transport_http_server.c:3195 +#: src/transport/plugin_transport_http_server.c:3190 #, c-format msgid "Notifying transport only about hostname `%s'\n" msgstr "" -#: src/transport/plugin_transport_http_server.c:3212 +#: src/transport/plugin_transport_http_server.c:3207 #, fuzzy, c-format msgid "Maximum number of connections is %u\n" msgstr "增加 TCP/IP 的最大连接数" -#: src/transport/plugin_transport_http_server.c:3538 +#: src/transport/plugin_transport_http_server.c:3533 #, fuzzy msgid "Unable to compile URL regex\n" msgstr "无法初始化 SQLite：%s。\n" -#: src/transport/plugin_transport_smtp.c:223 +#: src/transport/plugin_transport_smtp.c:218 #, c-format msgid "Received malformed message via %s. Ignored.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:310 +#: src/transport/plugin_transport_smtp.c:305 msgid "SMTP filter string to invalid, lacks ': '\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:319 +#: src/transport/plugin_transport_smtp.c:314 #, c-format msgid "SMTP filter string to long, capped to `%s'\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:414 -#: src/transport/plugin_transport_smtp.c:424 -#: src/transport/plugin_transport_smtp.c:437 -#: src/transport/plugin_transport_smtp.c:456 -#: src/transport/plugin_transport_smtp.c:479 -#: src/transport/plugin_transport_smtp.c:487 -#: src/transport/plugin_transport_smtp.c:500 -#: src/transport/plugin_transport_smtp.c:511 +#: src/transport/plugin_transport_smtp.c:409 +#: src/transport/plugin_transport_smtp.c:419 +#: src/transport/plugin_transport_smtp.c:432 +#: src/transport/plugin_transport_smtp.c:451 +#: src/transport/plugin_transport_smtp.c:474 +#: src/transport/plugin_transport_smtp.c:482 +#: src/transport/plugin_transport_smtp.c:495 +#: src/transport/plugin_transport_smtp.c:506 #, c-format msgid "SMTP: `%s' failed: %s.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:652 +#: src/transport/plugin_transport_smtp.c:647 msgid "No email-address specified, can not start SMTP transport.\n" msgstr "" -#: src/transport/plugin_transport_smtp.c:664 +#: src/transport/plugin_transport_smtp.c:659 msgid "# bytes received via SMTP" msgstr "" -#: src/transport/plugin_transport_smtp.c:665 +#: src/transport/plugin_transport_smtp.c:660 msgid "# bytes sent via SMTP" msgstr "" -#: src/transport/plugin_transport_smtp.c:667 +#: src/transport/plugin_transport_smtp.c:662 msgid "# bytes dropped by SMTP (outgoing)" msgstr "" -#: src/transport/plugin_transport_tcp.c:1547 -#: src/transport/plugin_transport_tcp.c:2873 -#: src/transport/plugin_transport_xt.c:1553 -#: src/transport/plugin_transport_xt.c:2879 +#: src/transport/plugin_transport_tcp.c:1542 +#: src/transport/plugin_transport_tcp.c:2868 +#: src/transport/plugin_transport_xt.c:1548 +#: src/transport/plugin_transport_xt.c:2874 #, c-format msgid "Unexpected address length: %u bytes\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:1730 -#: src/transport/plugin_transport_tcp.c:1954 -#: src/transport/plugin_transport_tcp.c:3137 -#: src/transport/plugin_transport_tcp.c:4014 -#: src/transport/plugin_transport_xt.c:1736 -#: src/transport/plugin_transport_xt.c:1960 -#: src/transport/plugin_transport_xt.c:3143 +#: src/transport/plugin_transport_tcp.c:1725 +#: src/transport/plugin_transport_tcp.c:1949 +#: src/transport/plugin_transport_tcp.c:3132 +#: src/transport/plugin_transport_tcp.c:4009 +#: src/transport/plugin_transport_xt.c:1731 +#: src/transport/plugin_transport_xt.c:1955 +#: src/transport/plugin_transport_xt.c:3138 msgid "# TCP sessions active" msgstr "" -#: src/transport/plugin_transport_tcp.c:1772 -#: src/transport/plugin_transport_tcp.c:1936 -#: src/transport/plugin_transport_tcp.c:2060 -#: src/transport/plugin_transport_tcp.c:2133 -#: src/transport/plugin_transport_tcp.c:2233 -#: src/transport/plugin_transport_tcp.c:2258 -#: src/transport/plugin_transport_xt.c:1778 -#: src/transport/plugin_transport_xt.c:1942 -#: src/transport/plugin_transport_xt.c:2066 -#: src/transport/plugin_transport_xt.c:2139 -#: src/transport/plugin_transport_xt.c:2239 -#: src/transport/plugin_transport_xt.c:2264 +#: src/transport/plugin_transport_tcp.c:1767 +#: src/transport/plugin_transport_tcp.c:1931 +#: src/transport/plugin_transport_tcp.c:2055 +#: src/transport/plugin_transport_tcp.c:2128 +#: src/transport/plugin_transport_tcp.c:2228 +#: src/transport/plugin_transport_tcp.c:2253 +#: src/transport/plugin_transport_xt.c:1773 +#: src/transport/plugin_transport_xt.c:1937 +#: src/transport/plugin_transport_xt.c:2061 +#: src/transport/plugin_transport_xt.c:2134 +#: src/transport/plugin_transport_xt.c:2234 +#: src/transport/plugin_transport_xt.c:2259 msgid "# bytes currently in TCP buffers" msgstr "" -#: src/transport/plugin_transport_tcp.c:1775 -#: src/transport/plugin_transport_xt.c:1781 +#: src/transport/plugin_transport_tcp.c:1770 +#: src/transport/plugin_transport_xt.c:1776 msgid "# bytes discarded by TCP (disconnect)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2063 -#: src/transport/plugin_transport_xt.c:2069 +#: src/transport/plugin_transport_tcp.c:2058 +#: src/transport/plugin_transport_xt.c:2064 msgid "# bytes discarded by TCP (timeout)" msgstr "" -#: src/transport/plugin_transport_tcp.c:2137 -#: src/transport/plugin_transport_xt.c:2143 +#: src/transport/plugin_transport_tcp.c:2132 +#: src/transport/plugin_transport_xt.c:2138 msgid "# bytes transmitted via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:2535 -#: src/transport/plugin_transport_xt.c:2541 +#: src/transport/plugin_transport_tcp.c:2530 +#: src/transport/plugin_transport_xt.c:2536 msgid "# requests to create session with invalid address" msgstr "" -#: src/transport/plugin_transport_tcp.c:2711 -#: src/transport/plugin_transport_xt.c:2717 +#: src/transport/plugin_transport_tcp.c:2706 +#: src/transport/plugin_transport_xt.c:2712 msgid "# transport-service disconnect requests for TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3203 -#: src/transport/plugin_transport_xt.c:3209 +#: src/transport/plugin_transport_tcp.c:3198 +#: src/transport/plugin_transport_xt.c:3204 msgid "# TCP WELCOME messages received" msgstr "" -#: src/transport/plugin_transport_tcp.c:3409 -#: src/transport/plugin_transport_xt.c:3415 +#: src/transport/plugin_transport_tcp.c:3404 +#: src/transport/plugin_transport_xt.c:3410 msgid "# bytes received via TCP" msgstr "" -#: src/transport/plugin_transport_tcp.c:3460 -#: src/transport/plugin_transport_tcp.c:3518 -#: src/transport/plugin_transport_xt.c:3466 -#: src/transport/plugin_transport_xt.c:3524 +#: src/transport/plugin_transport_tcp.c:3455 +#: src/transport/plugin_transport_tcp.c:3513 +#: src/transport/plugin_transport_xt.c:3461 +#: src/transport/plugin_transport_xt.c:3519 #, fuzzy msgid "# TCP server connections active" msgstr "" "\n" "按任意键继续\n" -#: src/transport/plugin_transport_tcp.c:3464 -#: src/transport/plugin_transport_xt.c:3470 +#: src/transport/plugin_transport_tcp.c:3459 +#: src/transport/plugin_transport_xt.c:3465 #, fuzzy msgid "# TCP server connect events" msgstr "" "\n" "按任意键继续\n" -#: src/transport/plugin_transport_tcp.c:3470 -#: src/transport/plugin_transport_xt.c:3476 +#: src/transport/plugin_transport_tcp.c:3465 +#: src/transport/plugin_transport_xt.c:3471 msgid "TCP connection limit reached, suspending server\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:3472 -#: src/transport/plugin_transport_xt.c:3478 +#: src/transport/plugin_transport_tcp.c:3467 +#: src/transport/plugin_transport_xt.c:3473 msgid "# TCP service suspended" msgstr "" -#: src/transport/plugin_transport_tcp.c:3512 -#: src/transport/plugin_transport_xt.c:3518 +#: src/transport/plugin_transport_tcp.c:3507 +#: src/transport/plugin_transport_xt.c:3513 msgid "# TCP service resumed" msgstr "" -#: src/transport/plugin_transport_tcp.c:3522 -#: src/transport/plugin_transport_xt.c:3528 +#: src/transport/plugin_transport_tcp.c:3517 +#: src/transport/plugin_transport_xt.c:3523 msgid "# network-level TCP disconnect events" msgstr "" -#: src/transport/plugin_transport_tcp.c:3841 -#: src/transport/plugin_transport_xt.c:3849 +#: src/transport/plugin_transport_tcp.c:3836 +#: src/transport/plugin_transport_xt.c:3844 #, fuzzy msgid "Failed to start service.\n" msgstr "初始化“%s”服务失败。\n" -#: src/transport/plugin_transport_tcp.c:4002 +#: src/transport/plugin_transport_tcp.c:3997 #, c-format msgid "TCP transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4006 +#: src/transport/plugin_transport_tcp.c:4001 msgid "TCP transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_tcp.c:4010 +#: src/transport/plugin_transport_tcp.c:4005 #, c-format msgid "TCP transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:168 +#: src/transport/plugin_transport_udp_broadcasting.c:163 msgid "# Multicast HELLO beacons received via UDP" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:548 +#: src/transport/plugin_transport_udp_broadcasting.c:543 msgid "" "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n" msgstr "" -#: src/transport/plugin_transport_udp_broadcasting.c:565 +#: src/transport/plugin_transport_udp_broadcasting.c:560 #, c-format msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3367 +#: src/transport/plugin_transport_udp.c:3362 #, c-format msgid "" "UDP could not transmit message to `%s': Network seems down, please check " "your network configuration\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3381 +#: src/transport/plugin_transport_udp.c:3376 msgid "" "UDP could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3699 -#: src/transport/plugin_transport_udp.c:3798 +#: src/transport/plugin_transport_udp.c:3694 +#: src/transport/plugin_transport_udp.c:3793 #, fuzzy, c-format msgid "Failed to bind UDP socket to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_udp.c:3717 -#: src/transport/plugin_transport_xu.c:2143 +#: src/transport/plugin_transport_udp.c:3712 +#: src/transport/plugin_transport_xu.c:2138 msgid "Disabling IPv4 since it is not supported on this system!\n" msgstr "" -#: src/transport/plugin_transport_udp.c:3808 +#: src/transport/plugin_transport_udp.c:3803 #, fuzzy msgid "Failed to open UDP sockets\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_udp.c:3879 -#: src/transport/plugin_transport_udp.c:3893 -#: src/transport/plugin_transport_xu.c:2301 -#: src/transport/plugin_transport_xu.c:2315 +#: src/transport/plugin_transport_udp.c:3874 +#: src/transport/plugin_transport_udp.c:3888 +#: src/transport/plugin_transport_xu.c:2296 +#: src/transport/plugin_transport_xu.c:2310 msgid "must be in [0,65535]" msgstr "" -#: src/transport/plugin_transport_udp.c:3925 -#: src/transport/plugin_transport_xu.c:2347 +#: src/transport/plugin_transport_udp.c:3920 +#: src/transport/plugin_transport_xu.c:2342 #, fuzzy msgid "must be valid IPv4 address" msgstr "“%s”不可用。\n" -#: src/transport/plugin_transport_udp.c:3952 -#: src/transport/plugin_transport_xu.c:2374 +#: src/transport/plugin_transport_udp.c:3947 +#: src/transport/plugin_transport_xu.c:2369 #, fuzzy msgid "must be valid IPv6 address" msgstr "“%s”不可用。\n" -#: src/transport/plugin_transport_udp.c:4016 +#: src/transport/plugin_transport_udp.c:4011 #, fuzzy msgid "Failed to create UDP network sockets\n" msgstr "发送消息失败。\n" -#: src/transport/plugin_transport_unix.c:1403 +#: src/transport/plugin_transport_unix.c:1398 #, fuzzy, c-format msgid "Cannot create path to `%s'\n" msgstr "发送消息失败。\n" -#: src/transport/plugin_transport_unix.c:1416 +#: src/transport/plugin_transport_unix.c:1411 #, fuzzy, c-format msgid "Cannot bind to `%s'\n" msgstr "发送消息失败。\n" -#: src/transport/plugin_transport_unix.c:1816 +#: src/transport/plugin_transport_unix.c:1811 #, fuzzy msgid "Failed to open UNIX listen socket\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_wlan.c:768 +#: src/transport/plugin_transport_wlan.c:763 msgid "# ACKs sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:788 +#: src/transport/plugin_transport_wlan.c:783 msgid "# Messages defragmented" msgstr "" -#: src/transport/plugin_transport_wlan.c:829 -#: src/transport/plugin_transport_wlan.c:914 +#: src/transport/plugin_transport_wlan.c:824 +#: src/transport/plugin_transport_wlan.c:909 msgid "# Sessions allocated" msgstr "" -#: src/transport/plugin_transport_wlan.c:1035 +#: src/transport/plugin_transport_wlan.c:1030 #, fuzzy msgid "# message fragments sent" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_wlan.c:1064 +#: src/transport/plugin_transport_wlan.c:1059 msgid "# messages pending (with fragmentation)" msgstr "" -#: src/transport/plugin_transport_wlan.c:1193 -#: src/transport/plugin_transport_wlan.c:1284 -#: src/transport/plugin_transport_wlan.c:2305 +#: src/transport/plugin_transport_wlan.c:1188 +#: src/transport/plugin_transport_wlan.c:1279 +#: src/transport/plugin_transport_wlan.c:2300 msgid "# MAC endpoints allocated" msgstr "" -#: src/transport/plugin_transport_wlan.c:1567 +#: src/transport/plugin_transport_wlan.c:1562 msgid "# ACKs received" msgstr "" -#: src/transport/plugin_transport_wlan.c:1636 +#: src/transport/plugin_transport_wlan.c:1631 msgid "# DATA messages discarded due to CRC32 error" msgstr "" -#: src/transport/plugin_transport_wlan.c:1740 +#: src/transport/plugin_transport_wlan.c:1735 msgid "# HELLO beacons sent" msgstr "" -#: src/transport/plugin_transport_wlan.c:1856 +#: src/transport/plugin_transport_wlan.c:1851 msgid "# DATA messages received" msgstr "" -#: src/transport/plugin_transport_wlan.c:1890 +#: src/transport/plugin_transport_wlan.c:1885 msgid "# DATA messages processed" msgstr "" -#: src/transport/plugin_transport_wlan.c:2280 +#: src/transport/plugin_transport_wlan.c:2275 #, c-format msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n" msgstr "" -#: src/transport/plugin_transport_wlan.c:2302 +#: src/transport/plugin_transport_wlan.c:2297 msgid "# sessions allocated" msgstr "" -#: src/transport/plugin_transport_xt.c:4010 +#: src/transport/plugin_transport_xt.c:4005 #, c-format msgid "XT transport listening on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4014 +#: src/transport/plugin_transport_xt.c:4009 msgid "XT transport not listening on any port (client only)\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4018 +#: src/transport/plugin_transport_xt.c:4013 #, c-format msgid "XT transport advertises itself as being on port %llu\n" msgstr "" -#: src/transport/plugin_transport_xt.c:4022 +#: src/transport/plugin_transport_xt.c:4017 #, fuzzy msgid "# XT sessions active" msgstr "" "\n" "按任意键继续\n" -#: src/transport/plugin_transport_xu.c:1237 +#: src/transport/plugin_transport_xu.c:1232 #, c-format msgid "" "XU could not transmit message to `%s': Network seems down, please check your " "network configuration\n" msgstr "" -#: src/transport/plugin_transport_xu.c:1251 +#: src/transport/plugin_transport_xu.c:1246 msgid "" "XU could not transmit IPv6 message! Please check your network configuration " "and disable IPv6 if your connection does not have a global IPv6 address\n" msgstr "" -#: src/transport/plugin_transport_xu.c:2125 -#: src/transport/plugin_transport_xu.c:2224 +#: src/transport/plugin_transport_xu.c:2120 +#: src/transport/plugin_transport_xu.c:2219 #, fuzzy, c-format msgid "Failed to bind XU socket to %s: %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_xu.c:2234 +#: src/transport/plugin_transport_xu.c:2229 #, fuzzy msgid "Failed to open XU sockets\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/transport/plugin_transport_xu.c:2398 +#: src/transport/plugin_transport_xu.c:2393 #, fuzzy msgid "Failed to create XU network sockets\n" msgstr "发送消息失败。\n" -#: src/transport/tcp_connection_legacy.c:452 +#: src/transport/tcp_connection_legacy.c:447 #, fuzzy, c-format msgid "Access denied to `%s'\n" msgstr "“%s”已连接到“%s”。\n" -#: src/transport/tcp_connection_legacy.c:469 +#: src/transport/tcp_connection_legacy.c:464 #, c-format msgid "Accepting connection from `%s': %p\n" msgstr "" -#: src/transport/tcp_server_legacy.c:474 src/util/service.c:1111 +#: src/transport/tcp_server_legacy.c:469 src/util/service.c:1106 #, fuzzy, c-format msgid "`%s' failed for port %d (%s).\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/transport/tcp_server_legacy.c:484 src/util/service.c:1121 +#: src/transport/tcp_server_legacy.c:479 src/util/service.c:1116 #, c-format msgid "`%s' failed for port %d (%s): address already in use\n" msgstr "" -#: src/transport/tcp_server_legacy.c:490 src/util/service.c:1127 +#: src/transport/tcp_server_legacy.c:485 src/util/service.c:1122 #, fuzzy, c-format msgid "`%s' failed for `%s': address already in use\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/transport/tcp_server_legacy.c:890 +#: src/transport/tcp_server_legacy.c:885 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVER_receive_done' after %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348 +#: src/transport/tcp_service_legacy.c:334 src/util/service.c:2375 #, c-format msgid "Unknown address family %d\n" msgstr "" -#: src/transport/tcp_service_legacy.c:346 +#: src/transport/tcp_service_legacy.c:341 #, c-format msgid "Access from `%s' denied to service `%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:402 src/util/service.c:439 +#: src/transport/tcp_service_legacy.c:397 src/util/service.c:434 #, c-format msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:440 src/util/service.c:482 +#: src/transport/tcp_service_legacy.c:435 src/util/service.c:477 #, c-format msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n" msgstr "" -#: src/transport/tcp_service_legacy.c:904 src/util/service.c:1042 +#: src/transport/tcp_service_legacy.c:899 src/util/service.c:1037 msgid "Could not access a pre-bound socket, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:953 -#: src/transport/tcp_service_legacy.c:971 src/util/service.c:1194 +#: src/transport/tcp_service_legacy.c:948 +#: src/transport/tcp_service_legacy.c:966 src/util/service.c:1189 #, c-format msgid "Specified value for `%s' of service `%s' is invalid\n" msgstr "" -#: src/transport/tcp_service_legacy.c:996 src/util/service.c:1226 +#: src/transport/tcp_service_legacy.c:991 src/util/service.c:1221 #, c-format msgid "Could not access pre-bound socket %u, will try to bind myself\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1161 +#: src/transport/tcp_service_legacy.c:1156 #, fuzzy, c-format msgid "Failed to start `%s' at `%s'\n" msgstr "运行 %s失败：%s %d\n" -#: src/transport/tcp_service_legacy.c:1202 +#: src/transport/tcp_service_legacy.c:1197 #, c-format msgid "Service `%s' runs at %s\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1251 src/util/service.c:1500 +#: src/transport/tcp_service_legacy.c:1246 src/util/service.c:1495 msgid "Service process failed to initialize\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1504 +#: src/transport/tcp_service_legacy.c:1250 src/util/service.c:1499 msgid "Service process could not initialize server function\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1259 src/util/service.c:1508 +#: src/transport/tcp_service_legacy.c:1254 src/util/service.c:1503 msgid "Service process failed to report status\n" msgstr "" -#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517 -#: src/util/service.c:1378 +#: src/transport/tcp_service_legacy.c:1308 src/util/disk.c:1512 +#: src/util/service.c:1373 #, c-format msgid "Cannot obtain information about user `%s': %s\n" msgstr "无法获取有关用户“%s”的信息：%s\n" -#: src/transport/tcp_service_legacy.c:1314 src/util/service.c:1380 +#: src/transport/tcp_service_legacy.c:1309 src/util/service.c:1375 msgid "No such user" msgstr "无此用户" -#: src/transport/tcp_service_legacy.c:1327 src/util/service.c:1399 +#: src/transport/tcp_service_legacy.c:1322 src/util/service.c:1394 #, c-format msgid "Cannot change user/group to `%s': %s\n" msgstr "无法更改用户/组为“%s”：%s\n" -#: src/transport/tcp_service_legacy.c:1398 src/util/service.c:1727 +#: src/transport/tcp_service_legacy.c:1393 src/util/service.c:1754 msgid "do daemonize (detach from terminal)" msgstr "" -#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279 -#: src/util/service.c:1790 +#: src/transport/tcp_service_legacy.c:1443 src/util/program.c:274 +#: src/util/service.c:1817 #, fuzzy, c-format msgid "Malformed configuration file `%s', exit ...\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299 -#: src/util/service.c:1801 +#: src/transport/tcp_service_legacy.c:1453 src/util/program.c:294 +#: src/util/service.c:1828 #, fuzzy msgid "Malformed configuration, exit ...\n" msgstr "解析配置文件“%s”失败\n" -#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292 -#: src/util/service.c:1807 +#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:287 +#: src/util/service.c:1834 #, fuzzy, c-format msgid "Could not access configuration file `%s'\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/tun/regex.c:134 +#: src/tun/regex.c:129 #, c-format msgid "Bad mask: %d\n" msgstr "" -#: src/util/bio.c:181 src/util/bio.c:189 +#: src/util/bio.c:176 src/util/bio.c:184 #, fuzzy, c-format msgid "Error reading `%s': %s" msgstr "创建用户出错" -#: src/util/bio.c:191 +#: src/util/bio.c:186 msgid "End of file" msgstr "" -#: src/util/bio.c:248 +#: src/util/bio.c:243 #, c-format msgid "Error reading length of string `%s'" msgstr "" -#: src/util/bio.c:258 +#: src/util/bio.c:253 #, c-format msgid "String `%s' longer than allowed (%u > %u)" msgstr "" -#: src/util/bio.c:306 +#: src/util/bio.c:301 #, c-format msgid "Serialized metadata `%s' larger than allowed (%u>%u)" msgstr "" -#: src/util/bio.c:328 +#: src/util/bio.c:323 #, c-format msgid "Metadata `%s' failed to deserialize" msgstr "" -#: src/util/client.c:914 +#: src/util/client.c:909 #, c-format msgid "Need a non-empty hostname for service `%s'.\n" msgstr "" -#: src/util/common_logging.c:259 src/util/common_logging.c:1146 +#: src/util/common_logging.c:254 src/util/common_logging.c:1141 msgid "DEBUG" msgstr "调试" -#: src/util/common_logging.c:261 src/util/common_logging.c:1144 +#: src/util/common_logging.c:256 src/util/common_logging.c:1139 msgid "INFO" msgstr "信息" -#: src/util/common_logging.c:263 src/util/common_logging.c:1142 +#: src/util/common_logging.c:258 src/util/common_logging.c:1137 msgid "MESSAGE" msgstr "" -#: src/util/common_logging.c:265 src/util/common_logging.c:1140 +#: src/util/common_logging.c:260 src/util/common_logging.c:1135 msgid "WARNING" msgstr "警告" -#: src/util/common_logging.c:267 src/util/common_logging.c:1138 +#: src/util/common_logging.c:262 src/util/common_logging.c:1133 msgid "ERROR" msgstr "错误" -#: src/util/common_logging.c:269 src/util/common_logging.c:1148 +#: src/util/common_logging.c:264 src/util/common_logging.c:1143 msgid "NONE" msgstr "" -#: src/util/common_logging.c:882 +#: src/util/common_logging.c:877 #, fuzzy, c-format msgid "Message `%.*s' repeated %u times in the last %s\n" msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n" -#: src/util/common_logging.c:1149 +#: src/util/common_logging.c:1144 msgid "INVALID" msgstr "" -#: src/util/common_logging.c:1442 +#: src/util/common_logging.c:1437 msgid "unknown address" msgstr "" -#: src/util/common_logging.c:1484 +#: src/util/common_logging.c:1479 msgid "invalid address" msgstr "" -#: src/util/common_logging.c:1502 +#: src/util/common_logging.c:1497 #, fuzzy, c-format msgid "Configuration fails to specify option `%s' in section `%s'!\n" msgstr "配置不满足配置规范文件“%s”的约束！\n" -#: src/util/common_logging.c:1523 +#: src/util/common_logging.c:1518 #, fuzzy, c-format msgid "" "Configuration specifies invalid value for option `%s' in section `%s': %s\n" msgstr "配置不满足配置规范文件“%s”的约束！\n" -#: src/util/configuration.c:296 +#: src/util/configuration.c:291 #, fuzzy, c-format msgid "Syntax error while deserializing in line %u\n" msgstr "配置文件“%s”第 %d 行有语法错误。\n" -#: src/util/configuration.c:363 +#: src/util/configuration.c:358 #, fuzzy, c-format msgid "Error while reading file `%s'\n" msgstr "解析 dscl 输出时出错。\n" -#: src/util/configuration.c:1051 +#: src/util/configuration.c:1046 #, c-format msgid "" "Configuration value '%s' for '%s' in section '%s' is not in set of legal " "choices\n" msgstr "" -#: src/util/configuration.c:1170 +#: src/util/configuration.c:1165 #, c-format msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n" msgstr "" -#: src/util/configuration.c:1203 +#: src/util/configuration.c:1198 #, fuzzy, c-format msgid "Missing closing `%s' in option `%s'\n" msgstr "配置文件“%s”已写入。\n" -#: src/util/configuration.c:1271 +#: src/util/configuration.c:1266 #, c-format msgid "" "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined " "as an environmental variable\n" msgstr "" -#: src/util/container_bloomfilter.c:532 +#: src/util/container_bloomfilter.c:527 #, c-format msgid "" "Size of file on disk is incorrect for this Bloom filter (want %llu, have " "%llu)\n" msgstr "" -#: src/util/crypto_ecc.c:836 +#: src/util/crypto_ecc.c:831 #, fuzzy, c-format msgid "ECC signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:886 +#: src/util/crypto_ecc.c:881 #, fuzzy, c-format msgid "EdDSA signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:960 +#: src/util/crypto_ecc.c:955 #, fuzzy, c-format msgid "ECDSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc.c:1017 +#: src/util/crypto_ecc.c:1012 #, fuzzy, c-format msgid "EdDSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165 -#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355 +#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160 +#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350 #, fuzzy, c-format msgid "Could not acquire lock on file `%s': %s...\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314 +#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309 #, fuzzy msgid "Creating a new private key. This may take a while.\n" msgstr "正在启动数据仓库转换(可能需要一段时间)。\n" -#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359 +#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354 msgid "This may be ok if someone is currently generating a private key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401 +#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396 #, c-format msgid "" "When trying to read key file `%s' I found %u bytes but I need at least %u.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405 +#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400 msgid "This may be ok if someone is currently generating a key.\n" msgstr "" -#: src/util/crypto_ecc_setup.c:471 +#: src/util/crypto_ecc_setup.c:466 #, fuzzy msgid "Could not load peer's private key\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/util/crypto_random.c:284 +#: src/util/crypto_random.c:279 #, c-format msgid "libgcrypt has not the expected version (version %s is required).\n" msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n" -#: src/util/crypto_rsa.c:834 +#: src/util/crypto_rsa.c:833 #, fuzzy, c-format msgid "RSA signing failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/crypto_rsa.c:1165 +#: src/util/crypto_rsa.c:1164 #, fuzzy, c-format msgid "RSA signature verification failed at %s:%d: %s\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/disk.c:1247 +#: src/util/disk.c:1242 #, c-format msgid "Expected `%s' to be a directory!\n" msgstr "“%s”应为目录！\n" @@ -8366,707 +8371,707 @@ msgstr "请使用 --help 获取选项列表。\n" msgid "Missing mandatory option `%s'.\n" msgstr "配置文件“%s”已写入。\n" -#: src/util/getopt_helpers.c:70 +#: src/util/getopt_helpers.c:65 msgid "print the version number" msgstr "" -#: src/util/getopt_helpers.c:115 +#: src/util/getopt_helpers.c:110 #, c-format msgid "" "Arguments mandatory for long options are also mandatory for short options.\n" msgstr "长选项的必选参数对短选项也是必选的。\n" -#: src/util/getopt_helpers.c:203 +#: src/util/getopt_helpers.c:198 msgid "print this help" msgstr "" -#: src/util/getopt_helpers.c:281 +#: src/util/getopt_helpers.c:276 msgid "be verbose" msgstr "" -#: src/util/getopt_helpers.c:422 +#: src/util/getopt_helpers.c:417 msgid "configure logging to use LOGLEVEL" msgstr "" -#: src/util/getopt_helpers.c:502 +#: src/util/getopt_helpers.c:497 msgid "configure logging to write logs to FILENAME" msgstr "" -#: src/util/getopt_helpers.c:524 +#: src/util/getopt_helpers.c:519 #, fuzzy msgid "use configuration file FILENAME" msgstr "更改配置文件中的一个值" -#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758 -#: src/util/getopt_helpers.c:825 +#: src/util/getopt_helpers.c:556 src/util/getopt_helpers.c:753 +#: src/util/getopt_helpers.c:820 #, c-format msgid "You must pass a number to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:626 +#: src/util/getopt_helpers.c:621 #, fuzzy, c-format msgid "You must pass relative time to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:692 +#: src/util/getopt_helpers.c:687 #, fuzzy, c-format msgid "You must pass absolute time to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:832 +#: src/util/getopt_helpers.c:827 #, fuzzy, c-format msgid "You must pass a number below %u to the `%s' option.\n" msgstr "您必须向“%s”选项传递一个数字。\n" -#: src/util/getopt_helpers.c:918 +#: src/util/getopt_helpers.c:913 #, c-format msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n" msgstr "" -#: src/util/gnunet-config.c:134 +#: src/util/gnunet-config.c:129 #, fuzzy, c-format msgid "failed to load configuration defaults" msgstr "解析配置文件“%s”失败\n" -#: src/util/gnunet-config.c:147 +#: src/util/gnunet-config.c:142 #, fuzzy, c-format msgid "--section argument is required\n" msgstr "设置要使用的昵称(必须)" -#: src/util/gnunet-config.c:150 +#: src/util/gnunet-config.c:145 #, c-format msgid "The following sections are available:\n" msgstr "" -#: src/util/gnunet-config.c:201 +#: src/util/gnunet-config.c:196 #, c-format msgid "--option argument required to set value\n" msgstr "" -#: src/util/gnunet-config.c:240 +#: src/util/gnunet-config.c:235 msgid "obtain option of value as a filename (with $-expansion)" msgstr "" -#: src/util/gnunet-config.c:245 +#: src/util/gnunet-config.c:240 msgid "name of the section to access" msgstr "" -#: src/util/gnunet-config.c:250 +#: src/util/gnunet-config.c:245 msgid "name of the option to access" msgstr "" -#: src/util/gnunet-config.c:255 +#: src/util/gnunet-config.c:250 msgid "value to set" msgstr "" -#: src/util/gnunet-config.c:259 +#: src/util/gnunet-config.c:254 #, fuzzy msgid "print available configuration sections" msgstr "立即保存配置？" -#: src/util/gnunet-config.c:263 +#: src/util/gnunet-config.c:258 msgid "write configuration file that only contains delta to defaults" msgstr "" -#: src/util/gnunet-config.c:276 +#: src/util/gnunet-config.c:271 #, fuzzy msgid "Manipulate GNUnet configuration files" msgstr "更改配置文件中的一个值" -#: src/util/gnunet-ecc.c:94 +#: src/util/gnunet-ecc.c:89 #, fuzzy, c-format msgid "Failed to open `%s': %s\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/util/gnunet-ecc.c:130 +#: src/util/gnunet-ecc.c:125 #, c-format msgid "Generating %u keys like %s, please wait" msgstr "" -#: src/util/gnunet-ecc.c:143 +#: src/util/gnunet-ecc.c:138 #, c-format msgid "Generating %u keys, please wait" msgstr "" -#: src/util/gnunet-ecc.c:184 +#: src/util/gnunet-ecc.c:179 #, fuzzy, c-format msgid "" "\n" "Failed to write to `%s': %s\n" msgstr "运行 %s失败：%s %d\n" -#: src/util/gnunet-ecc.c:194 +#: src/util/gnunet-ecc.c:189 #, c-format msgid "" "\n" "Finished!\n" msgstr "" -#: src/util/gnunet-ecc.c:197 +#: src/util/gnunet-ecc.c:192 #, c-format msgid "" "\n" "Error, %u keys not generated\n" msgstr "" -#: src/util/gnunet-ecc.c:290 +#: src/util/gnunet-ecc.c:285 #, c-format msgid "Hostkeys file `%s' not found\n" msgstr "" -#: src/util/gnunet-ecc.c:305 +#: src/util/gnunet-ecc.c:300 #, fuzzy, c-format msgid "Hostkeys file `%s' is empty\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/util/gnunet-ecc.c:334 +#: src/util/gnunet-ecc.c:329 #, fuzzy, c-format msgid "Could not read hostkey file: %s\n" msgstr "找不到接口“%s”的一个 IP 地址。\n" -#: src/util/gnunet-ecc.c:391 +#: src/util/gnunet-ecc.c:386 msgid "No hostkey file specified on command line\n" msgstr "" -#: src/util/gnunet-ecc.c:456 +#: src/util/gnunet-ecc.c:451 msgid "list keys included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:461 +#: src/util/gnunet-ecc.c:456 msgid "number of keys to list included in a file (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:466 +#: src/util/gnunet-ecc.c:461 msgid "create COUNT public-private key pairs (for testing)" msgstr "" -#: src/util/gnunet-ecc.c:470 +#: src/util/gnunet-ecc.c:465 msgid "print the public key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:474 +#: src/util/gnunet-ecc.c:469 msgid "print the private key in ASCII format" msgstr "" -#: src/util/gnunet-ecc.c:478 +#: src/util/gnunet-ecc.c:473 msgid "print the public key in HEX format" msgstr "" -#: src/util/gnunet-ecc.c:482 +#: src/util/gnunet-ecc.c:477 msgid "print examples of ECC operations (used for compatibility testing)" msgstr "" -#: src/util/gnunet-ecc.c:498 +#: src/util/gnunet-ecc.c:493 #, fuzzy msgid "Manipulate GNUnet private ECC key files" msgstr "更改配置文件中的一个值" -#: src/util/gnunet-resolver.c:168 +#: src/util/gnunet-resolver.c:163 msgid "perform a reverse lookup" msgstr "" -#: src/util/gnunet-resolver.c:179 +#: src/util/gnunet-resolver.c:174 msgid "Use build-in GNUnet stub resolver" msgstr "" -#: src/util/gnunet-scrypt.c:242 +#: src/util/gnunet-scrypt.c:237 #, c-format msgid "Loading hostkey from `%s' failed.\n" msgstr "" -#: src/util/gnunet-scrypt.c:317 +#: src/util/gnunet-scrypt.c:312 msgid "number of bits to require for the proof of work" msgstr "" -#: src/util/gnunet-scrypt.c:322 +#: src/util/gnunet-scrypt.c:317 msgid "file with private key, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:327 +#: src/util/gnunet-scrypt.c:322 msgid "file with proof of work, otherwise default is used" msgstr "" -#: src/util/gnunet-scrypt.c:332 +#: src/util/gnunet-scrypt.c:327 msgid "time to wait between calculations" msgstr "" -#: src/util/gnunet-scrypt.c:345 +#: src/util/gnunet-scrypt.c:340 #, fuzzy msgid "Manipulate GNUnet proof of work files" msgstr "更改配置文件中的一个值" -#: src/util/gnunet-service-resolver.c:371 +#: src/util/gnunet-service-resolver.c:366 #, c-format msgid "Could not resolve `%s' (%s): %s\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/util/gnunet-service-resolver.c:460 -#: src/util/gnunet-service-resolver.c:512 +#: src/util/gnunet-service-resolver.c:455 +#: src/util/gnunet-service-resolver.c:507 #, c-format msgid "Could not find IP of host `%s': %s\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/util/gnunet-uri.c:85 +#: src/util/gnunet-uri.c:80 #, c-format msgid "No URI specified on command line\n" msgstr "" -#: src/util/gnunet-uri.c:91 +#: src/util/gnunet-uri.c:86 #, fuzzy, c-format msgid "Invalid URI: does not start with `%s'\n" msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n" -#: src/util/gnunet-uri.c:98 +#: src/util/gnunet-uri.c:93 #, c-format msgid "Invalid URI: fails to specify subsystem\n" msgstr "" -#: src/util/gnunet-uri.c:108 +#: src/util/gnunet-uri.c:103 #, c-format msgid "No handler known for subsystem `%s'\n" msgstr "" -#: src/util/gnunet-uri.c:170 +#: src/util/gnunet-uri.c:165 msgid "Perform default-actions for GNUnet URIs" msgstr "" -#: src/util/helper.c:335 +#: src/util/helper.c:330 #, fuzzy, c-format msgid "Error reading from `%s': %s\n" msgstr "创建用户出错" -#: src/util/helper.c:386 +#: src/util/helper.c:381 #, fuzzy, c-format msgid "Failed to parse inbound message from helper `%s'\n" msgstr "打开日志文件“%s”失败：%s\n" -#: src/util/helper.c:606 +#: src/util/helper.c:601 #, fuzzy, c-format msgid "Error writing to `%s': %s\n" msgstr "创建用户出错" -#: src/util/network.c:136 +#: src/util/network.c:131 #, c-format msgid "Unable to shorten unix path `%s' while keeping name unique\n" msgstr "" -#: src/util/network.c:1795 src/util/network.c:1979 +#: src/util/network.c:1790 src/util/network.c:1974 #, c-format msgid "" "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n" msgstr "" -#: src/util/os_installation.c:509 +#: src/util/os_installation.c:504 #, fuzzy, c-format msgid "" "Could not determine installation path for %s. Set `%s' environment " "variable.\n" msgstr "无法确定安装路径。请尝试设置“%s”\n" -#: src/util/os_installation.c:881 +#: src/util/os_installation.c:876 #, fuzzy, c-format msgid "Could not find binary `%s' in PATH!\n" msgstr "找不到主机“%s”的 IP：%s\n" -#: src/util/os_installation.c:922 +#: src/util/os_installation.c:917 #, c-format msgid "Binary `%s' exists, but is not SUID\n" msgstr "" -#: src/util/os_installation.c:953 +#: src/util/os_installation.c:948 #, fuzzy, c-format msgid "CreateProcess failed for binary %s (%d).\n" msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n" -#: src/util/os_installation.c:963 +#: src/util/os_installation.c:958 #, c-format msgid "GetExitCodeProcess failed for binary %s (%d).\n" msgstr "" -#: src/util/plugin.c:86 +#: src/util/plugin.c:81 #, c-format msgid "Initialization of plugin mechanism failed: %s!\n" msgstr "插件机构初始化失败：%s！\n" -#: src/util/plugin.c:151 +#: src/util/plugin.c:146 #, c-format msgid "`%s' failed to resolve method '%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:226 +#: src/util/plugin.c:221 #, c-format msgid "`%s' failed for library `%s' with error: %s\n" msgstr "" -#: src/util/plugin.c:385 +#: src/util/plugin.c:380 #, fuzzy msgid "Could not determine plugin installation path.\n" msgstr "无法确定用户界面定义文件。" -#: src/util/resolver_api.c:203 +#: src/util/resolver_api.c:198 #, c-format msgid "" "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:224 +#: src/util/resolver_api.c:219 #, c-format msgid "" "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS " "resolution will be unavailable.\n" msgstr "" -#: src/util/resolver_api.c:851 +#: src/util/resolver_api.c:846 #, c-format msgid "Timeout trying to resolve hostname `%s'.\n" msgstr "" -#: src/util/resolver_api.c:864 +#: src/util/resolver_api.c:859 #, fuzzy, c-format msgid "Timeout trying to resolve IP address `%s'.\n" msgstr "GNUnet 现在使用 IP 地址 %s。\n" -#: src/util/resolver_api.c:1048 +#: src/util/resolver_api.c:1043 msgid "Resolver not configured correctly.\n" msgstr "" -#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157 -#: src/util/resolver_api.c:1171 +#: src/util/resolver_api.c:1129 src/util/resolver_api.c:1152 +#: src/util/resolver_api.c:1166 #, fuzzy, c-format msgid "Could not resolve our FQDN: %s\n" msgstr "无法解析“%s”(%s)：%s\n" -#: src/util/service.c:1305 +#: src/util/service.c:1300 msgid "" "Could not bind to any of the ports I was supposed to, refusing to run!\n" msgstr "" -#: src/util/service.c:2093 +#: src/util/service.c:2120 #, c-format msgid "" "Processing code for message of type %u did not call " "`GNUNET_SERVICE_client_continue' after %s\n" msgstr "" -#: src/util/signal.c:89 +#: src/util/signal.c:84 #, c-format msgid "signal (%d, %p) returned %d.\n" msgstr "" -#: src/util/socks.c:597 +#: src/util/socks.c:592 #, c-format msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n" msgstr "" -#: src/util/socks.c:616 +#: src/util/socks.c:611 #, c-format msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n" msgstr "" -#: src/util/strings.c:176 +#: src/util/strings.c:171 msgid "b" msgstr "b" -#: src/util/strings.c:471 +#: src/util/strings.c:466 #, c-format msgid "Character sets requested were `%s'->`%s'\n" msgstr "" -#: src/util/strings.c:598 +#: src/util/strings.c:593 msgid "Failed to expand `$HOME': environment variable `HOME' not set" msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”" -#: src/util/strings.c:702 +#: src/util/strings.c:697 msgid "µs" msgstr "" -#: src/util/strings.c:706 +#: src/util/strings.c:701 msgid "forever" msgstr "" -#: src/util/strings.c:708 +#: src/util/strings.c:703 msgid "0 ms" msgstr "" -#: src/util/strings.c:714 +#: src/util/strings.c:709 msgid "ms" msgstr "毫秒" -#: src/util/strings.c:720 +#: src/util/strings.c:715 msgid "s" msgstr "秒" -#: src/util/strings.c:726 +#: src/util/strings.c:721 msgid "m" msgstr "分" -#: src/util/strings.c:732 +#: src/util/strings.c:727 msgid "h" msgstr "时" -#: src/util/strings.c:739 +#: src/util/strings.c:734 #, fuzzy msgid "day" msgstr " 天" -#: src/util/strings.c:741 +#: src/util/strings.c:736 #, fuzzy msgid "days" msgstr " 天" -#: src/util/strings.c:770 +#: src/util/strings.c:765 msgid "end of time" msgstr "" -#: src/util/strings.c:1272 +#: src/util/strings.c:1267 msgid "IPv6 address did not start with `['\n" msgstr "" -#: src/util/strings.c:1280 +#: src/util/strings.c:1275 msgid "IPv6 address did contain ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1286 +#: src/util/strings.c:1281 msgid "IPv6 address did contain ']' before ':' to separate port number\n" msgstr "" -#: src/util/strings.c:1293 +#: src/util/strings.c:1288 msgid "IPv6 address did contain a valid port number after the last ':'\n" msgstr "" -#: src/util/strings.c:1302 +#: src/util/strings.c:1297 #, fuzzy, c-format msgid "Invalid IPv6 address `%s': %s\n" msgstr "无效的进程优先级“%s”\n" -#: src/util/strings.c:1574 src/util/strings.c:1590 +#: src/util/strings.c:1569 src/util/strings.c:1585 msgid "Port not in range\n" msgstr "" -#: src/util/strings.c:1599 +#: src/util/strings.c:1594 #, fuzzy, c-format msgid "Malformed port policy `%s'\n" msgstr "解析配置文件“%s”失败\n" -#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761 -#: src/util/strings.c:1782 +#: src/util/strings.c:1677 src/util/strings.c:1708 src/util/strings.c:1756 +#: src/util/strings.c:1777 #, c-format msgid "Invalid format for IP: `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/util/strings.c:1739 +#: src/util/strings.c:1734 #, c-format msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)." msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。" -#: src/util/strings.c:1791 +#: src/util/strings.c:1786 #, fuzzy, c-format msgid "Invalid format: `%s'\n" msgstr "IP 格式无效：“%s”\n" -#: src/util/strings.c:1843 +#: src/util/strings.c:1838 #, c-format msgid "Invalid network notation (does not end with ';': `%s')\n" msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n" -#: src/util/strings.c:1893 +#: src/util/strings.c:1888 #, c-format msgid "Wrong format `%s' for netmask\n" msgstr "网络掩码的格式“%s”错误\n" -#: src/util/strings.c:1924 +#: src/util/strings.c:1919 #, c-format msgid "Wrong format `%s' for network\n" msgstr "网络的格式“%s”错误\n" -#: src/vpn/gnunet-service-vpn.c:540 src/vpn/gnunet-service-vpn.c:1807 +#: src/vpn/gnunet-service-vpn.c:535 src/vpn/gnunet-service-vpn.c:1802 msgid "# Active channels" msgstr "" -#: src/vpn/gnunet-service-vpn.c:599 +#: src/vpn/gnunet-service-vpn.c:594 msgid "# Messages dropped in cadet queue (overflow)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:753 +#: src/vpn/gnunet-service-vpn.c:748 msgid "# ICMP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1096 +#: src/vpn/gnunet-service-vpn.c:1091 msgid "# UDP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1255 +#: src/vpn/gnunet-service-vpn.c:1250 msgid "# TCP packets received from cadet" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1467 +#: src/vpn/gnunet-service-vpn.c:1462 #, fuzzy msgid "# Cadet channels created" msgstr "" "\n" "按任意键继续\n" -#: src/vpn/gnunet-service-vpn.c:1687 +#: src/vpn/gnunet-service-vpn.c:1682 #, c-format msgid "Protocol %u not supported, dropping\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:1826 +#: src/vpn/gnunet-service-vpn.c:1821 msgid "# Packets dropped (channel not yet online)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2006 +#: src/vpn/gnunet-service-vpn.c:2001 msgid "# ICMPv4 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2027 +#: src/vpn/gnunet-service-vpn.c:2022 msgid "# ICMPv6 packets dropped (not allowed)" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2235 +#: src/vpn/gnunet-service-vpn.c:2230 msgid "# Packets received from TUN interface" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2268 src/vpn/gnunet-service-vpn.c:2304 +#: src/vpn/gnunet-service-vpn.c:2263 src/vpn/gnunet-service-vpn.c:2299 #, c-format msgid "Packet received for unmapped destination `%s' (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2314 +#: src/vpn/gnunet-service-vpn.c:2309 msgid "Received IPv4 packet with options (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2328 +#: src/vpn/gnunet-service-vpn.c:2323 #, c-format msgid "Received packet of unknown protocol %d from TUN (dropping it)\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2367 +#: src/vpn/gnunet-service-vpn.c:2362 msgid "Failed to find unallocated IPv4 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2422 +#: src/vpn/gnunet-service-vpn.c:2417 msgid "Failed to find unallocated IPv6 address in VPN's range\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2464 src/vpn/gnunet-service-vpn.c:2686 +#: src/vpn/gnunet-service-vpn.c:2459 src/vpn/gnunet-service-vpn.c:2681 msgid "# Active destinations" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2735 +#: src/vpn/gnunet-service-vpn.c:2730 msgid "Failed to allocate IP address for new destination\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:2998 +#: src/vpn/gnunet-service-vpn.c:2993 #, fuzzy msgid "Must specify valid IPv6 address" msgstr "“%s”不可用。\n" -#: src/vpn/gnunet-service-vpn.c:3022 +#: src/vpn/gnunet-service-vpn.c:3017 msgid "Must specify valid IPv6 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3030 +#: src/vpn/gnunet-service-vpn.c:3025 msgid "IPv6 support disabled as this system does not support IPv6\n" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3043 +#: src/vpn/gnunet-service-vpn.c:3038 #, fuzzy msgid "Must specify valid IPv4 address" msgstr "“%s”不可用。\n" -#: src/vpn/gnunet-service-vpn.c:3056 +#: src/vpn/gnunet-service-vpn.c:3051 msgid "Must specify valid IPv4 mask" msgstr "" -#: src/vpn/gnunet-service-vpn.c:3066 +#: src/vpn/gnunet-service-vpn.c:3061 msgid "IPv4 support disabled as this system does not support IPv4\n" msgstr "" -#: src/vpn/gnunet-vpn.c:147 +#: src/vpn/gnunet-vpn.c:142 #, fuzzy msgid "Error creating tunnel\n" msgstr "创建用户出错" -#: src/vpn/gnunet-vpn.c:191 src/vpn/gnunet-vpn.c:222 +#: src/vpn/gnunet-vpn.c:186 src/vpn/gnunet-vpn.c:217 #, c-format msgid "Option `%s' makes no sense with option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:204 +#: src/vpn/gnunet-vpn.c:199 #, fuzzy, c-format msgid "Option `%s' or `%s' is required.\n" msgstr "%s：选项“%s”有歧义\n" -#: src/vpn/gnunet-vpn.c:216 +#: src/vpn/gnunet-vpn.c:211 #, c-format msgid "Option `%s' or `%s' is required when using option `%s'.\n" msgstr "" -#: src/vpn/gnunet-vpn.c:236 +#: src/vpn/gnunet-vpn.c:231 #, fuzzy, c-format msgid "`%s' is not a valid peer identifier.\n" msgstr "“%s”不可用。\n" -#: src/vpn/gnunet-vpn.c:256 +#: src/vpn/gnunet-vpn.c:251 #, fuzzy, c-format msgid "`%s' is not a valid IP address.\n" msgstr "“%s”不可用。\n" -#: src/vpn/gnunet-vpn.c:292 +#: src/vpn/gnunet-vpn.c:287 msgid "request that result should be an IPv4 address" msgstr "" -#: src/vpn/gnunet-vpn.c:297 +#: src/vpn/gnunet-vpn.c:292 msgid "request that result should be an IPv6 address" msgstr "" -#: src/vpn/gnunet-vpn.c:303 +#: src/vpn/gnunet-vpn.c:298 msgid "how long should the mapping be valid for new tunnels?" msgstr "" -#: src/vpn/gnunet-vpn.c:309 +#: src/vpn/gnunet-vpn.c:304 msgid "destination IP for the tunnel" msgstr "" -#: src/vpn/gnunet-vpn.c:315 +#: src/vpn/gnunet-vpn.c:310 msgid "peer offering the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:321 +#: src/vpn/gnunet-vpn.c:316 msgid "name of the service we would like to access" msgstr "" -#: src/vpn/gnunet-vpn.c:326 +#: src/vpn/gnunet-vpn.c:321 msgid "service is offered via TCP" msgstr "" -#: src/vpn/gnunet-vpn.c:331 +#: src/vpn/gnunet-vpn.c:326 msgid "service is offered via UDP" msgstr "" -#: src/vpn/gnunet-vpn.c:344 +#: src/vpn/gnunet-vpn.c:339 msgid "Setup tunnels via VPN." msgstr "" -#: src/zonemaster/gnunet-service-zonemaster.c:838 -#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416 +#: src/zonemaster/gnunet-service-zonemaster.c:833 +#: src/zonemaster/gnunet-service-zonemaster-monitor.c:411 #, fuzzy msgid "Failed to connect to the namestore!\n" msgstr "初始化“%s”服务失败。\n" -#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773 -#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791 +#: src/include/gnunet_common.h:761 src/include/gnunet_common.h:768 +#: src/include/gnunet_common.h:778 src/include/gnunet_common.h:786 #, c-format msgid "Assertion failed at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:803 +#: src/include/gnunet_common.h:798 #, c-format msgid "External protocol violation detected at %s:%d.\n" msgstr "" -#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839 +#: src/include/gnunet_common.h:825 src/include/gnunet_common.h:834 #, c-format msgid "`%s' failed on file `%s' at %s:%d with error: %s\n" msgstr "" -- cgit v1.2.3-18-g5258 From 122caec56d618d8d86d1fa83ddb38b2a6586c7c4 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Wed, 6 Jun 2018 09:58:08 +0200 Subject: fix NPE --- src/gns/gnunet-gns-proxy.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index fb02295c8e..cf1901de10 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -1965,7 +1965,7 @@ create_response (void *cls, us = MHD_lookup_connection_value (con, MHD_HEADER_KIND, MHD_HTTP_HEADER_CONTENT_LENGTH); - if ( (1 == sscanf (us, + if ( (NULL != us) && (1 == sscanf (us, "%ld", &upload_size)) && (upload_size >= 0) ) @@ -1973,6 +1973,10 @@ create_response (void *cls, curl_easy_setopt (s5r->curl, CURLOPT_INFILESIZE, upload_size); + } else { + curl_easy_setopt (s5r->curl, + CURLOPT_INFILESIZE, + upload_size); } } } -- cgit v1.2.3-18-g5258 From edc238be68955758e99da87337b984abaa656e93 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Thu, 7 Jun 2018 14:18:49 +0200 Subject: rps profiler: summarize statistics --- src/rps/gnunet-rps-profiler.c | 57 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index bda43a5887..217c2fbbc2 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -2098,6 +2098,22 @@ pre_profiler (struct RPSPeer *rps_peer, struct GNUNET_RPS_Handle *h) void write_final_stats (void){ uint32_t i; + uint64_t sum_rounds = 0; + uint64_t sum_blocks = 0; + uint64_t sum_b_mpush = 0; + uint64_t sum_b_npush = 0; + uint64_t sum_b_npull = 0; + uint64_t sum_b_mpush_npull = 0; + uint64_t sum_b_npush_npull = 0; + uint64_t sum_iss_push = 0; + uint64_t sum_iss_pull_req = 0; + uint64_t sum_iss_pull_rep = 0; + uint64_t sum_sent_push = 0; + uint64_t sum_sent_pull_req = 0; + uint64_t sum_sent_pull_rep = 0; + uint64_t sum_recv_push = 0; + uint64_t sum_recv_pull_req = 0; + uint64_t sum_recv_pull_rep = 0; for (i = 0; i < num_peers; i++) { @@ -2127,7 +2143,46 @@ void write_final_stats (void){ rps_peers[i].num_recv_push, rps_peers[i].num_recv_pull_req, rps_peers[i].num_recv_pull_rep); - } + sum_rounds += rps_peers[i].num_rounds; + sum_blocks += rps_peers[i].num_blocks; + sum_b_mpush += rps_peers[i].num_blocks_many_push; + sum_b_npush += rps_peers[i].num_blocks_no_push; + sum_b_npull += rps_peers[i].num_blocks_no_pull; + sum_b_mpush_npull += rps_peers[i].num_blocks_many_push_no_pull; + sum_b_npush_npull += rps_peers[i].num_blocks_no_push_no_pull; + sum_iss_push += rps_peers[i].num_issued_push; + sum_iss_pull_req += rps_peers[i].num_issued_pull_req; + sum_iss_pull_rep += rps_peers[i].num_issued_pull_rep; + sum_sent_push += rps_peers[i].num_sent_push; + sum_sent_pull_req += rps_peers[i].num_sent_pull_req; + sum_sent_pull_rep += rps_peers[i].num_sent_pull_rep; + sum_recv_push += rps_peers[i].num_recv_push; + sum_recv_pull_req += rps_peers[i].num_recv_pull_req; + sum_recv_pull_rep += rps_peers[i].num_recv_pull_rep; + } + to_file ("/tmp/rps/final_stats.dat", + "SUM %" + PRIu64 " %" /* rounds */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64 " %" /* blocking */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" /* issued */ + PRIu64 " %" PRIu64 " %" PRIu64 " %" /* sent */ + PRIu64 " %" PRIu64 " %" PRIu64 /* recv */, + sum_rounds, + sum_blocks, + sum_b_mpush, + sum_b_npush, + sum_b_npull, + sum_b_mpush_npull, + sum_b_npush_npull, + sum_iss_push, + sum_iss_pull_req, + sum_iss_pull_rep, + sum_sent_push, + sum_sent_pull_req, + sum_sent_pull_rep, + sum_recv_push, + sum_recv_pull_req, + sum_recv_pull_rep); } /** -- cgit v1.2.3-18-g5258 From 50e9c61954ebe7ec3bfde169249d49ac6d849687 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 15:36:53 +0200 Subject: add option to disable v6, do not pass chunked encoding along, enable bypass of cert validation --- src/gns/gnunet-gns-proxy.c | 59 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index cf1901de10..486911ec80 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -43,6 +43,15 @@ #include "gns.h" +/** + * FIXME: GnuTLS right now sometimes rejects valid certs, so as a + * VERY temporary workaround we just WARN the user instead of + * dropping the page. THIS SHOULD NOT BE USED IN PRODUCTION, + * set to 1 in production!!! FIXME!!! + */ +#define FIXED_CERT_VALIDATION_BUG 0 + + /** * Default Socks5 listen port. */ @@ -684,6 +693,11 @@ static CURLM *curl_multi; */ static struct GNUNET_GNS_Handle *gns_handle; +/** + * Disable IPv6. + */ +static int disable_v6; + /** * DLL for http/https daemons */ @@ -890,7 +904,7 @@ mhd_content_cb (void *cls, return MHD_CONTENT_READER_END_OF_STREAM; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Writing %llu/%llu bytes for %s%s\n", + "Writing %llu/%llu bytes to %s%s\n", (unsigned long long) bytes_to_copy, (unsigned long long) s5r->io_len, s5r->domain, @@ -952,8 +966,10 @@ check_ssl_certificate (struct Socks5Request *s5r) tlsinfo->backend); return GNUNET_SYSERR; } - chainp = gnutls_certificate_get_peers (tlsinfo->internals, &cert_list_size); - if ( (! chainp) || (0 == cert_list_size) ) + chainp = gnutls_certificate_get_peers (tlsinfo->internals, + &cert_list_size); + if ( (! chainp) || + (0 == cert_list_size) ) return GNUNET_SYSERR; size = sizeof (certdn); @@ -1056,11 +1072,14 @@ check_ssl_certificate (struct Socks5Request *s5r) name))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("TLS certificate subject name (%s) does not match `%s'\n"), + _("TLS certificate subject name (%s) does not match `%s': %d\n"), certdn, - name); + name, + rc); +#if FIXED_CERT_VALIDATION_BUG gnutls_x509_crt_deinit (x509_cert); return GNUNET_SYSERR; +#endif } } else @@ -1116,15 +1135,17 @@ curl_check_hdr (void *buffer, if (GNUNET_OK != check_ssl_certificate (s5r)) return 0; } - - ndup = GNUNET_strndup (buffer, bytes); - hdr_type = strtok (ndup, ":"); + ndup = GNUNET_strndup (buffer, + bytes); + hdr_type = strtok (ndup, + ":"); if (NULL == hdr_type) { GNUNET_free (ndup); return bytes; } - hdr_val = strtok (NULL, ""); + hdr_val = strtok (NULL, + ""); if (NULL == hdr_val) { GNUNET_free (ndup); @@ -1187,6 +1208,12 @@ curl_check_hdr (void *buffer, } new_location = NULL; + if (0 == strcasecmp (MHD_HTTP_HEADER_TRANSFER_ENCODING, + hdr_type)) + { + /* Ignore transfer encoding, set automatically by MHD if required */ + goto cleanup; + } if (0 == strcasecmp (MHD_HTTP_HEADER_LOCATION, hdr_type)) { @@ -1232,6 +1259,7 @@ curl_check_hdr (void *buffer, s5r->header_tail, header); } + cleanup: GNUNET_free (ndup); GNUNET_free_non_null (new_cookie_hdr); GNUNET_free_non_null (new_location); @@ -1761,7 +1789,7 @@ create_response (void *cls, return MHD_NO; } s5r->con = con; - //Fresh connection. + /* Fresh connection. */ if (SOCKS5_SOCKET_WITH_MHD == s5r->state) { /* first time here, initialize curl handle */ @@ -2984,8 +3012,10 @@ handle_gns_result (void *cls, } if (GNUNET_YES == got_ip) break; + if (GNUNET_YES == disable_v6) + break; if (GNUNET_OK != - GNUNET_NETWORK_test_pf (PF_INET)) + GNUNET_NETWORK_test_pf (PF_INET6)) break; /* FIXME: allow user to disable IPv6 per configuration option... */ got_ip = GNUNET_YES; @@ -3213,7 +3243,8 @@ do_s5r_read (void *cls) s5r->domain = GNUNET_strndup (dom_name, *dom_len); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Requested connection is to %s:%d\n", + "Requested connection is to http%s://%s:%d\n", + (HTTPS_PORT == s5r->port) ? "s" : "", s5r->domain, ntohs (*port)); s5r->state = SOCKS5_RESOLVING; @@ -3653,6 +3684,10 @@ main (int argc, NULL, gettext_noop ("pem file to use as CA"), &cafile_opt), + GNUNET_GETOPT_option_flag ('6', + "disable-ivp6", + gettext_noop ("disable use of IPv6"), + &disable_v6), GNUNET_GETOPT_OPTION_END }; -- cgit v1.2.3-18-g5258 From 3ec6a0f2b110771d09f407b47c3d56b2bcf12848 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 16:17:04 +0200 Subject: add LEHO records to DNS record sets if we know them from GNS2DNS --- src/gns/gnunet-service-gns_resolver.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index c915c616ad..809bde8f9c 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -367,6 +367,12 @@ struct GNS_ResolverHandle */ char *name; + /** + * Legacy Hostname to use if we encountered GNS2DNS record + * and thus can deduct the LEHO from that transition. + */ + char *leho; + /** * DLL of results we got from DNS. */ @@ -960,6 +966,12 @@ dns_result_parser (void *cls, af = AF_UNSPEC; break; } + if (NULL != rh->leho) + add_dns_result (rh, + GNUNET_TIME_UNIT_HOURS.rel_value_us, + GNUNET_GNSRECORD_TYPE_LEHO, + strlen (rh->leho), + rh->leho); rh->std_resolve = GNUNET_RESOLVER_ip_get (rh->name, af, DNS_LOOKUP_TIMEOUT, @@ -974,8 +986,8 @@ dns_result_parser (void *cls, /* convert from (parsed) DNS to (binary) GNS format! */ rd_count = p->num_answers + p->num_authority_records + p->num_additional_records; { - struct GNUNET_GNSRECORD_Data rd[rd_count]; - unsigned int skip; + struct GNUNET_GNSRECORD_Data rd[rd_count + 1]; /* +1 for LEHO */ + int skip; char buf[UINT16_MAX]; size_t buf_off; size_t buf_start; @@ -1099,11 +1111,23 @@ dns_result_parser (void *cls, skip++; continue; } + } /* end of for all records in answer */ + if (NULL != rh->leho) + { + rd[rd_count - skip].record_type = GNUNET_GNSRECORD_TYPE_LEHO; + rd[rd_count - skip].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; + rd[rd_count - skip].expiration_time = GNUNET_TIME_UNIT_HOURS.rel_value_us; + rd[rd_count - skip].data = rh->leho; + rd[rd_count - skip].data_size = strlen (rh->leho); + skip--; /* skip one LESS */ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding LEHO %s\n", + rh->leho); } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Returning DNS response for `%s' with %u answers\n", rh->ac_tail->label, - (unsigned int) p->num_answers); + (unsigned int) (rd_count - skip)); rh->proc (rh->proc_cls, rd_count - skip, rd); @@ -1172,6 +1196,7 @@ recursive_dns_resolution (struct GNS_ResolverHandle *rh) rh->original_dns_id = p->id; GNUNET_assert (NULL != ac->authority_info.dns_authority.dns_handle); GNUNET_assert (NULL == rh->dns_request); + rh->leho = GNUNET_strdup (ac->label); rh->dns_request = GNUNET_DNSSTUB_resolve (ac->authority_info.dns_authority.dns_handle, dns_request, dns_request_length, @@ -2830,6 +2855,7 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh) dr); GNUNET_free (dr); } + GNUNET_free_non_null (rh->leho); GNUNET_free (rh->name); GNUNET_free (rh); } -- cgit v1.2.3-18-g5258 From b29bd047910a3f0c526b99de2dd1da24c7f0a224 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 16:36:50 +0200 Subject: add -z option to gnunet-namestore-fcfsd --- doc/man/gnunet-namestore-fcfsd.1 | 19 ++++++++++--------- src/namestore/gnunet-namestore-fcfsd.c | 28 +++++++++++++++++++++------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1 index 6b13c3db40..7fc4093c2c 100644 --- a/doc/man/gnunet-namestore-fcfsd.1 +++ b/doc/man/gnunet-namestore-fcfsd.1 @@ -17,19 +17,18 @@ names to be mapped to their GNS zone. Names are made available on a First Come First Served basis (hence fcfs). Registered names do not expire. The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT". -The key of the zone in which the names are registered must be -specified under the name "ZONEKEY" in the same section. It is -possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by -starting the daemon using "gnunet\-arm \-i fcfsd" or by setting -"FORCESTART=YES" in the "fcfds" section of your configuration. + +It is possible to manage gnunet\-gns\-fcfsd using +gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i +fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your +configuration and the "-z ZONE" in as the "OPTION". An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are encouraged to register their zone with the gnunet.org FCFS authority. If you want to run your own FCFS registrar, you need to first create a -pseudonym (using "gnunet\-identity \-C NAME"), and then assign it to -be used for the "fcfsd" service using "gnunet\-identity \-e NAME \-s -fcfsd". After that, you can start the FCFSD service (possibly using +pseudonym (using "gnunet\-identity \-C NAME"), and use it with the +"-z" option. After that, you can start the FCFSD service (possibly using gnunet\-arm). .SH OPTIONS @@ -46,7 +45,9 @@ ERROR. .B .IP "\-v, \-\-version" Print GNUnet version number. - +.B +.IP "\-z EGO, \-\-zone=EGO" +Specifies for which EGO should FCFSD manage the zone. .SH BUGS Report bugs by using Mantis or by sending electronic mail to diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 0698e6d72e..e0c04e6f18 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -216,6 +216,11 @@ static struct GNUNET_IDENTITY_Operation *id_op; */ static unsigned long long port; +/** + * Name of the zone we manage. + */ +static char *zone; + /** * Task run whenever HTTP server operations are pending. @@ -629,14 +634,14 @@ lookup_block_error (void *cls) * and continue to process the result. * * @param cls the 'struct Request' we are processing - * @param zone private key of the zone; NULL on disconnect + * @param zonekey private key of the zone; NULL on disconnect * @param label label of the records; NULL on disconnect * @param rd_count number of entries in @a rd array, 0 if label was deleted * @param rd array of records with data to store */ static void lookup_block_processor (void *cls, - const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *zonekey, const char *label, unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd) @@ -645,7 +650,7 @@ lookup_block_processor (void *cls, (void) label; (void) rd; - (void) zone; + (void) zonekey; request->qe = NULL; if (0 == rd_count) { @@ -1087,9 +1092,12 @@ run (void *cls, _("Failed to connect to identity\n")); return; } - id_op = GNUNET_IDENTITY_get (identity, "fcfsd", - &identity_cb, NULL); - GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); + id_op = GNUNET_IDENTITY_get (identity, + zone, + &identity_cb, + NULL); + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, + NULL); } @@ -1104,7 +1112,13 @@ int main (int argc, char *const *argv) { - static const struct GNUNET_GETOPT_CommandLineOption options[] = { + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_option_mandatory + (GNUNET_GETOPT_option_string ('z', + "zone", + "EGO", + gettext_noop ("name of the zone that is to be managed by FCFSD"), + &zone)), GNUNET_GETOPT_OPTION_END }; int ret; -- cgit v1.2.3-18-g5258 From 20eaa2aeedcc804a14f5b5265321ad41516b11b9 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 16:42:23 +0200 Subject: add -z option to gnunet-namestore-fcfsd --- src/namestore/gnunet-namestore-fcfsd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index e0c04e6f18..3e3e598e79 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -1011,12 +1011,16 @@ identity_cb (void *cls, (void) cls; (void) ctx; - (void) name; - id_op = NULL; + if (NULL == name) + return; + if (0 != strcmp (name, + zone)) + return; if (NULL == ego) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("No ego configured for `fcfsd` subsystem\n")); + GNUNET_SCHEDULER_shutdown (); return; } fcfs_zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego); @@ -1085,17 +1089,14 @@ run (void *cls, return; } identity = GNUNET_IDENTITY_connect (cfg, - NULL, NULL); + &identity_cb, + NULL); if (NULL == identity) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to connect to identity\n")); return; } - id_op = GNUNET_IDENTITY_get (identity, - zone, - &identity_cb, - NULL); GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); } -- cgit v1.2.3-18-g5258 From 4e29ecde9b3ad3e34af359f18b6679c06b17ce78 Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Thu, 7 Jun 2018 14:42:24 +0000 Subject: glitch in the license text detected by hyazinthe, thank you! --- configure.ac | 2 +- contrib/scripts/afferify | 17 +++++++++++++++-- guix-env.scm | 2 +- src/abe/abe.c | 2 +- src/abe/test_cpabe.c | 2 +- src/arm/arm.h | 2 +- src/arm/arm_api.c | 2 +- src/arm/arm_monitor_api.c | 2 +- src/arm/gnunet-arm.c | 2 +- src/arm/gnunet-service-arm.c | 2 +- src/arm/mockup-service.c | 2 +- src/arm/test_arm_api.c | 2 +- src/arm/test_exponential_backoff.c | 2 +- src/arm/test_gnunet_service_arm.c | 2 +- src/ats-tests/ats-testing-experiment.c | 2 +- src/ats-tests/ats-testing-log.c | 2 +- src/ats-tests/ats-testing-preferences.c | 2 +- src/ats-tests/ats-testing-traffic.c | 2 +- src/ats-tests/ats-testing.c | 2 +- src/ats-tests/ats-testing.h | 2 +- src/ats-tests/gnunet-ats-sim.c | 2 +- src/ats-tests/gnunet-solver-eval.c | 2 +- src/ats-tests/perf_ats.c | 2 +- src/ats-tests/perf_ats.h | 2 +- src/ats-tests/perf_ats_logging.c | 2 +- src/ats-tool/gnunet-ats.c | 2 +- src/ats/ats.h | 2 +- src/ats/ats_api_connectivity.c | 2 +- src/ats/ats_api_performance.c | 2 +- src/ats/ats_api_scanner.c | 2 +- src/ats/ats_api_scheduling.c | 2 +- src/ats/gnunet-ats-solver-eval.c | 2 +- src/ats/gnunet-ats-solver-eval.h | 2 +- src/ats/gnunet-service-ats.c | 2 +- src/ats/gnunet-service-ats.h | 2 +- src/ats/gnunet-service-ats_addresses.c | 2 +- src/ats/gnunet-service-ats_addresses.h | 2 +- src/ats/gnunet-service-ats_connectivity.c | 2 +- src/ats/gnunet-service-ats_connectivity.h | 2 +- src/ats/gnunet-service-ats_normalization.c | 2 +- src/ats/gnunet-service-ats_normalization.h | 2 +- src/ats/gnunet-service-ats_performance.c | 2 +- src/ats/gnunet-service-ats_performance.h | 2 +- src/ats/gnunet-service-ats_plugins.c | 2 +- src/ats/gnunet-service-ats_plugins.h | 2 +- src/ats/gnunet-service-ats_preferences.c | 2 +- src/ats/gnunet-service-ats_preferences.h | 2 +- src/ats/gnunet-service-ats_reservations.c | 2 +- src/ats/gnunet-service-ats_reservations.h | 2 +- src/ats/gnunet-service-ats_scheduling.c | 2 +- src/ats/gnunet-service-ats_scheduling.h | 2 +- src/ats/perf_ats_solver.c | 2 +- src/ats/plugin_ats_mlp.c | 2 +- src/ats/plugin_ats_proportional.c | 2 +- src/ats/plugin_ats_ril.c | 2 +- src/ats/test_ats_api.c | 2 +- src/ats/test_ats_lib.c | 2 +- src/ats/test_ats_lib.h | 2 +- src/ats/test_ats_reservation_api.c | 2 +- src/auction/auction.h | 2 +- src/auction/gnunet-auction-create.c | 2 +- src/auction/gnunet-auction-info.c | 2 +- src/auction/gnunet-auction-join.c | 2 +- src/auction/gnunet-service-auction.c | 2 +- src/auction/test_auction_api.c | 2 +- src/block/bg_bf.c | 2 +- src/block/block.c | 2 +- src/block/plugin_block_template.c | 2 +- src/block/plugin_block_test.c | 2 +- src/cadet/cadet.h | 2 +- src/cadet/cadet_api.c | 2 +- src/cadet/cadet_protocol.h | 2 +- src/cadet/cadet_test_lib.c | 2 +- src/cadet/cadet_test_lib.h | 2 +- src/cadet/gnunet-cadet-profiler.c | 2 +- src/cadet/gnunet-cadet.c | 2 +- src/cadet/gnunet-service-cadet.c | 2 +- src/cadet/gnunet-service-cadet.h | 2 +- src/cadet/gnunet-service-cadet_channel.c | 2 +- src/cadet/gnunet-service-cadet_channel.h | 2 +- src/cadet/gnunet-service-cadet_connection.c | 2 +- src/cadet/gnunet-service-cadet_connection.h | 2 +- src/cadet/gnunet-service-cadet_core.c | 2 +- src/cadet/gnunet-service-cadet_core.h | 2 +- src/cadet/gnunet-service-cadet_dht.c | 2 +- src/cadet/gnunet-service-cadet_dht.h | 2 +- src/cadet/gnunet-service-cadet_hello.c | 2 +- src/cadet/gnunet-service-cadet_hello.h | 2 +- src/cadet/gnunet-service-cadet_paths.c | 2 +- src/cadet/gnunet-service-cadet_paths.h | 2 +- src/cadet/gnunet-service-cadet_peer.c | 2 +- src/cadet/gnunet-service-cadet_peer.h | 2 +- src/cadet/gnunet-service-cadet_tunnels.c | 2 +- src/cadet/gnunet-service-cadet_tunnels.h | 2 +- src/cadet/test_cadet.c | 2 +- src/cadet/test_cadet_flow.c | 2 +- src/cadet/test_cadet_local_mq.c | 2 +- src/consensus/consensus-simulation.py.in | 2 +- src/consensus/consensus.h | 2 +- src/consensus/consensus_api.c | 2 +- src/consensus/consensus_protocol.h | 2 +- src/consensus/gnunet-consensus-profiler.c | 2 +- src/consensus/gnunet-service-consensus.c | 2 +- src/consensus/plugin_block_consensus.c | 2 +- src/consensus/test_consensus_api.c | 2 +- src/conversation/conversation.h | 2 +- src/conversation/conversation_api.c | 2 +- src/conversation/conversation_api_call.c | 2 +- src/conversation/gnunet-conversation-test.c | 2 +- src/conversation/gnunet-conversation.c | 2 +- src/conversation/gnunet-helper-audio-playback-gst.c | 2 +- src/conversation/gnunet-helper-audio-playback.c | 2 +- src/conversation/gnunet-helper-audio-record-gst.c | 2 +- src/conversation/gnunet-helper-audio-record.c | 2 +- src/conversation/gnunet-service-conversation.c | 2 +- src/conversation/gnunet_gst.c | 2 +- src/conversation/gnunet_gst.h | 2 +- src/conversation/gnunet_gst_def.h | 2 +- src/conversation/gnunet_gst_test.c | 2 +- src/conversation/microphone.c | 2 +- src/conversation/plugin_gnsrecord_conversation.c | 2 +- src/conversation/speaker.c | 2 +- src/conversation/test_conversation_api.c | 2 +- src/conversation/test_conversation_api_reject.c | 2 +- src/conversation/test_conversation_api_twocalls.c | 2 +- src/core/core.h | 2 +- src/core/core_api.c | 2 +- src/core/core_api_monitor_peers.c | 2 +- src/core/gnunet-core.c | 2 +- src/core/gnunet-service-core.c | 2 +- src/core/gnunet-service-core.h | 2 +- src/core/gnunet-service-core_kx.c | 2 +- src/core/gnunet-service-core_kx.h | 2 +- src/core/gnunet-service-core_sessions.c | 2 +- src/core/gnunet-service-core_sessions.h | 2 +- src/core/gnunet-service-core_typemap.c | 2 +- src/core/gnunet-service-core_typemap.h | 2 +- src/core/test_core_api.c | 2 +- src/core/test_core_api_reliability.c | 2 +- src/core/test_core_api_send_to_self.c | 2 +- src/core/test_core_api_start_only.c | 2 +- src/core/test_core_quota_compliance.c | 2 +- src/credential/credential.h | 2 +- src/credential/credential_api.c | 2 +- src/credential/credential_misc.c | 2 +- src/credential/credential_misc.h | 2 +- src/credential/credential_serialization.c | 2 +- src/credential/credential_serialization.h | 2 +- src/credential/gnunet-credential.c | 2 +- src/credential/gnunet-service-credential.c | 2 +- src/credential/plugin_gnsrecord_credential.c | 2 +- src/credential/plugin_rest_credential.c | 2 +- src/curl/curl.c | 2 +- src/curl/curl_reschedule.c | 2 +- src/datacache/datacache.c | 2 +- src/datacache/perf_datacache.c | 2 +- src/datacache/plugin_datacache_heap.c | 2 +- src/datacache/plugin_datacache_postgres.c | 2 +- src/datacache/plugin_datacache_sqlite.c | 2 +- src/datacache/plugin_datacache_template.c | 2 +- src/datacache/test_datacache.c | 2 +- src/datacache/test_datacache_quota.c | 2 +- src/datastore/datastore.h | 2 +- src/datastore/datastore_api.c | 2 +- src/datastore/gnunet-datastore.c | 2 +- src/datastore/gnunet-service-datastore.c | 2 +- src/datastore/perf_datastore_api.c | 2 +- src/datastore/perf_plugin_datastore.c | 2 +- src/datastore/plugin_datastore_heap.c | 2 +- src/datastore/plugin_datastore_mysql.c | 2 +- src/datastore/plugin_datastore_postgres.c | 2 +- src/datastore/plugin_datastore_sqlite.c | 2 +- src/datastore/plugin_datastore_template.c | 2 +- src/datastore/test_datastore_api.c | 2 +- src/datastore/test_datastore_api_management.c | 2 +- src/datastore/test_plugin_datastore.c | 2 +- src/dht/dht.h | 2 +- src/dht/dht_api.c | 2 +- src/dht/dht_test_lib.c | 2 +- src/dht/dht_test_lib.h | 2 +- src/dht/gnunet-dht-get.c | 2 +- src/dht/gnunet-dht-monitor.c | 2 +- src/dht/gnunet-dht-put.c | 2 +- src/dht/gnunet-service-dht.c | 2 +- src/dht/gnunet-service-dht.h | 2 +- src/dht/gnunet-service-dht_clients.c | 2 +- src/dht/gnunet-service-dht_datacache.c | 2 +- src/dht/gnunet-service-dht_datacache.h | 2 +- src/dht/gnunet-service-dht_hello.c | 2 +- src/dht/gnunet-service-dht_hello.h | 2 +- src/dht/gnunet-service-dht_neighbours.c | 2 +- src/dht/gnunet-service-dht_neighbours.h | 2 +- src/dht/gnunet-service-dht_nse.c | 2 +- src/dht/gnunet-service-dht_nse.h | 2 +- src/dht/gnunet-service-dht_routing.c | 2 +- src/dht/gnunet-service-dht_routing.h | 2 +- src/dht/gnunet_dht_profiler.c | 2 +- src/dht/plugin_block_dht.c | 2 +- src/dht/test_dht_api.c | 2 +- src/dht/test_dht_monitor.c | 2 +- src/dht/test_dht_topo.c | 2 +- src/dns/dns.h | 2 +- src/dns/dns_api.c | 2 +- src/dns/dnsparser.c | 2 +- src/dns/dnsstub.c | 2 +- src/dns/gnunet-dns-monitor.c | 2 +- src/dns/gnunet-dns-redirector.c | 2 +- src/dns/gnunet-helper-dns.c | 2 +- src/dns/gnunet-service-dns.c | 2 +- src/dns/gnunet-zonewalk.c | 2 +- src/dns/plugin_block_dns.c | 2 +- src/dns/test_hexcoder.c | 2 +- src/dv/dv.h | 2 +- src/dv/dv_api.c | 2 +- src/dv/gnunet-dv.c | 2 +- src/dv/gnunet-service-dv.c | 2 +- src/dv/plugin_transport_dv.c | 2 +- src/dv/test_transport_blacklist.c | 2 +- src/dv/test_transport_dv.c | 2 +- src/exit/exit.h | 2 +- src/exit/gnunet-daemon-exit.c | 2 +- src/exit/gnunet-helper-exit-windows.c | 2 +- src/exit/gnunet-helper-exit.c | 2 +- src/fragmentation/defragmentation.c | 2 +- src/fragmentation/fragmentation.c | 2 +- src/fragmentation/fragmentation.h | 2 +- src/fragmentation/test_fragmentation.c | 2 +- src/fragmentation/test_fragmentation_parallel.c | 2 +- src/fs/fs.h | 2 +- src/fs/fs_api.c | 2 +- src/fs/fs_api.h | 2 +- src/fs/fs_directory.c | 2 +- src/fs/fs_dirmetascan.c | 2 +- src/fs/fs_download.c | 2 +- src/fs/fs_file_information.c | 2 +- src/fs/fs_getopt.c | 2 +- src/fs/fs_list_indexed.c | 2 +- src/fs/fs_misc.c | 2 +- src/fs/fs_namespace.c | 2 +- src/fs/fs_publish.c | 2 +- src/fs/fs_publish_ksk.c | 2 +- src/fs/fs_publish_ublock.c | 2 +- src/fs/fs_publish_ublock.h | 2 +- src/fs/fs_search.c | 2 +- src/fs/fs_sharetree.c | 2 +- src/fs/fs_test_lib.c | 2 +- src/fs/fs_test_lib.h | 2 +- src/fs/fs_tree.c | 2 +- src/fs/fs_tree.h | 2 +- src/fs/fs_unindex.c | 2 +- src/fs/fs_uri.c | 2 +- src/fs/gnunet-auto-share.c | 2 +- src/fs/gnunet-daemon-fsprofiler.c | 2 +- src/fs/gnunet-directory.c | 2 +- src/fs/gnunet-download.c | 2 +- src/fs/gnunet-fs-profiler.c | 2 +- src/fs/gnunet-fs.c | 2 +- src/fs/gnunet-helper-fs-publish.c | 2 +- src/fs/gnunet-publish.c | 2 +- src/fs/gnunet-search.c | 2 +- src/fs/gnunet-service-fs.c | 2 +- src/fs/gnunet-service-fs.h | 2 +- src/fs/gnunet-service-fs_cadet.h | 2 +- src/fs/gnunet-service-fs_cadet_client.c | 2 +- src/fs/gnunet-service-fs_cadet_server.c | 2 +- src/fs/gnunet-service-fs_cp.c | 2 +- src/fs/gnunet-service-fs_cp.h | 2 +- src/fs/gnunet-service-fs_indexing.c | 2 +- src/fs/gnunet-service-fs_indexing.h | 2 +- src/fs/gnunet-service-fs_pe.c | 2 +- src/fs/gnunet-service-fs_pe.h | 2 +- src/fs/gnunet-service-fs_pr.c | 2 +- src/fs/gnunet-service-fs_pr.h | 2 +- src/fs/gnunet-service-fs_push.c | 2 +- src/fs/gnunet-service-fs_push.h | 2 +- src/fs/gnunet-service-fs_put.c | 2 +- src/fs/gnunet-service-fs_put.h | 2 +- src/fs/gnunet-unindex.c | 2 +- src/fs/perf_gnunet_service_fs_p2p.c | 2 +- src/fs/perf_gnunet_service_fs_p2p_respect.c | 2 +- src/fs/plugin_block_fs.c | 2 +- src/fs/test_fs.c | 2 +- src/fs/test_fs_directory.c | 2 +- src/fs/test_fs_download.c | 2 +- src/fs/test_fs_download_persistence.c | 2 +- src/fs/test_fs_file_information.c | 2 +- src/fs/test_fs_getopt.c | 2 +- src/fs/test_fs_list_indexed.c | 2 +- src/fs/test_fs_namespace.c | 2 +- src/fs/test_fs_namespace_list_updateable.c | 2 +- src/fs/test_fs_publish.c | 2 +- src/fs/test_fs_publish_persistence.c | 2 +- src/fs/test_fs_search.c | 2 +- src/fs/test_fs_search_persistence.c | 2 +- src/fs/test_fs_search_probes.c | 2 +- src/fs/test_fs_search_with_and.c | 2 +- src/fs/test_fs_start_stop.c | 2 +- src/fs/test_fs_test_lib.c | 2 +- src/fs/test_fs_unindex.c | 2 +- src/fs/test_fs_unindex_persistence.c | 2 +- src/fs/test_fs_uri.c | 2 +- src/fs/test_gnunet_fs_idx.py.in | 2 +- src/fs/test_gnunet_fs_psd.py.in | 2 +- src/fs/test_gnunet_fs_rec.py.in | 2 +- src/fs/test_gnunet_service_fs_migration.c | 2 +- src/fs/test_gnunet_service_fs_p2p.c | 2 +- src/fs/test_plugin_block_fs.c | 2 +- src/gns/gns.h | 2 +- src/gns/gns_api.c | 2 +- src/gns/gns_api.h | 2 +- src/gns/gns_tld_api.c | 2 +- src/gns/gnunet-bcd.c | 2 +- src/gns/gnunet-dns2gns.c | 2 +- src/gns/gnunet-gns-benchmark.c | 2 +- src/gns/gnunet-gns-helper-service-w32.c | 2 +- src/gns/gnunet-gns-import.c | 2 +- src/gns/gnunet-gns-proxy.c | 2 +- src/gns/gnunet-gns.c | 2 +- src/gns/gnunet-service-gns.c | 2 +- src/gns/gnunet-service-gns.h | 2 +- src/gns/gnunet-service-gns_interceptor.c | 2 +- src/gns/gnunet-service-gns_interceptor.h | 2 +- src/gns/gnunet-service-gns_resolver.c | 2 +- src/gns/gnunet-service-gns_resolver.h | 2 +- src/gns/nss/nss_gns_query.c | 2 +- src/gns/nss/nss_gns_query.h | 2 +- src/gns/plugin_block_gns.c | 2 +- src/gns/plugin_gnsrecord_gns.c | 2 +- src/gns/plugin_rest_gns.c | 2 +- src/gns/test_gns_proxy.c | 2 +- src/gns/w32nsp-install.c | 2 +- src/gns/w32nsp-resolve.c | 2 +- src/gns/w32nsp.c | 2 +- src/gns/w32resolver.h | 2 +- src/gnsrecord/gnsrecord.c | 2 +- src/gnsrecord/gnsrecord_crypto.c | 2 +- src/gnsrecord/gnsrecord_misc.c | 2 +- src/gnsrecord/gnsrecord_serialization.c | 2 +- src/gnsrecord/perf_gnsrecord_crypto.c | 2 +- src/gnsrecord/plugin_gnsrecord_dns.c | 2 +- src/gnsrecord/test_gnsrecord_block_expiration.c | 2 +- src/gnsrecord/test_gnsrecord_crypto.c | 2 +- src/gnsrecord/test_gnsrecord_serialization.c | 2 +- src/hello/address.c | 2 +- src/hello/gnunet-hello.c | 2 +- src/hello/hello.c | 2 +- src/hello/test_friend_hello.c | 2 +- src/hello/test_hello.c | 2 +- src/hostlist/gnunet-daemon-hostlist.c | 2 +- src/hostlist/gnunet-daemon-hostlist.h | 2 +- src/hostlist/gnunet-daemon-hostlist_client.c | 2 +- src/hostlist/gnunet-daemon-hostlist_client.h | 2 +- src/hostlist/gnunet-daemon-hostlist_server.c | 2 +- src/hostlist/gnunet-daemon-hostlist_server.h | 2 +- src/hostlist/test_gnunet_daemon_hostlist.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist_learning.c | 2 +- src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 2 +- src/identity-attribute/identity_attribute.c | 2 +- src/identity-attribute/identity_attribute.h | 2 +- .../plugin_identity_attribute_gnuid.c | 2 +- src/identity-provider/gnunet-idp.c | 2 +- .../gnunet-service-identity-provider.c | 2 +- src/identity-provider/identity_provider.h | 2 +- src/identity-provider/identity_provider_api.c | 2 +- src/identity-provider/jwt.c | 2 +- .../plugin_gnsrecord_identity_provider.c | 2 +- src/identity-provider/plugin_identity_provider_sqlite.c | 2 +- src/identity-provider/plugin_rest_identity_provider.c | 2 +- src/identity-provider/plugin_rest_openid_connect.c | 2 +- src/identity/gnunet-identity.c | 2 +- src/identity/gnunet-service-identity.c | 2 +- src/identity/identity.h | 2 +- src/identity/identity_api.c | 2 +- src/identity/identity_api_lookup.c | 2 +- src/identity/plugin_rest_identity.c | 2 +- src/identity/test_identity.c | 2 +- src/identity/test_identity_defaults.c | 2 +- src/include/block_dns.h | 2 +- src/include/block_fs.h | 2 +- src/include/block_regex.h | 2 +- src/include/gnunet_abe_lib.h | 2 +- src/include/gnunet_applications.h | 2 +- src/include/gnunet_arm_service.h | 2 +- src/include/gnunet_ats_plugin.h | 2 +- src/include/gnunet_ats_service.h | 2 +- src/include/gnunet_bandwidth_lib.h | 2 +- src/include/gnunet_bio_lib.h | 2 +- src/include/gnunet_block_group_lib.h | 2 +- src/include/gnunet_block_lib.h | 2 +- src/include/gnunet_block_plugin.h | 2 +- src/include/gnunet_cadet_service.h | 2 +- src/include/gnunet_client_lib.h | 2 +- src/include/gnunet_common.h | 2 +- src/include/gnunet_configuration_lib.h | 2 +- src/include/gnunet_consensus_service.h | 2 +- src/include/gnunet_constants.h | 2 +- src/include/gnunet_container_lib.h | 2 +- src/include/gnunet_conversation_service.h | 2 +- src/include/gnunet_core_service.h | 2 +- src/include/gnunet_credential_service.h | 2 +- src/include/gnunet_crypto_lib.h | 2 +- src/include/gnunet_curl_lib.h | 2 +- src/include/gnunet_datacache_lib.h | 2 +- src/include/gnunet_datacache_plugin.h | 2 +- src/include/gnunet_datastore_plugin.h | 2 +- src/include/gnunet_datastore_service.h | 2 +- src/include/gnunet_db_lib.h | 2 +- src/include/gnunet_dht_service.h | 2 +- src/include/gnunet_disk_lib.h | 2 +- src/include/gnunet_dns_service.h | 2 +- src/include/gnunet_dnsparser_lib.h | 2 +- src/include/gnunet_dnsstub_lib.h | 2 +- src/include/gnunet_dv_service.h | 2 +- src/include/gnunet_fragmentation_lib.h | 2 +- src/include/gnunet_friends_lib.h | 2 +- src/include/gnunet_fs_service.h | 2 +- src/include/gnunet_getopt_lib.h | 2 +- src/include/gnunet_gns_service.h | 2 +- src/include/gnunet_gnsrecord_lib.h | 2 +- src/include/gnunet_gnsrecord_plugin.h | 2 +- src/include/gnunet_hello_lib.h | 2 +- src/include/gnunet_helper_lib.h | 2 +- src/include/gnunet_identity_attribute_lib.h | 2 +- src/include/gnunet_identity_attribute_plugin.h | 2 +- src/include/gnunet_identity_provider_plugin.h | 2 +- src/include/gnunet_identity_provider_service.h | 2 +- src/include/gnunet_identity_service.h | 2 +- src/include/gnunet_json_lib.h | 2 +- src/include/gnunet_jsonapi_lib.h | 2 +- src/include/gnunet_jsonapi_util.h | 2 +- src/include/gnunet_load_lib.h | 2 +- src/include/gnunet_microphone_lib.h | 2 +- src/include/gnunet_mq_lib.h | 2 +- src/include/gnunet_mst_lib.h | 2 +- src/include/gnunet_multicast_service.h | 2 +- src/include/gnunet_my_lib.h | 2 +- src/include/gnunet_mysql_lib.h | 2 +- src/include/gnunet_namecache_plugin.h | 2 +- src/include/gnunet_namecache_service.h | 2 +- src/include/gnunet_namestore_plugin.h | 2 +- src/include/gnunet_namestore_service.h | 2 +- src/include/gnunet_nat_auto_service.h | 2 +- src/include/gnunet_nat_service.h | 2 +- src/include/gnunet_nc_lib.h | 2 +- src/include/gnunet_network_lib.h | 2 +- src/include/gnunet_nse_service.h | 2 +- src/include/gnunet_op_lib.h | 2 +- src/include/gnunet_os_lib.h | 2 +- src/include/gnunet_peer_lib.h | 2 +- src/include/gnunet_peerinfo_service.h | 2 +- src/include/gnunet_peerstore_plugin.h | 2 +- src/include/gnunet_peerstore_service.h | 2 +- src/include/gnunet_plugin_lib.h | 2 +- src/include/gnunet_pq_lib.h | 2 +- src/include/gnunet_program_lib.h | 2 +- src/include/gnunet_protocols.h | 2 +- src/include/gnunet_psyc_env.h | 2 +- src/include/gnunet_psyc_message.h | 2 +- src/include/gnunet_psyc_service.h | 2 +- src/include/gnunet_psyc_slicer.h | 2 +- src/include/gnunet_psyc_util_lib.h | 2 +- src/include/gnunet_psycstore_plugin.h | 2 +- src/include/gnunet_psycstore_service.h | 2 +- src/include/gnunet_regex_service.h | 2 +- src/include/gnunet_resolver_service.h | 2 +- src/include/gnunet_rest_lib.h | 2 +- src/include/gnunet_rest_plugin.h | 2 +- src/include/gnunet_revocation_service.h | 2 +- src/include/gnunet_rps_service.h | 2 +- src/include/gnunet_scalarproduct_service.h | 2 +- src/include/gnunet_scheduler_lib.h | 2 +- src/include/gnunet_secretsharing_service.h | 2 +- src/include/gnunet_sensor_service.h | 2 +- src/include/gnunet_sensor_util_lib.h | 2 +- src/include/gnunet_sensordashboard_service.h | 2 +- src/include/gnunet_service_lib.h | 2 +- src/include/gnunet_set_service.h | 2 +- src/include/gnunet_signal_lib.h | 2 +- src/include/gnunet_signatures.h | 2 +- src/include/gnunet_social_service.h | 2 +- src/include/gnunet_socks.h | 2 +- src/include/gnunet_speaker_lib.h | 2 +- src/include/gnunet_sq_lib.h | 2 +- src/include/gnunet_statistics_service.h | 2 +- src/include/gnunet_strings_lib.h | 2 +- src/include/gnunet_testbed_logger_service.h | 2 +- src/include/gnunet_testbed_service.h | 2 +- src/include/gnunet_testing_lib.h | 2 +- src/include/gnunet_time_lib.h | 2 +- src/include/gnunet_transport_communication_service.h | 2 +- src/include/gnunet_transport_core_service.h | 2 +- src/include/gnunet_transport_hello_service.h | 2 +- src/include/gnunet_transport_manipulation_service.h | 2 +- src/include/gnunet_transport_monitor_service.h | 2 +- src/include/gnunet_transport_plugin.h | 2 +- src/include/gnunet_transport_service.h | 2 +- src/include/gnunet_tun_lib.h | 2 +- src/include/gnunet_util_lib.h | 2 +- src/include/gnunet_util_taler_wallet_lib.h | 2 +- src/include/gnunet_vpn_service.h | 2 +- src/include/platform.h | 2 +- src/include/winproc.h | 2 +- src/integration-tests/gnunet_pyexpect.py.in | 2 +- src/integration-tests/gnunet_testing.py.in | 2 +- .../test_integration_bootstrap_and_connect.py.in | 2 +- src/integration-tests/test_integration_clique.py.in | 2 +- src/integration-tests/test_integration_disconnect.py.in | 2 +- .../test_integration_disconnect_nat.py.in | 2 +- src/integration-tests/test_integration_reconnect.py.in | 2 +- .../test_integration_reconnect_nat.py.in | 2 +- src/json/json.c | 2 +- src/json/json_generator.c | 2 +- src/json/json_helper.c | 2 +- src/json/json_mhd.c | 2 +- src/json/test_json.c | 2 +- src/jsonapi/jsonapi.c | 2 +- src/jsonapi/test_jsonapi.c | 2 +- src/multicast/gnunet-multicast.c | 2 +- src/multicast/gnunet-service-multicast.c | 2 +- src/multicast/multicast.h | 2 +- src/multicast/multicast_api.c | 2 +- src/multicast/test_multicast.c | 2 +- src/multicast/test_multicast_2peers.c | 2 +- src/multicast/test_multicast_multipeer.c | 2 +- src/my/my.c | 2 +- src/my/my_query_helper.c | 2 +- src/my/my_result_helper.c | 2 +- src/my/test_my.c | 2 +- src/mysql/mysql.c | 2 +- src/namecache/gnunet-namecache.c | 2 +- src/namecache/gnunet-service-namecache.c | 2 +- src/namecache/namecache.h | 2 +- src/namecache/namecache_api.c | 2 +- src/namecache/plugin_namecache_flat.c | 2 +- src/namecache/plugin_namecache_postgres.c | 2 +- src/namecache/plugin_namecache_sqlite.c | 2 +- src/namecache/test_namecache_api_cache_block.c | 2 +- src/namecache/test_plugin_namecache.c | 2 +- src/namestore/gnunet-namestore-fcfsd.c | 2 +- src/namestore/gnunet-namestore.c | 2 +- src/namestore/gnunet-service-namestore.c | 2 +- src/namestore/gnunet-zoneimport.c | 2 +- src/namestore/namestore.h | 2 +- src/namestore/namestore_api.c | 2 +- src/namestore/namestore_api_monitor.c | 2 +- src/namestore/perf_namestore_api_zone_iteration.c | 2 +- src/namestore/plugin_namestore_flat.c | 2 +- src/namestore/plugin_namestore_postgres.c | 2 +- src/namestore/plugin_namestore_sqlite.c | 2 +- src/namestore/plugin_rest_namestore.c | 2 +- src/namestore/test_namestore_api_lookup_nick.c | 2 +- src/namestore/test_namestore_api_lookup_private.c | 2 +- src/namestore/test_namestore_api_lookup_public.c | 2 +- src/namestore/test_namestore_api_lookup_shadow.c | 2 +- src/namestore/test_namestore_api_lookup_shadow_filter.c | 2 +- src/namestore/test_namestore_api_monitoring.c | 2 +- src/namestore/test_namestore_api_monitoring_existing.c | 2 +- src/namestore/test_namestore_api_remove.c | 2 +- .../test_namestore_api_remove_not_existing_record.c | 2 +- src/namestore/test_namestore_api_store.c | 2 +- src/namestore/test_namestore_api_store_update.c | 2 +- src/namestore/test_namestore_api_zone_iteration.c | 2 +- src/namestore/test_namestore_api_zone_iteration_nick.c | 2 +- .../test_namestore_api_zone_iteration_specific_zone.c | 2 +- src/namestore/test_namestore_api_zone_iteration_stop.c | 2 +- src/namestore/test_namestore_api_zone_to_name.c | 2 +- src/namestore/test_plugin_namestore.c | 2 +- src/nat-auto/gnunet-nat-auto.c | 2 +- src/nat-auto/gnunet-nat-auto_legacy.c | 2 +- src/nat-auto/gnunet-nat-server.c | 2 +- src/nat-auto/gnunet-service-nat-auto.c | 2 +- src/nat-auto/gnunet-service-nat-auto_legacy.c | 2 +- src/nat-auto/nat-auto.h | 2 +- src/nat-auto/nat_auto_api.c | 2 +- src/nat-auto/nat_auto_api_test.c | 2 +- src/nat/gnunet-helper-nat-client-windows.c | 2 +- src/nat/gnunet-helper-nat-client.c | 2 +- src/nat/gnunet-helper-nat-server-windows.c | 2 +- src/nat/gnunet-helper-nat-server.c | 2 +- src/nat/gnunet-nat.c | 2 +- src/nat/gnunet-service-nat.c | 2 +- src/nat/gnunet-service-nat.h | 2 +- src/nat/gnunet-service-nat_externalip.c | 2 +- src/nat/gnunet-service-nat_externalip.h | 2 +- src/nat/gnunet-service-nat_helper.c | 2 +- src/nat/gnunet-service-nat_helper.h | 2 +- src/nat/gnunet-service-nat_mini.c | 2 +- src/nat/gnunet-service-nat_mini.h | 2 +- src/nat/gnunet-service-nat_stun.c | 2 +- src/nat/gnunet-service-nat_stun.h | 2 +- src/nat/nat.h | 2 +- src/nat/nat_api.c | 2 +- src/nat/nat_api_stun.c | 2 +- src/nat/nat_stun.h | 2 +- src/nat/test_nat.c | 2 +- src/nat/test_nat_mini.c | 2 +- src/nat/test_nat_test.c | 2 +- src/nat/test_stun.c | 2 +- src/nse/gnunet-nse-profiler.c | 2 +- src/nse/gnunet-nse.c | 2 +- src/nse/gnunet-service-nse.c | 2 +- src/nse/nse.h | 2 +- src/nse/nse_api.c | 2 +- src/nse/perf_kdf.c | 2 +- src/nse/test_nse_api.c | 2 +- src/nse/test_nse_multipeer.c | 2 +- src/peerinfo-tool/gnunet-peerinfo.c | 2 +- src/peerinfo-tool/gnunet-peerinfo_plugins.c | 2 +- src/peerinfo-tool/gnunet-peerinfo_plugins.h | 2 +- src/peerinfo-tool/test_gnunet_peerinfo.py.in | 2 +- src/peerinfo/gnunet-service-peerinfo.c | 2 +- src/peerinfo/peerinfo.h | 2 +- src/peerinfo/peerinfo_api.c | 2 +- src/peerinfo/peerinfo_api_notify.c | 2 +- src/peerinfo/perf_peerinfo_api.c | 2 +- src/peerinfo/test_peerinfo_api.c | 2 +- src/peerinfo/test_peerinfo_api_friend_only.c | 2 +- src/peerinfo/test_peerinfo_api_notify_friend_only.c | 2 +- src/peerinfo/test_peerinfo_shipped_hellos.c | 2 +- src/peerstore/gnunet-peerstore.c | 2 +- src/peerstore/gnunet-service-peerstore.c | 2 +- src/peerstore/peerstore.h | 2 +- src/peerstore/peerstore_api.c | 2 +- src/peerstore/peerstore_common.c | 2 +- src/peerstore/peerstore_common.h | 2 +- src/peerstore/perf_peerstore_store.c | 2 +- src/peerstore/plugin_peerstore_flat.c | 2 +- src/peerstore/plugin_peerstore_sqlite.c | 2 +- src/peerstore/test_peerstore_api_iterate.c | 2 +- src/peerstore/test_peerstore_api_store.c | 2 +- src/peerstore/test_peerstore_api_sync.c | 2 +- src/peerstore/test_peerstore_api_watch.c | 2 +- src/peerstore/test_plugin_peerstore.c | 2 +- src/pq/pq.c | 2 +- src/pq/pq_connect.c | 2 +- src/pq/pq_eval.c | 2 +- src/pq/pq_exec.c | 2 +- src/pq/pq_prepare.c | 2 +- src/pq/pq_query_helper.c | 2 +- src/pq/pq_result_helper.c | 2 +- src/pq/test_pq.c | 2 +- src/psyc/gnunet-service-psyc.c | 2 +- src/psyc/psyc.h | 2 +- src/psyc/psyc_api.c | 2 +- src/psyc/psyc_test_lib.h | 2 +- src/psyc/test_psyc.c | 2 +- src/psyc/test_psyc2.c | 2 +- src/psyc/test_psyc_api_join.c | 2 +- src/psycstore/gnunet-service-psycstore.c | 2 +- src/psycstore/plugin_psycstore_mysql.c | 2 +- src/psycstore/plugin_psycstore_postgres.c | 2 +- src/psycstore/plugin_psycstore_sqlite.c | 2 +- src/psycstore/psycstore.h | 2 +- src/psycstore/psycstore_api.c | 2 +- src/psycstore/test_plugin_psycstore.c | 2 +- src/psycstore/test_psycstore.c | 2 +- src/psycutil/psyc_env.c | 2 +- src/psycutil/psyc_message.c | 2 +- src/psycutil/psyc_slicer.c | 2 +- src/psycutil/test_psyc_env.c | 2 +- src/pt/gnunet-daemon-pt.c | 2 +- src/pt/test_gns_vpn.c | 2 +- src/pt/test_gnunet_vpn.c | 2 +- src/regex/gnunet-daemon-regexprofiler.c | 2 +- src/regex/gnunet-regex-profiler.c | 2 +- src/regex/gnunet-regex-simulation-profiler.c | 2 +- src/regex/gnunet-service-regex.c | 2 +- src/regex/perf-regex.c | 2 +- src/regex/plugin_block_regex.c | 2 +- src/regex/regex_api_announce.c | 2 +- src/regex/regex_api_search.c | 2 +- src/regex/regex_block_lib.c | 2 +- src/regex/regex_block_lib.h | 2 +- src/regex/regex_internal.c | 2 +- src/regex/regex_internal.h | 2 +- src/regex/regex_internal_dht.c | 2 +- src/regex/regex_internal_lib.h | 2 +- src/regex/regex_ipc.h | 2 +- src/regex/regex_test_graph.c | 2 +- src/regex/regex_test_lib.c | 2 +- src/regex/regex_test_lib.h | 2 +- src/regex/regex_test_random.c | 2 +- src/regex/test_regex_api.c | 2 +- src/regex/test_regex_eval_api.c | 2 +- src/regex/test_regex_graph_api.c | 2 +- src/regex/test_regex_integration.c | 2 +- src/regex/test_regex_iterate_api.c | 2 +- src/regex/test_regex_proofs.c | 2 +- src/rest/gnunet-rest-server.c | 2 +- src/rest/rest.c | 2 +- src/revocation/gnunet-revocation.c | 2 +- src/revocation/gnunet-service-revocation.c | 2 +- src/revocation/plugin_block_revocation.c | 2 +- src/revocation/revocation.h | 2 +- src/revocation/revocation_api.c | 2 +- src/revocation/test_local_revocation.py.in | 2 +- src/revocation/test_revocation.c | 2 +- src/rps/gnunet-rps-profiler.c | 2 +- src/rps/gnunet-rps.c | 2 +- src/rps/gnunet-service-rps.c | 2 +- src/rps/gnunet-service-rps_custommap.c | 2 +- src/rps/gnunet-service-rps_custommap.h | 2 +- src/rps/gnunet-service-rps_sampler.c | 2 +- src/rps/gnunet-service-rps_sampler.h | 2 +- src/rps/gnunet-service-rps_sampler_elem.c | 2 +- src/rps/gnunet-service-rps_sampler_elem.h | 2 +- src/rps/gnunet-service-rps_view.c | 2 +- src/rps/gnunet-service-rps_view.h | 2 +- src/rps/rps-test_util.c | 2 +- src/rps/rps-test_util.h | 2 +- src/rps/rps.h | 2 +- src/rps/rps_api.c | 2 +- src/rps/test_rps.c | 2 +- src/rps/test_rps_api.c | 2 +- src/rps/test_service_rps_custommap.c | 2 +- src/rps/test_service_rps_sampler_elem.c | 2 +- src/rps/test_service_rps_view.c | 2 +- src/scalarproduct/gnunet-scalarproduct.c | 2 +- src/scalarproduct/gnunet-service-scalarproduct-ecc.h | 2 +- .../gnunet-service-scalarproduct-ecc_alice.c | 2 +- .../gnunet-service-scalarproduct-ecc_bob.c | 2 +- src/scalarproduct/gnunet-service-scalarproduct.h | 2 +- src/scalarproduct/gnunet-service-scalarproduct_alice.c | 2 +- src/scalarproduct/gnunet-service-scalarproduct_bob.c | 2 +- src/scalarproduct/scalarproduct.h | 2 +- src/scalarproduct/scalarproduct_api.c | 2 +- src/scalarproduct/test_ecc_scalarproduct.c | 2 +- src/secretsharing/gnunet-secretsharing-profiler.c | 2 +- src/secretsharing/gnunet-service-secretsharing.c | 2 +- src/secretsharing/secretsharing.h | 2 +- src/secretsharing/secretsharing_api.c | 2 +- src/secretsharing/secretsharing_common.c | 2 +- src/secretsharing/secretsharing_protocol.h | 2 +- src/secretsharing/test_secretsharing_api.c | 2 +- src/set/gnunet-service-set.c | 2 +- src/set/gnunet-service-set.h | 2 +- src/set/gnunet-service-set_intersection.c | 2 +- src/set/gnunet-service-set_intersection.h | 2 +- src/set/gnunet-service-set_protocol.h | 2 +- src/set/gnunet-service-set_union.c | 2 +- src/set/gnunet-service-set_union.h | 2 +- src/set/gnunet-service-set_union_strata_estimator.c | 2 +- src/set/gnunet-service-set_union_strata_estimator.h | 2 +- src/set/gnunet-set-ibf-profiler.c | 2 +- src/set/gnunet-set-profiler.c | 2 +- src/set/ibf.c | 2 +- src/set/ibf.h | 2 +- src/set/ibf_sim.c | 2 +- src/set/plugin_block_set_test.c | 2 +- src/set/set.h | 2 +- src/set/set_api.c | 2 +- src/set/test_set_api.c | 2 +- src/set/test_set_intersection_result_full.c | 2 +- src/set/test_set_union_copy.c | 2 +- src/set/test_set_union_result_symmetric.c | 2 +- src/social/gnunet-service-social.c | 2 +- src/social/gnunet-social.c | 2 +- src/social/social.h | 2 +- src/social/social_api.c | 2 +- src/social/test_social.c | 2 +- src/sq/sq.c | 2 +- src/sq/sq_exec.c | 2 +- src/sq/sq_prepare.c | 2 +- src/sq/sq_query_helper.c | 2 +- src/sq/sq_result_helper.c | 2 +- src/sq/test_sq.c | 2 +- src/statistics/gnunet-service-statistics.c | 2 +- src/statistics/gnunet-statistics.c | 2 +- src/statistics/statistics.h | 2 +- src/statistics/statistics_api.c | 2 +- src/statistics/test_statistics_api.c | 2 +- src/statistics/test_statistics_api_loop.c | 2 +- src/statistics/test_statistics_api_watch.c | 2 +- src/statistics/test_statistics_api_watch_zero_value.c | 2 +- src/template/gnunet-service-template.c | 2 +- src/template/gnunet-template.c | 2 +- src/template/test_template_api.c | 2 +- src/testbed-logger/gnunet-service-testbed-logger.c | 2 +- src/testbed-logger/test_testbed_logger_api.c | 2 +- src/testbed-logger/testbed_logger_api.c | 2 +- src/testbed/buildvars.py.in | 2 +- src/testbed/generate-underlay-topology.c | 2 +- src/testbed/gnunet-daemon-latency-logger.c | 2 +- src/testbed/gnunet-daemon-testbed-blacklist.c | 2 +- src/testbed/gnunet-daemon-testbed-underlay.c | 2 +- src/testbed/gnunet-helper-testbed.c | 2 +- src/testbed/gnunet-service-test-barriers.c | 2 +- src/testbed/gnunet-service-testbed.c | 2 +- src/testbed/gnunet-service-testbed.h | 2 +- src/testbed/gnunet-service-testbed_barriers.c | 2 +- src/testbed/gnunet-service-testbed_barriers.h | 2 +- src/testbed/gnunet-service-testbed_cache.c | 2 +- src/testbed/gnunet-service-testbed_connectionpool.c | 2 +- src/testbed/gnunet-service-testbed_connectionpool.h | 2 +- src/testbed/gnunet-service-testbed_cpustatus.c | 2 +- src/testbed/gnunet-service-testbed_links.c | 2 +- src/testbed/gnunet-service-testbed_links.h | 2 +- src/testbed/gnunet-service-testbed_meminfo.c | 2 +- src/testbed/gnunet-service-testbed_meminfo.h | 2 +- src/testbed/gnunet-service-testbed_oc.c | 2 +- src/testbed/gnunet-service-testbed_peers.c | 2 +- src/testbed/gnunet-testbed-profiler.c | 2 +- src/testbed/test_gnunet_helper_testbed.c | 2 +- src/testbed/test_testbed_api.c | 2 +- src/testbed/test_testbed_api_2peers_1controller.c | 2 +- src/testbed/test_testbed_api_3peers_3controllers.c | 2 +- src/testbed/test_testbed_api_barriers.c | 2 +- src/testbed/test_testbed_api_controllerlink.c | 2 +- src/testbed/test_testbed_api_hosts.c | 2 +- src/testbed/test_testbed_api_operations.c | 2 +- src/testbed/test_testbed_api_peer_reconfiguration.c | 2 +- src/testbed/test_testbed_api_peers_manage_services.c | 2 +- src/testbed/test_testbed_api_sd.c | 2 +- src/testbed/test_testbed_api_statistics.c | 2 +- src/testbed/test_testbed_api_test.c | 2 +- src/testbed/test_testbed_api_test_timeout.c | 2 +- src/testbed/test_testbed_api_testbed_run.c | 2 +- src/testbed/test_testbed_api_topology.c | 2 +- src/testbed/test_testbed_api_topology_clique.c | 2 +- src/testbed/test_testbed_underlay.c | 2 +- src/testbed/testbed.h | 2 +- src/testbed/testbed_api.c | 2 +- src/testbed/testbed_api.h | 2 +- src/testbed/testbed_api_barriers.c | 2 +- src/testbed/testbed_api_hosts.c | 2 +- src/testbed/testbed_api_hosts.h | 2 +- src/testbed/testbed_api_operations.c | 2 +- src/testbed/testbed_api_operations.h | 2 +- src/testbed/testbed_api_peers.c | 2 +- src/testbed/testbed_api_peers.h | 2 +- src/testbed/testbed_api_sd.c | 2 +- src/testbed/testbed_api_sd.h | 2 +- src/testbed/testbed_api_services.c | 2 +- src/testbed/testbed_api_statistics.c | 2 +- src/testbed/testbed_api_test.c | 2 +- src/testbed/testbed_api_testbed.c | 2 +- src/testbed/testbed_api_topology.c | 2 +- src/testbed/testbed_api_topology.h | 2 +- src/testbed/testbed_api_underlay.c | 2 +- src/testbed/testbed_helper.h | 2 +- src/testing/gnunet-testing.c | 2 +- src/testing/test_testing_peerstartup.c | 2 +- src/testing/test_testing_peerstartup2.c | 2 +- src/testing/test_testing_portreservation.c | 2 +- src/testing/test_testing_servicestartup.c | 2 +- src/testing/test_testing_sharedservices.c | 2 +- src/testing/testing.c | 2 +- src/topology/friends.c | 2 +- src/topology/gnunet-daemon-topology.c | 2 +- src/topology/test_gnunet_daemon_topology.c | 2 +- src/transport/gnunet-helper-transport-bluetooth.c | 2 +- src/transport/gnunet-helper-transport-wlan-dummy.c | 2 +- src/transport/gnunet-helper-transport-wlan.c | 2 +- src/transport/gnunet-service-transport.c | 2 +- src/transport/gnunet-service-transport.h | 2 +- src/transport/gnunet-service-transport_ats.c | 2 +- src/transport/gnunet-service-transport_ats.h | 2 +- src/transport/gnunet-service-transport_hello.c | 2 +- src/transport/gnunet-service-transport_hello.h | 2 +- src/transport/gnunet-service-transport_manipulation.c | 2 +- src/transport/gnunet-service-transport_manipulation.h | 2 +- src/transport/gnunet-service-transport_neighbours.c | 2 +- src/transport/gnunet-service-transport_neighbours.h | 2 +- src/transport/gnunet-service-transport_plugins.c | 2 +- src/transport/gnunet-service-transport_plugins.h | 2 +- src/transport/gnunet-service-transport_validation.c | 2 +- src/transport/gnunet-service-transport_validation.h | 2 +- src/transport/gnunet-transport-certificate-creation.c | 2 +- src/transport/gnunet-transport-profiler.c | 2 +- src/transport/gnunet-transport-wlan-receiver.c | 2 +- src/transport/gnunet-transport-wlan-sender.c | 2 +- src/transport/gnunet-transport.c | 2 +- src/transport/plugin_transport_http.h | 2 +- src/transport/plugin_transport_http_client.c | 2 +- src/transport/plugin_transport_http_common.c | 2 +- src/transport/plugin_transport_http_common.h | 2 +- src/transport/plugin_transport_http_server.c | 2 +- src/transport/plugin_transport_smtp.c | 2 +- src/transport/plugin_transport_tcp.c | 2 +- src/transport/plugin_transport_template.c | 2 +- src/transport/plugin_transport_udp.c | 2 +- src/transport/plugin_transport_udp.h | 2 +- src/transport/plugin_transport_udp_broadcasting.c | 2 +- src/transport/plugin_transport_unix.c | 2 +- src/transport/plugin_transport_wlan.c | 2 +- src/transport/plugin_transport_wlan.h | 2 +- src/transport/plugin_transport_xt.c | 2 +- src/transport/plugin_transport_xu.c | 2 +- src/transport/plugin_transport_xu.h | 2 +- src/transport/tcp_connection_legacy.c | 2 +- src/transport/tcp_server_legacy.c | 2 +- src/transport/tcp_server_mst_legacy.c | 2 +- src/transport/tcp_service_legacy.c | 2 +- src/transport/test_http_common.c | 2 +- src/transport/test_plugin_transport.c | 2 +- src/transport/test_quota_compliance.c | 2 +- src/transport/test_transport_address_switch.c | 2 +- src/transport/test_transport_api.c | 2 +- src/transport/test_transport_api_blacklisting.c | 2 +- src/transport/test_transport_api_disconnect.c | 2 +- src/transport/test_transport_api_limited_sockets.c | 2 +- src/transport/test_transport_api_manipulation_cfg.c | 2 +- .../test_transport_api_manipulation_recv_tcp.c | 2 +- .../test_transport_api_manipulation_send_tcp.c | 2 +- src/transport/test_transport_api_monitor_peers.c | 2 +- src/transport/test_transport_api_reliability.c | 2 +- src/transport/test_transport_api_restart_reconnect.c | 2 +- src/transport/test_transport_api_timeout.c | 2 +- src/transport/test_transport_blacklisting.c | 2 +- src/transport/test_transport_testing_restart.c | 2 +- src/transport/test_transport_testing_startstop.c | 2 +- src/transport/transport-testing-filenames.c | 2 +- src/transport/transport-testing-loggers.c | 2 +- src/transport/transport-testing-main.c | 2 +- src/transport/transport-testing-send.c | 2 +- src/transport/transport-testing.c | 2 +- src/transport/transport-testing.h | 2 +- src/transport/transport.h | 2 +- src/transport/transport_api_address_to_string.c | 2 +- src/transport/transport_api_blacklist.c | 2 +- src/transport/transport_api_core.c | 2 +- src/transport/transport_api_hello_get.c | 2 +- src/transport/transport_api_manipulation.c | 2 +- src/transport/transport_api_monitor_peers.c | 2 +- src/transport/transport_api_monitor_plugins.c | 2 +- src/transport/transport_api_offer_hello.c | 2 +- src/tun/regex.c | 2 +- src/tun/test_regex.c | 2 +- src/tun/test_tun.c | 2 +- src/tun/tun.c | 2 +- src/util/bandwidth.c | 2 +- src/util/bio.c | 2 +- src/util/client.c | 2 +- src/util/common_allocation.c | 2 +- src/util/common_endian.c | 2 +- src/util/common_logging.c | 2 +- src/util/configuration.c | 2 +- src/util/configuration_loader.c | 2 +- src/util/container_bloomfilter.c | 2 +- src/util/container_heap.c | 2 +- src/util/container_meta_data.c | 2 +- src/util/container_multihashmap.c | 2 +- src/util/container_multihashmap32.c | 2 +- src/util/container_multipeermap.c | 2 +- src/util/container_multishortmap.c | 2 +- src/util/crypto_abe.c | 2 +- src/util/crypto_bug.c | 2 +- src/util/crypto_crc.c | 2 +- src/util/crypto_ecc.c | 2 +- src/util/crypto_ecc_dlog.c | 2 +- src/util/crypto_ecc_setup.c | 2 +- src/util/crypto_hash.c | 2 +- src/util/crypto_hash_file.c | 2 +- src/util/crypto_kdf.c | 2 +- src/util/crypto_mpi.c | 2 +- src/util/crypto_paillier.c | 2 +- src/util/crypto_random.c | 2 +- src/util/crypto_rsa.c | 2 +- src/util/crypto_symmetric.c | 2 +- src/util/disk.c | 2 +- src/util/disk.h | 2 +- src/util/getopt_helpers.c | 2 +- src/util/gnunet-config.c | 2 +- src/util/gnunet-ecc.c | 2 +- src/util/gnunet-helper-w32-console.c | 2 +- src/util/gnunet-helper-w32-console.h | 2 +- src/util/gnunet-resolver.c | 2 +- src/util/gnunet-scrypt.c | 2 +- src/util/gnunet-service-resolver.c | 2 +- src/util/gnunet-uri.c | 2 +- src/util/helper.c | 2 +- src/util/load.c | 2 +- src/util/mq.c | 2 +- src/util/mst.c | 2 +- src/util/nc.c | 2 +- src/util/network.c | 2 +- src/util/op.c | 2 +- src/util/os_installation.c | 2 +- src/util/os_network.c | 2 +- src/util/os_priority.c | 2 +- src/util/peer.c | 2 +- src/util/perf_crypto_asymmetric.c | 2 +- src/util/perf_crypto_ecc_dlog.c | 2 +- src/util/perf_crypto_hash.c | 2 +- src/util/perf_crypto_paillier.c | 2 +- src/util/perf_crypto_rsa.c | 2 +- src/util/perf_crypto_symmetric.c | 2 +- src/util/perf_malloc.c | 2 +- src/util/plugin.c | 2 +- src/util/program.c | 2 +- src/util/resolver.h | 2 +- src/util/resolver_api.c | 2 +- src/util/scheduler.c | 2 +- src/util/service.c | 2 +- src/util/signal.c | 2 +- src/util/socks.c | 2 +- src/util/speedup.c | 2 +- src/util/speedup.h | 2 +- src/util/strings.c | 2 +- src/util/test_bio.c | 2 +- src/util/test_client.c | 2 +- src/util/test_common_allocation.c | 2 +- src/util/test_common_endian.c | 2 +- src/util/test_common_logging.c | 2 +- src/util/test_common_logging_dummy.c | 2 +- src/util/test_common_logging_runtime_loglevels.c | 2 +- src/util/test_configuration.c | 2 +- src/util/test_container_bloomfilter.c | 2 +- src/util/test_container_dll.c | 2 +- src/util/test_container_heap.c | 2 +- src/util/test_container_meta_data.c | 2 +- src/util/test_container_multihashmap.c | 2 +- src/util/test_container_multihashmap32.c | 2 +- src/util/test_container_multipeermap.c | 2 +- src/util/test_crypto_crc.c | 2 +- src/util/test_crypto_ecc_dlog.c | 2 +- src/util/test_crypto_ecdh_eddsa.c | 2 +- src/util/test_crypto_ecdhe.c | 2 +- src/util/test_crypto_ecdsa.c | 2 +- src/util/test_crypto_eddsa.c | 2 +- src/util/test_crypto_hash.c | 2 +- src/util/test_crypto_hash_context.c | 2 +- src/util/test_crypto_paillier.c | 2 +- src/util/test_crypto_random.c | 2 +- src/util/test_crypto_rsa.c | 2 +- src/util/test_crypto_symmetric.c | 2 +- src/util/test_disk.c | 2 +- src/util/test_getopt.c | 2 +- src/util/test_mq.c | 2 +- src/util/test_os_network.c | 2 +- src/util/test_os_start_process.c | 2 +- src/util/test_peer.c | 2 +- src/util/test_plugin.c | 2 +- src/util/test_plugin_plug.c | 2 +- src/util/test_program.c | 2 +- src/util/test_resolver_api.c | 2 +- src/util/test_scheduler.c | 2 +- src/util/test_scheduler_delay.c | 2 +- src/util/test_service.c | 2 +- src/util/test_socks.c | 2 +- src/util/test_speedup.c | 2 +- src/util/test_strings.c | 2 +- src/util/test_strings_to_data.c | 2 +- src/util/test_time.c | 2 +- src/util/time.c | 2 +- src/util/win.c | 2 +- src/util/winproc.c | 2 +- src/vpn/gnunet-helper-vpn-windows.c | 2 +- src/vpn/gnunet-helper-vpn.c | 2 +- src/vpn/gnunet-service-vpn.c | 2 +- src/vpn/gnunet-vpn.c | 2 +- src/vpn/vpn.h | 2 +- src/vpn/vpn_api.c | 2 +- src/zonemaster/gnunet-service-zonemaster-monitor.c | 2 +- src/zonemaster/gnunet-service-zonemaster.c | 2 +- 1055 files changed, 1069 insertions(+), 1056 deletions(-) diff --git a/configure.ac b/configure.ac index c2659351dd..b019813ea7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # (C) 2001--2018 GNUnet e.V. # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/contrib/scripts/afferify b/contrib/scripts/afferify index 188b66c640..7bd7dbd9f7 100755 --- a/contrib/scripts/afferify +++ b/contrib/scripts/afferify @@ -43,6 +43,9 @@ sub wanted { # Debugging: What's inside the file we just read? # print STDERR '> ', $_; +if (0) { +# This code did the initial conversion. We ifdef it out. + # Good idea to have the text start with "GNUnet" rather than "This program" if ( s#GNUnet is free software; you can redistribute it and/or modify it under the#GNUnet is free software: you can redistribute it and/or modify it# ) { # Whoever had the idea of reformatting the GPL license text... @@ -52,7 +55,7 @@ sub wanted { # to read perl code: if regexps appear without any # context, it means they are applied to the default # variable being '$_'. - return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU General Public License as published#; + return unless s#terms of the GNU General Public License as published by the Free Software#under the terms of the GNU Affero General Public License as published#; return unless s#^(\W*\s+)Foundation; either version \d, or \(at your option\) any later version\.#\1by the Free Software Foundation, either version 3 of the License,\n\1or (at your option) any later version.#m; return unless s#GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY#GNUnet is distributed in the hope that it will be useful, but#; return unless s#WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR#WITHOUT ANY WARRANTY; without even the implied warranty of#; @@ -64,7 +67,7 @@ sub wanted { print STDERR "\nTrying regular style on $name\t"; # Patterns are designed to also match some typos and substitutions. - return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU General Public License as published#; + return unless s#it under the terms of the GNU General Public Lice\w+ as published#under the terms of the GNU Affero General Public License as published#; return unless s#by the Free Software Foundation; either version \d, or \(at your#by the Free Software Foundation, either version 3 of the License,#; return unless s#option\) any later version\.#or (at your option) any later version.#; return unless s#General Public Lice\w+ for more details\.#Affero General Public License for more details.#; @@ -72,6 +75,16 @@ sub wanted { } print STDERR "OK"; +} else { +# This is the code in actual & current use: + + return unless m#GNUnet is free software: you can redistribute it and/or modify it#; + print STDERR "\nTrying $name\t"; + # There was a mistake in the replacement text! + return unless s#under the terms of the GNU General Public License as published#under the terms of the GNU Affero General Public License as published#; + print STDERR "FIXED"; +} + # We directly overwrite the original file in the # assumption that we're in a healthy revertible git. open(O, '>', $f) or die "Cannot overwrite $f"; diff --git a/guix-env.scm b/guix-env.scm index bef9b23d37..362c63830b 100644 --- a/guix-env.scm +++ b/guix-env.scm @@ -2,7 +2,7 @@ ;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V. ;;; ;;; GNUnet is free software: you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published +;;; under the terms of the GNU Affero General Public License as published ;;; by the Free Software Foundation, either version 3 of the License, ;;; or (at your option) any later version. ;;; diff --git a/src/abe/abe.c b/src/abe/abe.c index a785e5159b..2405afb2d3 100644 --- a/src/abe/abe.c +++ b/src/abe/abe.c @@ -3,7 +3,7 @@ (and other contributing authors) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c index 1a5dfa4119..90847b0e6a 100644 --- a/src/abe/test_cpabe.c +++ b/src/abe/test_cpabe.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/arm.h b/src/arm/arm.h index 9e55ef5d95..fb7649adbd 100644 --- a/src/arm/arm.h +++ b/src/arm/arm.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 8783674f19..a8ff49609a 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c index 4c449f1a5a..0f52eea5c9 100644 --- a/src/arm/arm_monitor_api.c +++ b/src/arm/arm_monitor_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index c5a4ea10ff..97eea62492 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 78a0b48654..a4440f7cb8 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2011, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c index 2631e5a2cb..7d8734aa5a 100644 --- a/src/arm/mockup-service.c +++ b/src/arm/mockup-service.c @@ -3,7 +3,7 @@ Copyright (C) 2007, 2008, 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c index c77f628d0e..c8733bbf9b 100644 --- a/src/arm/test_arm_api.c +++ b/src/arm/test_arm_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index 8df0a3af6b..b9adb64cfd 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c index 4ee71680dc..6e52b2807c 100644 --- a/src/arm/test_gnunet_service_arm.c +++ b/src/arm/test_gnunet_service_arm.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c index 459b1f97ae..5614d1be5b 100644 --- a/src/ats-tests/ats-testing-experiment.c +++ b/src/ats-tests/ats-testing-experiment.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 1916c9f231..b5e5c7a7b3 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index 0cb59a11a2..da5133141b 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 4da9f19da1..b46dc9fecc 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 65178d0442..636368431f 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index 93556a4684..6278a75666 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index 2737500620..e31457cb80 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c index da0d389f27..cdf3d6c158 100644 --- a/src/ats-tests/gnunet-solver-eval.c +++ b/src/ats-tests/gnunet-solver-eval.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index b5ea53d28e..1a73549332 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/perf_ats.h b/src/ats-tests/perf_ats.h index 5d3d352e0e..ed6b3faa62 100644 --- a/src/ats-tests/perf_ats.h +++ b/src/ats-tests/perf_ats.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c index a56f688ce5..113fcba3ec 100644 --- a/src/ats-tests/perf_ats_logging.c +++ b/src/ats-tests/perf_ats_logging.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index 3e72c5c09e..07bf955aeb 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c @@ -3,7 +3,7 @@ Copyright (C) 2009--2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/ats.h b/src/ats/ats.h index 910e5e11d5..56db03f10f 100644 --- a/src/ats/ats.h +++ b/src/ats/ats.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c index 4640d1e9d7..8983b10cd9 100644 --- a/src/ats/ats_api_connectivity.c +++ b/src/ats/ats_api_connectivity.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c index a76853921c..b8bd91cb97 100644 --- a/src/ats/ats_api_performance.c +++ b/src/ats/ats_api_performance.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c index 9b1496d285..0f751b4b00 100644 --- a/src/ats/ats_api_scanner.c +++ b/src/ats/ats_api_scanner.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index a8f4fec599..ea9ca6d55c 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 77df38a160..56fbae3355 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h index 3ddbe22862..80d1b27968 100644 --- a/src/ats/gnunet-ats-solver-eval.h +++ b/src/ats/gnunet-ats-solver-eval.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c index 2d7328756b..3632e3426c 100644 --- a/src/ats/gnunet-service-ats.c +++ b/src/ats/gnunet-service-ats.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats.h b/src/ats/gnunet-service-ats.h index 58ba836a9a..e6e440a29e 100644 --- a/src/ats/gnunet-service-ats.h +++ b/src/ats/gnunet-service-ats.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 54b66b6cb0..51ba489327 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index 7eb46bc56b..eec1f1b349 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c index d1043b3022..763f94c64c 100644 --- a/src/ats/gnunet-service-ats_connectivity.c +++ b/src/ats/gnunet-service-ats_connectivity.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h index 32ac84d2e8..b70eb9ed4a 100644 --- a/src/ats/gnunet-service-ats_connectivity.h +++ b/src/ats/gnunet-service-ats_connectivity.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index bafc4eca43..1cb7bfc058 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h index b2a4065200..c404a3279b 100644 --- a/src/ats/gnunet-service-ats_normalization.h +++ b/src/ats/gnunet-service-ats_normalization.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 291e96ce37..24073c2c90 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h index 998c5766b4..6c8b7e58bf 100644 --- a/src/ats/gnunet-service-ats_performance.h +++ b/src/ats/gnunet-service-ats_performance.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index 0a76c45562..632b19cd6f 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h index aad3a5ec6f..b9de7ad47c 100644 --- a/src/ats/gnunet-service-ats_plugins.h +++ b/src/ats/gnunet-service-ats_plugins.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c index 5f16c88cfc..b68dccd6e6 100644 --- a/src/ats/gnunet-service-ats_preferences.c +++ b/src/ats/gnunet-service-ats_preferences.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_preferences.h b/src/ats/gnunet-service-ats_preferences.h index b3a48a913a..ef5262b201 100644 --- a/src/ats/gnunet-service-ats_preferences.h +++ b/src/ats/gnunet-service-ats_preferences.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 176fc8f19b..8ad093a8e3 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_reservations.h b/src/ats/gnunet-service-ats_reservations.h index 18071069db..327aef6cce 100644 --- a/src/ats/gnunet-service-ats_reservations.h +++ b/src/ats/gnunet-service-ats_reservations.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 303e42ca27..e056e1ea2a 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/gnunet-service-ats_scheduling.h b/src/ats/gnunet-service-ats_scheduling.h index 6a9b401b53..c89d5ffea0 100644 --- a/src/ats/gnunet-service-ats_scheduling.h +++ b/src/ats/gnunet-service-ats_scheduling.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c index 7d3ff180b5..ec11a61bb1 100644 --- a/src/ats/perf_ats_solver.c +++ b/src/ats/perf_ats_solver.c @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index 2ecb432e45..0b9cf8c15b 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c index faa949a889..4fe9a49a4d 100644 --- a/src/ats/plugin_ats_proportional.c +++ b/src/ats/plugin_ats_proportional.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index 361eee799e..4a17d31bdc 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c index 4d5bcf1642..925d3528fe 100644 --- a/src/ats/test_ats_api.c +++ b/src/ats/test_ats_api.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index d3c986e1f2..316ae608c4 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/test_ats_lib.h b/src/ats/test_ats_lib.h index 763dda9572..a8e2f3ab26 100644 --- a/src/ats/test_ats_lib.h +++ b/src/ats/test_ats_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/ats/test_ats_reservation_api.c b/src/ats/test_ats_reservation_api.c index 3067daf567..73e0ba5fd2 100644 --- a/src/ats/test_ats_reservation_api.c +++ b/src/ats/test_ats_reservation_api.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/auction.h b/src/auction/auction.h index 0682e0352f..337f944dbd 100644 --- a/src/auction/auction.h +++ b/src/auction/auction.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c index 160a436fea..6e46c35ab2 100644 --- a/src/auction/gnunet-auction-create.c +++ b/src/auction/gnunet-auction-create.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c index fd51f80e74..4378bc710f 100644 --- a/src/auction/gnunet-auction-info.c +++ b/src/auction/gnunet-auction-info.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c index fd51f80e74..4378bc710f 100644 --- a/src/auction/gnunet-auction-join.c +++ b/src/auction/gnunet-auction-join.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c index 3819406370..025de267d9 100644 --- a/src/auction/gnunet-service-auction.c +++ b/src/auction/gnunet-service-auction.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c index 8c6f205a5f..84eb9a1bf7 100644 --- a/src/auction/test_auction_api.c +++ b/src/auction/test_auction_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c index ca41add1c2..225c95d7ae 100644 --- a/src/block/bg_bf.c +++ b/src/block/bg_bf.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/block/block.c b/src/block/block.c index 2881217837..3053c6cf93 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c index ebbe211ba6..9cffdbfa1e 100644 --- a/src/block/plugin_block_template.c +++ b/src/block/plugin_block_template.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c index a0d8016974..f1f338c223 100644 --- a/src/block/plugin_block_test.c +++ b/src/block/plugin_block_test.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h index 46ab7c1ba8..a3eb8fd768 100644 --- a/src/cadet/cadet.h +++ b/src/cadet/cadet.h @@ -3,7 +3,7 @@ Copyright (C) 2001 - 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index eaf79fade4..eef0d95ff6 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h index 20c6d9c925..6b8a033ea2 100644 --- a/src/cadet/cadet_protocol.h +++ b/src/cadet/cadet_protocol.h @@ -3,7 +3,7 @@ Copyright (C) 2007 - 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c index 45387a2f17..0bc9bbfaad 100644 --- a/src/cadet/cadet_test_lib.c +++ b/src/cadet/cadet_test_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/cadet_test_lib.h b/src/cadet/cadet_test_lib.h index fa1a91e6a6..29724e1374 100644 --- a/src/cadet/cadet_test_lib.h +++ b/src/cadet/cadet_test_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012,2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c index 0d4b9f5393..6f21790572 100644 --- a/src/cadet/gnunet-cadet-profiler.c +++ b/src/cadet/gnunet-cadet-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 50031d5334..13e27aecda 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index a8afec52f0..1f91e77e91 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h index 62fb73c676..e7a8f2168f 100644 --- a/src/cadet/gnunet-service-cadet.h +++ b/src/cadet/gnunet-service-cadet.h @@ -4,7 +4,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index 89853b90b3..c10c07e818 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_channel.h b/src/cadet/gnunet-service-cadet_channel.h index fe29e627f4..cd46cc73a7 100644 --- a/src/cadet/gnunet-service-cadet_channel.h +++ b/src/cadet/gnunet-service-cadet_channel.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index bfa09cc57d..919b769460 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_connection.h b/src/cadet/gnunet-service-cadet_connection.h index 36ea3bdaec..91f42f0d76 100644 --- a/src/cadet/gnunet-service-cadet_connection.h +++ b/src/cadet/gnunet-service-cadet_connection.h @@ -4,7 +4,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 2bb6368031..ec1cc72490 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_core.h b/src/cadet/gnunet-service-cadet_core.h index 698951cef8..db56903adf 100644 --- a/src/cadet/gnunet-service-cadet_core.h +++ b/src/cadet/gnunet-service-cadet_core.h @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c index 66a5e7a628..0f215d99e0 100644 --- a/src/cadet/gnunet-service-cadet_dht.c +++ b/src/cadet/gnunet-service-cadet_dht.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_dht.h b/src/cadet/gnunet-service-cadet_dht.h index 1d7e847168..5f798bff6a 100644 --- a/src/cadet/gnunet-service-cadet_dht.h +++ b/src/cadet/gnunet-service-cadet_dht.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c index 10d6e4a224..55984a34b2 100644 --- a/src/cadet/gnunet-service-cadet_hello.c +++ b/src/cadet/gnunet-service-cadet_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_hello.h b/src/cadet/gnunet-service-cadet_hello.h index c187777cb9..d09ea5f57b 100644 --- a/src/cadet/gnunet-service-cadet_hello.h +++ b/src/cadet/gnunet-service-cadet_hello.h @@ -3,7 +3,7 @@ Copyright (C) 2014, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 4d5791284b..05f0569047 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_paths.h b/src/cadet/gnunet-service-cadet_paths.h index c7fef94eb4..2a64839d18 100644 --- a/src/cadet/gnunet-service-cadet_paths.h +++ b/src/cadet/gnunet-service-cadet_paths.h @@ -4,7 +4,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index 1f389ae971..64b6009df4 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/cadet/gnunet-service-cadet_peer.h index 360f1c46e2..630477f252 100644 --- a/src/cadet/gnunet-service-cadet_peer.h +++ b/src/cadet/gnunet-service-cadet_peer.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 22b8223447..79bd28d333 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2017, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h index 6f7d090714..a87f5230d5 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.h +++ b/src/cadet/gnunet-service-cadet_tunnels.h @@ -4,7 +4,7 @@ Copyright (C) 2001-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index 4bec4123d4..1fe7882920 100644 --- a/src/cadet/test_cadet.c +++ b/src/cadet/test_cadet.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c index 71b6ba5ac7..46d07e2c67 100644 --- a/src/cadet/test_cadet_flow.c +++ b/src/cadet/test_cadet_flow.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c index 42d573e80a..9524e8a2e1 100644 --- a/src/cadet/test_cadet_local_mq.c +++ b/src/cadet/test_cadet_local_mq.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 88c912b008..0e8057073b 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in @@ -3,7 +3,7 @@ # (C) 2013, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 8d5d2eb939..c6feb30ba8 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 8474fb5fd8..f642443929 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h index c985ec3f67..c3c7338b27 100644 --- a/src/consensus/consensus_protocol.h +++ b/src/consensus/consensus_protocol.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c index fccbee2940..5d75dc9f0b 100644 --- a/src/consensus/gnunet-consensus-profiler.c +++ b/src/consensus/gnunet-consensus-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index 57ab916297..da285c540a 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/plugin_block_consensus.c b/src/consensus/plugin_block_consensus.c index 3224fac456..8a53055519 100644 --- a/src/consensus/plugin_block_consensus.c +++ b/src/consensus/plugin_block_consensus.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c index bc7d9cab21..23d5931269 100644 --- a/src/consensus/test_consensus_api.c +++ b/src/consensus/test_consensus_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h index fae0355e45..b9b1426b67 100644 --- a/src/conversation/conversation.h +++ b/src/conversation/conversation.h @@ -3,7 +3,7 @@ Copyright (C) 2013-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 4bcc593086..59f01add31 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index ce58fdac34..761669abe4 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index ac99e4d14e..cbc5d0aa57 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 7ac5e7678d..52f981e961 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c index a97412d2d1..9b672855c1 100644 --- a/src/conversation/gnunet-helper-audio-playback-gst.c +++ b/src/conversation/gnunet-helper-audio-playback-gst.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 5c13f28777..c8529b4657 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c index 69d0e67442..610a777471 100644 --- a/src/conversation/gnunet-helper-audio-record-gst.c +++ b/src/conversation/gnunet-helper-audio-record-gst.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index dd8c8f447c..5e1ebb5654 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 2d6dd09f66..15f9881da4 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c index 7b8a764de6..47be6524d3 100644 --- a/src/conversation/gnunet_gst.c +++ b/src/conversation/gnunet_gst.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet_gst.h b/src/conversation/gnunet_gst.h index 4d5b550677..5662017f1a 100644 --- a/src/conversation/gnunet_gst.h +++ b/src/conversation/gnunet_gst.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h index 33dffabd13..caf80ef89a 100644 --- a/src/conversation/gnunet_gst_def.h +++ b/src/conversation/gnunet_gst_def.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c index 7ba1ae7baa..be85efe288 100644 --- a/src/conversation/gnunet_gst_test.c +++ b/src/conversation/gnunet_gst_test.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c index 505c5ee845..d99253d909 100644 --- a/src/conversation/microphone.c +++ b/src/conversation/microphone.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index 3fee68782e..dd2307bcb8 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c index 80e577a2d0..5c217e74dd 100644 --- a/src/conversation/speaker.c +++ b/src/conversation/speaker.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index e0bd200353..89f057dabb 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c index e0fff34410..a447f34c62 100644 --- a/src/conversation/test_conversation_api_reject.c +++ b/src/conversation/test_conversation_api_reject.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index 554770bf05..bd65babcb7 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2018x GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/core.h b/src/core/core.h index 37e30c4fed..06e8729d2f 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/core_api.c b/src/core/core_api.c index ab8e8bd5e9..3f0ae51a93 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index 46d59560ac..4a5d3e170d 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c index 71b6768219..504d7ec472 100644 --- a/src/core/gnunet-core.c +++ b/src/core/gnunet-core.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index c6324d0078..eb78902be4 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h index 0b3f0d0baf..273511b49a 100644 --- a/src/core/gnunet-service-core.h +++ b/src/core/gnunet-service-core.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 8bf4a0d216..c399897663 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_kx.h b/src/core/gnunet-service-core_kx.h index e11a6669d3..bf5ee121c6 100644 --- a/src/core/gnunet-service-core_kx.h +++ b/src/core/gnunet-service-core_kx.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index fe5fd69433..92a91d10e3 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_sessions.h b/src/core/gnunet-service-core_sessions.h index 6ec8c85efe..ca903d8a61 100644 --- a/src/core/gnunet-service-core_sessions.h +++ b/src/core/gnunet-service-core_sessions.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c index 1b940b1383..6980a36a9d 100644 --- a/src/core/gnunet-service-core_typemap.c +++ b/src/core/gnunet-service-core_typemap.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/gnunet-service-core_typemap.h b/src/core/gnunet-service-core_typemap.h index e999412a31..009349a2f4 100644 --- a/src/core/gnunet-service-core_typemap.h +++ b/src/core/gnunet-service-core_typemap.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 791e8c0235..136adf9030 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index 1cb5d2ccd9..e2aa72af4d 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index e9e04d50d3..55dbf35793 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 73ec8daf89..156f72b155 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 7ed7e759d7..88bcb9c185 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential.h b/src/credential/credential.h index a76b493fe6..46f8360336 100644 --- a/src/credential/credential.h +++ b/src/credential/credential.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c index 122d6a5036..d7692cb9ba 100644 --- a/src/credential/credential_api.c +++ b/src/credential/credential_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c index 2b134bc93d..ad52837819 100644 --- a/src/credential/credential_misc.c +++ b/src/credential/credential_misc.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential_misc.h b/src/credential/credential_misc.h index 875d66ccf4..42db70f39c 100644 --- a/src/credential/credential_misc.h +++ b/src/credential/credential_misc.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential_serialization.c b/src/credential/credential_serialization.c index 26b1d8a34e..fcd9c8a843 100644 --- a/src/credential/credential_serialization.c +++ b/src/credential/credential_serialization.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/credential_serialization.h b/src/credential/credential_serialization.h index 103ecbdc67..1a2a6baf0f 100644 --- a/src/credential/credential_serialization.h +++ b/src/credential/credential_serialization.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/gnunet-credential.c b/src/credential/gnunet-credential.c index 5a86175f19..c0d8b1f52b 100644 --- a/src/credential/gnunet-credential.c +++ b/src/credential/gnunet-credential.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c index 1967d191f6..14c91b462c 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/credential/gnunet-service-credential.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c index 69e68b042d..757534e7a2 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/credential/plugin_gnsrecord_credential.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/credential/plugin_rest_credential.c b/src/credential/plugin_rest_credential.c index 854aeeb314..be2f577158 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/credential/plugin_rest_credential.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/curl/curl.c b/src/curl/curl.c index 846e47b52b..5a9a925a23 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c index 34604c3ff5..71e65ff932 100644 --- a/src/curl/curl_reschedule.c +++ b/src/curl/curl_reschedule.c @@ -3,7 +3,7 @@ Copyright (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 39cd6126de..9bd754c1f2 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 49c6e5d8fd..f412f1db98 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index 35b7a6563c..aeb0101633 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 33b317e872..1f9b0a5541 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2010, 2012, 2015, 2017, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index c96afa6306..b4dd7390fd 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index f102925593..fba9a20b30 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index 37b32208b4..f6d5979d7d 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index 50106de3ae..5a61dae2f2 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h index 6d0a54ae12..627afb4e6a 100644 --- a/src/datastore/datastore.h +++ b/src/datastore/datastore.h @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index ae1e6e15c0..c6c4473263 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c @@ -3,7 +3,7 @@ Copyright (C) 2004-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c index 4ceca77c12..d3a080b497 100644 --- a/src/datastore/gnunet-datastore.c +++ b/src/datastore/gnunet-datastore.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index dd39f54c52..127cb235c4 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -3,7 +3,7 @@ Copyright (C) 2004-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index f54fed4391..ef86598acb 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index d3515aae91..69174072e7 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c index 87117bf80b..142a1f7e9f 100644 --- a/src/datastore/plugin_datastore_heap.c +++ b/src/datastore/plugin_datastore_heap.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c index 93586e2528..766f4ac1a2 100644 --- a/src/datastore/plugin_datastore_mysql.c +++ b/src/datastore/plugin_datastore_mysql.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 30013ef76d..1526772a5f 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index 862977b9a8..ea43d03d46 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2009, 2011, 2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c index 13b746c6e8..ca36983bbb 100644 --- a/src/datastore/plugin_datastore_template.c +++ b/src/datastore/plugin_datastore_template.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 7a43dbf584..123f86f4f6 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index 563593f8ec..2d1229d024 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index b3fba19978..2f79b88928 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/dht.h b/src/dht/dht.h index 4d919a03f1..35a59ab7f4 100644 --- a/src/dht/dht.h +++ b/src/dht/dht.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 886ee8053b..b8624f99c0 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2012, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c index d4ba97957c..20b4b49178 100644 --- a/src/dht/dht_test_lib.c +++ b/src/dht/dht_test_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/dht_test_lib.h b/src/dht/dht_test_lib.h index bc7ccaf8a3..3676192110 100644 --- a/src/dht/dht_test_lib.h +++ b/src/dht/dht_test_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index a1e5c00dcb..7b8b1141f5 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index d499c7cc4e..a71a1184e6 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c index 0021629442..384c01c6e5 100644 --- a/src/dht/gnunet-dht-put.c +++ b/src/dht/gnunet-dht-put.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 872cefd375..e95a8755ab 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h index c27f28f3a4..7f59670ac1 100644 --- a/src/dht/gnunet-service-dht.h +++ b/src/dht/gnunet-service-dht.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index ad97cdb113..547ec2e1dc 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 368020e053..280cbf7c8d 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2015, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h index e41b81cda7..62b99a1121 100644 --- a/src/dht/gnunet-service-dht_datacache.h +++ b/src/dht/gnunet-service-dht_datacache.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c index 7fb8452cf2..9ad73c878a 100644 --- a/src/dht/gnunet-service-dht_hello.c +++ b/src/dht/gnunet-service-dht_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_hello.h b/src/dht/gnunet-service-dht_hello.h index 6627e9ff91..8e8c477a53 100644 --- a/src/dht/gnunet-service-dht_hello.h +++ b/src/dht/gnunet-service-dht_hello.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 977e2626fb..08d41fdc03 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index 54cabed3a9..edfd5d0e19 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c index b3d5052037..2ab4e472a1 100644 --- a/src/dht/gnunet-service-dht_nse.c +++ b/src/dht/gnunet-service-dht_nse.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_nse.h b/src/dht/gnunet-service-dht_nse.h index 3719e72475..9683366c89 100644 --- a/src/dht/gnunet-service-dht_nse.h +++ b/src/dht/gnunet-service-dht_nse.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c index 8cfd2e5434..1faee498bd 100644 --- a/src/dht/gnunet-service-dht_routing.c +++ b/src/dht/gnunet-service-dht_routing.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet-service-dht_routing.h b/src/dht/gnunet-service-dht_routing.h index 0883a62f95..5175af3605 100644 --- a/src/dht/gnunet-service-dht_routing.h +++ b/src/dht/gnunet-service-dht_routing.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c index 01a678b785..cf822386b7 100644 --- a/src/dht/gnunet_dht_profiler.c +++ b/src/dht/gnunet_dht_profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index 82cad21b21..7fbe433d81 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 83fdf5e2ed..76f956fb9b 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index 8d94519182..fa81009974 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index 3047433a11..e0e68c6442 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/dns.h b/src/dns/dns.h index c6755ee363..08e1058c37 100644 --- a/src/dns/dns.h +++ b/src/dns/dns.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c index 9c51daf79d..40eceddb1b 100644 --- a/src/dns/dns_api.c +++ b/src/dns/dns_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c index 122ca312f4..1f53a57cd6 100644 --- a/src/dns/dnsparser.c +++ b/src/dns/dnsparser.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index b5ce908741..3a60be8c44 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index 39d327f511..e5c2417169 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c index 2e2bf0f1a1..06f580394d 100644 --- a/src/dns/gnunet-dns-redirector.c +++ b/src/dns/gnunet-dns-redirector.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c index 80f5df3513..a034a815ea 100644 --- a/src/dns/gnunet-helper-dns.c +++ b/src/dns/gnunet-helper-dns.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 6df5bd0ffa..69008e9d9a 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c index e05a04f360..fc97ba37e4 100644 --- a/src/dns/gnunet-zonewalk.c +++ b/src/dns/gnunet-zonewalk.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c index 95a66b83fc..8608cf44c6 100644 --- a/src/dns/plugin_block_dns.c +++ b/src/dns/plugin_block_dns.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dns/test_hexcoder.c b/src/dns/test_hexcoder.c index 1838c0897a..d6505ed611 100644 --- a/src/dns/test_hexcoder.c +++ b/src/dns/test_hexcoder.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/dv.h b/src/dv/dv.h index 6f2258baa1..d481846fd7 100644 --- a/src/dv/dv.h +++ b/src/dv/dv.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index 10c0a350dc..2c26067188 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c index 176444371d..021468063b 100644 --- a/src/dv/gnunet-dv.c +++ b/src/dv/gnunet-dv.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 9bfce0d992..09cd47edd2 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index 75afda7529..5b615312f7 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -3,7 +3,7 @@ Copyright (C) 2002--2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c index d6d2fd5c66..bb66b1752d 100644 --- a/src/dv/test_transport_blacklist.c +++ b/src/dv/test_transport_blacklist.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c index 9e487f2618..fa4c7c6e15 100644 --- a/src/dv/test_transport_dv.c +++ b/src/dv/test_transport_dv.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/exit/exit.h b/src/exit/exit.h index b79a918e28..9d34f6c8c8 100644 --- a/src/exit/exit.h +++ b/src/exit/exit.h @@ -3,7 +3,7 @@ Copyright (C) 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index 78c4967644..da691fad35 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2017 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/exit/gnunet-helper-exit-windows.c b/src/exit/gnunet-helper-exit-windows.c index 3593c41b15..a1b7973f97 100644 --- a/src/exit/gnunet-helper-exit-windows.c +++ b/src/exit/gnunet-helper-exit-windows.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c index d3453bb137..7e8e7e870c 100644 --- a/src/exit/gnunet-helper-exit.c +++ b/src/exit/gnunet-helper-exit.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index aabf9a6219..1da2a30297 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index 22a3b3a500..4667725de6 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fragmentation/fragmentation.h b/src/fragmentation/fragmentation.h index e60b742ed9..5de90197e2 100644 --- a/src/fragmentation/fragmentation.h +++ b/src/fragmentation/fragmentation.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c index 77ac7db5ad..e50afcd4a7 100644 --- a/src/fragmentation/test_fragmentation.c +++ b/src/fragmentation/test_fragmentation.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fragmentation/test_fragmentation_parallel.c b/src/fragmentation/test_fragmentation_parallel.c index 27f2ebad6d..d6171b9373 100644 --- a/src/fragmentation/test_fragmentation_parallel.c +++ b/src/fragmentation/test_fragmentation_parallel.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs.h b/src/fs/fs.h index 7e98f90969..6fa66a4eaf 100644 --- a/src/fs/fs.h +++ b/src/fs/fs.h @@ -3,7 +3,7 @@ Copyright (C) 2003--2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 60d3bfa745..3bc96e5165 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -3,7 +3,7 @@ Copyright (C) 2001--2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h index edf288bec9..2a66816c6f 100644 --- a/src/fs/fs_api.h +++ b/src/fs/fs_api.h @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index df64100c72..e901897bfa 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c index 9bdda59031..69e7e1abf2 100644 --- a/src/fs/fs_dirmetascan.c +++ b/src/fs/fs_dirmetascan.c @@ -3,7 +3,7 @@ Copyright (C) 2005-2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index 73ace1056b..b96cab1cfd 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index ef8baa8196..e9d74b9c0b 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index 5206a25d93..dfc9068686 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index 00090aca0a..53ebf753dd 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index 29df6fb7c1..f2d6aed6d6 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 34f4803146..10d117ccf9 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c @@ -3,7 +3,7 @@ Copyright (C) 2003-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 361a99ca35..75eaef6f1c 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c index f3c6526b98..9b20b0e9ff 100644 --- a/src/fs/fs_publish_ksk.c +++ b/src/fs/fs_publish_ksk.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c index 83e019b369..5c99ed5b4f 100644 --- a/src/fs/fs_publish_ublock.c +++ b/src/fs/fs_publish_ublock.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_publish_ublock.h b/src/fs/fs_publish_ublock.h index aa282d4ee0..7eb1e74486 100644 --- a/src/fs/fs_publish_ublock.h +++ b/src/fs/fs_publish_ublock.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index ec535c10b3..b07a27794e 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c index 17c363114d..82b8ba9f27 100644 --- a/src/fs/fs_sharetree.c +++ b/src/fs/fs_sharetree.c @@ -3,7 +3,7 @@ Copyright (C) 2005-2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index 1620904980..ec3afc40bf 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 68be1bf328..4a95dcca33 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index f721f441aa..50b19e995b 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_tree.h b/src/fs/fs_tree.h index 8c5a8ea2d8..d13fa3b745 100644 --- a/src/fs/fs_tree.h +++ b/src/fs/fs_tree.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 73e7e805a9..81e027df83 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c @@ -3,7 +3,7 @@ Copyright (C) 2003--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 70f24baccc..689ce8f6e6 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c @@ -3,7 +3,7 @@ Copyright (C) 2003--2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index 8564185005..0ba3e79586 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c @@ -3,7 +3,7 @@ Copyright (C) 2001--2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c index 4c5dec005b..e87dc32a50 100644 --- a/src/fs/gnunet-daemon-fsprofiler.c +++ b/src/fs/gnunet-daemon-fsprofiler.c @@ -3,7 +3,7 @@ Copyright (C) 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index ef6e564229..81f876fc50 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index 338c6042c3..e67c90a5cb 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c index 08ab74ac6e..cf5fd3b801 100644 --- a/src/fs/gnunet-fs-profiler.c +++ b/src/fs/gnunet-fs-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c index 8f55c0d9a0..7fa4407fac 100644 --- a/src/fs/gnunet-fs.c +++ b/src/fs/gnunet-fs.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index bd7a9391b6..08c3928b51 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index e4530e68d4..0b31fd35b7 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index ca989aae74..f40a3c99ac 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 1d0a6ef2cf..1e3d0937ae 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h index f9031b1b77..ab7fade8af 100644 --- a/src/fs/gnunet-service-fs.h +++ b/src/fs/gnunet-service-fs.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_cadet.h b/src/fs/gnunet-service-fs_cadet.h index 3536f92b18..e3ec77b9db 100644 --- a/src/fs/gnunet-service-fs_cadet.h +++ b/src/fs/gnunet-service-fs_cadet.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index 7a40a2c11b..441eb04322 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c index ad47d80de8..af8d34e07d 100644 --- a/src/fs/gnunet-service-fs_cadet_server.c +++ b/src/fs/gnunet-service-fs_cadet_server.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index a6099b4a1c..b1997464ac 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h index bbbb09d6bb..a2e00829f7 100644 --- a/src/fs/gnunet-service-fs_cp.h +++ b/src/fs/gnunet-service-fs_cp.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c index 8e81772968..4dc77db14c 100644 --- a/src/fs/gnunet-service-fs_indexing.c +++ b/src/fs/gnunet-service-fs_indexing.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_indexing.h b/src/fs/gnunet-service-fs_indexing.h index d96841cb2a..96a6edcffd 100644 --- a/src/fs/gnunet-service-fs_indexing.h +++ b/src/fs/gnunet-service-fs_indexing.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 3dee9c6e60..989f4b2973 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_pe.h b/src/fs/gnunet-service-fs_pe.h index af194fca7c..0da72692df 100644 --- a/src/fs/gnunet-service-fs_pe.h +++ b/src/fs/gnunet-service-fs_pe.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 42aeea47ee..1d4a916ab9 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_pr.h b/src/fs/gnunet-service-fs_pr.h index ef12d9f2c4..ed29bec5ee 100644 --- a/src/fs/gnunet-service-fs_pr.h +++ b/src/fs/gnunet-service-fs_pr.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index 692285b0bf..9302418022 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_push.h b/src/fs/gnunet-service-fs_push.h index 35c02efec9..b67b216aeb 100644 --- a/src/fs/gnunet-service-fs_push.h +++ b/src/fs/gnunet-service-fs_push.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c index 836343e38e..4b9aaab725 100644 --- a/src/fs/gnunet-service-fs_put.c +++ b/src/fs/gnunet-service-fs_put.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-service-fs_put.h b/src/fs/gnunet-service-fs_put.h index 848bb368d3..6653fbf38a 100644 --- a/src/fs/gnunet-service-fs_put.h +++ b/src/fs/gnunet-service-fs_put.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index 92bffb99b1..f19be8e0ac 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index b80cb4edf9..dbb7346c60 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index 6fd1b8291b..c49b21b095 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_respect.c +++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index 94b79f336c..abef09e2de 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 467e967835..6b46d80941 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c index 59c2308d74..6a6dd7e06b 100644 --- a/src/fs/test_fs_directory.c +++ b/src/fs/test_fs_directory.c @@ -3,7 +3,7 @@ Copyright (C) 2005, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 9114dc321e..71a8e67de6 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index a31ce3610c..c4a03ceeec 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index fc108c3875..b1262c4292 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c index d425b43ae2..462ed7bf12 100644 --- a/src/fs/test_fs_getopt.c +++ b/src/fs/test_fs_getopt.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index 6840b38716..c6a943da0b 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index e3603cf6af..65db9f2fb4 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -3,7 +3,7 @@ Copyright (C) 2005-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index 192c100fa9..ba0f507c87 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -3,7 +3,7 @@ Copyright (C) 2005-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index e86a7ce476..5ca89818cc 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index 39611a8d2f..ef532365f4 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index 40ea9f6d9c..a270508119 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -3,7 +3,7 @@ Copyright (C) 2004-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 0a925a8df7..794da16d76 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index c413b103d9..df3b11debb 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c index b5efbc83f2..69ea561291 100644 --- a/src/fs/test_fs_search_with_and.c +++ b/src/fs/test_fs_search_with_and.c @@ -3,7 +3,7 @@ Copyright (C) 2004-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index d5637e216a..4917467d8f 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index 58a7468c1d..2849f9dff1 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index 122a6d697e..c18b7fd0ff 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 5c78e38871..9a6bf7e336 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c index e1fc584a49..452194398c 100644 --- a/src/fs/test_fs_uri.c +++ b/src/fs/test_fs_uri.c @@ -3,7 +3,7 @@ Copyright (C) 2003-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index 059254812d..53dff687b1 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in @@ -3,7 +3,7 @@ # (C) 2010 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index 00029ca0db..0057be9019 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 125d7a4bad..25e23810fe 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -3,7 +3,7 @@ # (C) 2010 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index b848693cd4..1974f16466 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index 40e341c20e..db4b12b464 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c index 94039fabb7..8392260f98 100644 --- a/src/fs/test_plugin_block_fs.c +++ b/src/fs/test_plugin_block_fs.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gns.h b/src/gns/gns.h index 6a0b06ffc9..1063ed5ff5 100644 --- a/src/gns/gns.h +++ b/src/gns/gns.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index ae3505713d..9bc629f18b 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gns_api.h b/src/gns/gns_api.h index 3f9ce19998..415afd5d3e 100644 --- a/src/gns/gns_api.h +++ b/src/gns/gns_api.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c index f106633e4f..b3a928abb1 100644 --- a/src/gns/gns_tld_api.c +++ b/src/gns/gns_tld_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index af3644a819..bce98a1962 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 9ed323a0b3..a29390cf48 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c index c1f5989943..126f790c5c 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/gns/gnunet-gns-benchmark.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index 11fea80c2c..d8930b0af5 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c index 1a4fff9733..02b4d30224 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/gns/gnunet-gns-import.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 486911ec80..3a7b9c82af 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 3dfeb9e776..df6426e35f 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2013, 2017-2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index f8f0683014..68f7ee2e17 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns.h b/src/gns/gnunet-service-gns.h index 0189e6cbae..0a0ef03889 100644 --- a/src/gns/gnunet-service-gns.h +++ b/src/gns/gnunet-service-gns.h @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index b071aa952d..1c6c28d07f 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/gns/gnunet-service-gns_interceptor.h index ecaf6eb4b1..96a56913f8 100644 --- a/src/gns/gnunet-service-gns_interceptor.h +++ b/src/gns/gnunet-service-gns_interceptor.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 809bde8f9c..1a38ed3178 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index d5df279c1e..bdefb018c2 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index 85f1842d1b..2947e80de7 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/nss/nss_gns_query.h b/src/gns/nss/nss_gns_query.h index d1337b5027..b1439e8369 100644 --- a/src/gns/nss/nss_gns_query.h +++ b/src/gns/nss/nss_gns_query.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index dc1c9fd1f8..62804f0507 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c index ff1d63e17e..90a2f2fd4a 100644 --- a/src/gns/plugin_gnsrecord_gns.c +++ b/src/gns/plugin_gnsrecord_gns.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c index 9c07611b8b..069561a42c 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/gns/plugin_rest_gns.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 0fc57e3ce7..ee4d19884f 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c @@ -3,7 +3,7 @@ Copyright (C) 2007, 2009, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/w32nsp-install.c b/src/gns/w32nsp-install.c index c072f8386d..3489fe674b 100644 --- a/src/gns/w32nsp-install.c +++ b/src/gns/w32nsp-install.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index 95504180b0..1650a7a009 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index 2c316fca12..f8bbab860c 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gns/w32resolver.h b/src/gns/w32resolver.h index 232a094532..378a00a38a 100644 --- a/src/gns/w32resolver.h +++ b/src/gns/w32resolver.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c index 8f4cf9ef10..4dffd5338d 100644 --- a/src/gnsrecord/gnsrecord.c +++ b/src/gnsrecord/gnsrecord.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index 6737825a86..18f3723dad 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c index 94ef6ca70a..2f03395371 100644 --- a/src/gnsrecord/gnsrecord_misc.c +++ b/src/gnsrecord/gnsrecord_misc.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c index 3d0565cec3..cde2dad2eb 100644 --- a/src/gnsrecord/gnsrecord_serialization.c +++ b/src/gnsrecord/gnsrecord_serialization.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/perf_gnsrecord_crypto.c b/src/gnsrecord/perf_gnsrecord_crypto.c index 91d4984957..2e06fdac49 100644 --- a/src/gnsrecord/perf_gnsrecord_crypto.c +++ b/src/gnsrecord/perf_gnsrecord_crypto.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c index 2cca62d945..bd888a9fd4 100644 --- a/src/gnsrecord/plugin_gnsrecord_dns.c +++ b/src/gnsrecord/plugin_gnsrecord_dns.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c b/src/gnsrecord/test_gnsrecord_block_expiration.c index 1c9ec78632..a405c46399 100644 --- a/src/gnsrecord/test_gnsrecord_block_expiration.c +++ b/src/gnsrecord/test_gnsrecord_block_expiration.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c index 0b095c31ca..773d2d987f 100644 --- a/src/gnsrecord/test_gnsrecord_crypto.c +++ b/src/gnsrecord/test_gnsrecord_crypto.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c index 3f23b2b3ec..6cf67b2e28 100644 --- a/src/gnsrecord/test_gnsrecord_serialization.c +++ b/src/gnsrecord/test_gnsrecord_serialization.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hello/address.c b/src/hello/address.c index ac89b06167..c48699f99c 100644 --- a/src/hello/address.c +++ b/src/hello/address.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c index 2ad187250b..c2ac10129c 100644 --- a/src/hello/gnunet-hello.c +++ b/src/hello/gnunet-hello.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hello/hello.c b/src/hello/hello.c index 3d968067b1..3819f16766 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hello/test_friend_hello.c b/src/hello/test_friend_hello.c index 8b3b46ae66..a29ebf152c 100644 --- a/src/hello/test_friend_hello.c +++ b/src/hello/test_friend_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c index e6de13c65f..439cfe4a70 100644 --- a/src/hello/test_hello.c +++ b/src/hello/test_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index 8955e46e2d..a194a8a868 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c @@ -3,7 +3,7 @@ Copyright (C) 2007, 2008, 2009, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist.h b/src/hostlist/gnunet-daemon-hostlist.h index e61e42b217..1064c8c4dd 100644 --- a/src/hostlist/gnunet-daemon-hostlist.h +++ b/src/hostlist/gnunet-daemon-hostlist.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index 6ae5e22a1a..fccbb6f268 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2010, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h b/src/hostlist/gnunet-daemon-hostlist_client.h index d93e0ce95c..8f60c01705 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.h +++ b/src/hostlist/gnunet-daemon-hostlist_client.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 4766618129..4f9fd2233c 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2010, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h b/src/hostlist/gnunet-daemon-hostlist_server.h index 344a3559d1..c5b872cdc2 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.h +++ b/src/hostlist/gnunet-daemon-hostlist_server.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index 9bed910b6a..49c24809e3 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 85570e8eec..14096d427d 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index fcdcd0f893..2b7b2e6c7d 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-attribute/identity_attribute.c b/src/identity-attribute/identity_attribute.c index c75794d143..e9d91b2252 100644 --- a/src/identity-attribute/identity_attribute.c +++ b/src/identity-attribute/identity_attribute.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-attribute/identity_attribute.h b/src/identity-attribute/identity_attribute.h index 5e3c07dc1f..5de2cd8438 100644 --- a/src/identity-attribute/identity_attribute.h +++ b/src/identity-attribute/identity_attribute.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-attribute/plugin_identity_attribute_gnuid.c b/src/identity-attribute/plugin_identity_attribute_gnuid.c index f275af3421..2b814345d7 100644 --- a/src/identity-attribute/plugin_identity_attribute_gnuid.c +++ b/src/identity-attribute/plugin_identity_attribute_gnuid.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/gnunet-idp.c b/src/identity-provider/gnunet-idp.c index 6aef3e5f14..8409b1a8d5 100644 --- a/src/identity-provider/gnunet-idp.c +++ b/src/identity-provider/gnunet-idp.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index dd7c4f2170..b054141f28 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/identity_provider.h b/src/identity-provider/identity_provider.h index eb443fa5ff..43d8c0e54a 100644 --- a/src/identity-provider/identity_provider.h +++ b/src/identity-provider/identity_provider.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index 18dbcef3d0..f4e12f54d8 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/jwt.c b/src/identity-provider/jwt.c index 7364093100..8404c25486 100644 --- a/src/identity-provider/jwt.c +++ b/src/identity-provider/jwt.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/identity-provider/plugin_gnsrecord_identity_provider.c index 4c0ac6a9c3..281a2209fe 100644 --- a/src/identity-provider/plugin_gnsrecord_identity_provider.c +++ b/src/identity-provider/plugin_gnsrecord_identity_provider.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/plugin_identity_provider_sqlite.c b/src/identity-provider/plugin_identity_provider_sqlite.c index e453f7aea7..735d32fa81 100644 --- a/src/identity-provider/plugin_identity_provider_sqlite.c +++ b/src/identity-provider/plugin_identity_provider_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/identity-provider/plugin_rest_identity_provider.c index 8ff46b9953..edb2de55df 100644 --- a/src/identity-provider/plugin_rest_identity_provider.c +++ b/src/identity-provider/plugin_rest_identity_provider.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity-provider/plugin_rest_openid_connect.c b/src/identity-provider/plugin_rest_openid_connect.c index 3b322ee040..8e14383e27 100644 --- a/src/identity-provider/plugin_rest_openid_connect.c +++ b/src/identity-provider/plugin_rest_openid_connect.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c index d315bb136d..1a020863fb 100644 --- a/src/identity/gnunet-identity.c +++ b/src/identity/gnunet-identity.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index 53b6257610..844f80f0bd 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/identity.h b/src/identity/identity.h index 5bde956e13..d1f3898ff4 100644 --- a/src/identity/identity.h +++ b/src/identity/identity.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 7852accff2..46cad51f38 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c index 4d4f01a0c2..6458934118 100644 --- a/src/identity/identity_api_lookup.c +++ b/src/identity/identity_api_lookup.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c index e16efdd214..e7a7cabd84 100644 --- a/src/identity/plugin_rest_identity.c +++ b/src/identity/plugin_rest_identity.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c index b2f290f1d8..8635f5c965 100644 --- a/src/identity/test_identity.c +++ b/src/identity/test_identity.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/identity/test_identity_defaults.c b/src/identity/test_identity_defaults.c index 7aceadaa6d..065f9ee430 100644 --- a/src/identity/test_identity_defaults.c +++ b/src/identity/test_identity_defaults.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/block_dns.h b/src/include/block_dns.h index 163042233a..059f6fd599 100644 --- a/src/include/block_dns.h +++ b/src/include/block_dns.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/block_fs.h b/src/include/block_fs.h index 6007f0ad0e..990889f7a5 100644 --- a/src/include/block_fs.h +++ b/src/include/block_fs.h @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/block_regex.h b/src/include/block_regex.h index ea6c7ad9a0..ddbfa5e09c 100644 --- a/src/include/block_regex.h +++ b/src/include/block_regex.h @@ -3,7 +3,7 @@ Copyright (C) 2012,2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h index e7f6cde7dc..11e825967c 100644 --- a/src/include/gnunet_abe_lib.h +++ b/src/include/gnunet_abe_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h index 4a03a725b1..071d4c19f2 100644 --- a/src/include/gnunet_applications.h +++ b/src/include/gnunet_applications.h @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index 319070f653..c82fd4ac20 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h index 902da23580..46b169e4f8 100644 --- a/src/include/gnunet_ats_plugin.h +++ b/src/include/gnunet_ats_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index c2cd8725b0..49a95ea932 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h index fe5795d5f1..28e22e8f04 100644 --- a/src/include/gnunet_bandwidth_lib.h +++ b/src/include/gnunet_bandwidth_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h index 821ef17add..eb91f6fc09 100644 --- a/src/include/gnunet_bio_lib.h +++ b/src/include/gnunet_bio_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h index 4e1112712f..f9fdbbcf0e 100644 --- a/src/include/gnunet_block_group_lib.h +++ b/src/include/gnunet_block_group_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 814832991b..16f7cc42a3 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h index 0c195c0539..f9eed3caa0 100644 --- a/src/include/gnunet_block_plugin.h +++ b/src/include/gnunet_block_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2013,2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index b6e1b56768..acd2058cef 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index 862c6be69f..14f9892505 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 5171b6f55e..55eb1e8960 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -3,7 +3,7 @@ Copyright (C) 2006-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index 6857011abb..59c640c155 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index 68072f4282..41c41220eb 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h index ce626b35e4..c8e0d50635 100644 --- a/src/include/gnunet_constants.h +++ b/src/include/gnunet_constants.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index 26a57cd396..f67f4c98fe 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index f2a5b8cdaa..22479ed6ec 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 00b940fe13..83304fe271 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h index a57a3ad3e1..d5d6ec1b40 100644 --- a/src/include/gnunet_credential_service.h +++ b/src/include/gnunet_credential_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 386ae7082d..0787fdf639 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index 72ca28efa1..8c595ee34b 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 7730e355fd..74e7eeee96 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index 772af8fbfa..b2db15c8d3 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index 5985017fae..fd3b0fb57f 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index 7d34eff139..0dc6d843e0 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h index 6d0dc02211..87ef84dbaa 100644 --- a/src/include/gnunet_db_lib.h +++ b/src/include/gnunet_db_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index 030c8ad4c2..6a6a31b6bd 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h @@ -3,7 +3,7 @@ Copyright (C) 2004-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index c2c3981aa1..19d4a094ac 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h index 8713a21548..466809eca3 100644 --- a/src/include/gnunet_dns_service.h +++ b/src/include/gnunet_dns_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h index 337c91b1de..440bd5b14b 100644 --- a/src/include/gnunet_dnsparser_lib.h +++ b/src/include/gnunet_dnsparser_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h index cc6a2ed662..89895ba3b8 100644 --- a/src/include/gnunet_dnsstub_lib.h +++ b/src/include/gnunet_dnsstub_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h index 22e05d4a47..49e07edbd1 100644 --- a/src/include/gnunet_dv_service.h +++ b/src/include/gnunet_dv_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h index c070e0e112..ecb2a53913 100644 --- a/src/include/gnunet_fragmentation_lib.h +++ b/src/include/gnunet_fragmentation_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h index 0fcd4e91ee..52bc1aa4d8 100644 --- a/src/include/gnunet_friends_lib.h +++ b/src/include/gnunet_friends_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2013 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 902761eea6..83c08220bf 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h @@ -3,7 +3,7 @@ Copyright (C) 2004--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h index 673fd4a45f..dcf58e287d 100644 --- a/src/include/gnunet_getopt_lib.h +++ b/src/include/gnunet_getopt_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h index 9b24a39675..e5d8d3a93b 100644 --- a/src/include/gnunet_gns_service.h +++ b/src/include/gnunet_gns_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2014, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index b50b588986..40ea8d227c 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h index ebaeb0b068..191f30c3bf 100644 --- a/src/include/gnunet_gnsrecord_plugin.h +++ b/src/include/gnunet_gnsrecord_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h index 2fe4657194..cc8bf6a253 100644 --- a/src/include/gnunet_hello_lib.h +++ b/src/include/gnunet_hello_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h index f1601283f2..f2f451fe75 100644 --- a/src/include/gnunet_helper_lib.h +++ b/src/include/gnunet_helper_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_identity_attribute_lib.h index 97fe3df204..0db7383443 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_identity_attribute_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_identity_attribute_plugin.h index f4ebb74395..370e5602dd 100644 --- a/src/include/gnunet_identity_attribute_plugin.h +++ b/src/include/gnunet_identity_attribute_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_identity_provider_plugin.h index cb31218ba2..22d1be81f1 100644 --- a/src/include/gnunet_identity_provider_plugin.h +++ b/src/include/gnunet_identity_provider_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_identity_provider_service.h index 720d1ad7cc..5f85d664ed 100644 --- a/src/include/gnunet_identity_provider_service.h +++ b/src/include/gnunet_identity_provider_service.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index d26ffc2845..4ccbf25838 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index 1df9a0b5ee..d9875d5c22 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_jsonapi_lib.h b/src/include/gnunet_jsonapi_lib.h index 415262f0a1..a26eb0aad3 100644 --- a/src/include/gnunet_jsonapi_lib.h +++ b/src/include/gnunet_jsonapi_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_jsonapi_util.h b/src/include/gnunet_jsonapi_util.h index dfc22c5089..c1c0fcb8aa 100644 --- a/src/include/gnunet_jsonapi_util.h +++ b/src/include/gnunet_jsonapi_util.h @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h index cc0506e544..8b61a75bcb 100644 --- a/src/include/gnunet_load_lib.h +++ b/src/include/gnunet_load_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h index b130703af2..5e552271ed 100644 --- a/src/include/gnunet_microphone_lib.h +++ b/src/include/gnunet_microphone_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index 95a607cb81..3a9987964a 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h index fd1c00c4bf..79fe600833 100644 --- a/src/include/gnunet_mst_lib.h +++ b/src/include/gnunet_mst_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h index 57a82d64c9..eaf2a746fb 100644 --- a/src/include/gnunet_multicast_service.h +++ b/src/include/gnunet_multicast_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h index 59d558778a..e04fd2ca1e 100644 --- a/src/include/gnunet_my_lib.h +++ b/src/include/gnunet_my_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index 744b069b63..4d751c6eb8 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h index b3d68228fb..d7268be260 100644 --- a/src/include/gnunet_namecache_plugin.h +++ b/src/include/gnunet_namecache_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h index 8600e51b6b..82d1e0760e 100644 --- a/src/include/gnunet_namecache_service.h +++ b/src/include/gnunet_namecache_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index 0c0d28f249..a0f23e5d20 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 320e13252d..01d478646b 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h index a181c1cd84..10c2aeca57 100644 --- a/src/include/gnunet_nat_auto_service.h +++ b/src/include/gnunet_nat_auto_service.h @@ -3,7 +3,7 @@ Copyright (C) 2007-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h index 8bc3b47dc1..80edc13d6c 100644 --- a/src/include/gnunet_nat_service.h +++ b/src/include/gnunet_nat_service.h @@ -3,7 +3,7 @@ Copyright (C) 2007-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h index 5108965154..ce91b90bed 100644 --- a/src/include/gnunet_nc_lib.h +++ b/src/include/gnunet_nc_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index efde180bd5..38380b46b0 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h index ac96b867d0..41ab338939 100644 --- a/src/include/gnunet_nse_service.h +++ b/src/include/gnunet_nse_service.h @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h index bb16e61e06..b0627e0035 100644 --- a/src/include/gnunet_op_lib.h +++ b/src/include/gnunet_op_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index 57c9e7588e..483f0ae573 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h index 3d3f5a7535..9f1b8d9c48 100644 --- a/src/include/gnunet_peer_lib.h +++ b/src/include/gnunet_peer_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h index 1d9727591d..1cdca558a5 100644 --- a/src/include/gnunet_peerinfo_service.h +++ b/src/include/gnunet_peerinfo_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h index e23833267d..55a1f4d7f9 100644 --- a/src/include/gnunet_peerstore_plugin.h +++ b/src/include/gnunet_peerstore_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h index 6b41d7baea..230cb9e37a 100644 --- a/src/include/gnunet_peerstore_service.h +++ b/src/include/gnunet_peerstore_service.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h index 2e6be6615d..c95728e8f2 100644 --- a/src/include/gnunet_plugin_lib.h +++ b/src/include/gnunet_plugin_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h index 418691d775..c90a5a50d1 100644 --- a/src/include/gnunet_pq_lib.h +++ b/src/include/gnunet_pq_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h index ef1568b9c7..cbec502c6a 100644 --- a/src/include/gnunet_program_lib.h +++ b/src/include/gnunet_program_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 74ff863c65..c99b168211 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -3,7 +3,7 @@ Copyright (C) 2001--2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psyc_env.h b/src/include/gnunet_psyc_env.h index b86681ff77..294d3dedd6 100644 --- a/src/include/gnunet_psyc_env.h +++ b/src/include/gnunet_psyc_env.h @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h index afee039d41..0e1b397da6 100644 --- a/src/include/gnunet_psyc_message.h +++ b/src/include/gnunet_psyc_message.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index b4264877eb..1905a4ddeb 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h index 93959fb3a5..ff568ebc86 100644 --- a/src/include/gnunet_psyc_slicer.h +++ b/src/include/gnunet_psyc_slicer.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psyc_util_lib.h b/src/include/gnunet_psyc_util_lib.h index dd9830cc15..e70bb59e8b 100644 --- a/src/include/gnunet_psyc_util_lib.h +++ b/src/include/gnunet_psyc_util_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h index 1c7d1faf58..e8fca20d89 100644 --- a/src/include/gnunet_psycstore_plugin.h +++ b/src/include/gnunet_psycstore_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index d8c0e77e76..65b58ccd20 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h index 7189858ce8..d149cf106d 100644 --- a/src/include/gnunet_regex_service.h +++ b/src/include/gnunet_regex_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h index 3f36c236d0..cf5f0e3562 100644 --- a/src/include/gnunet_resolver_service.h +++ b/src/include/gnunet_resolver_service.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h index cb11dd4678..27df5f5c8b 100644 --- a/src/include/gnunet_rest_lib.h +++ b/src/include/gnunet_rest_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h index 0b1e7c3ffd..f84c93ea07 100644 --- a/src/include/gnunet_rest_plugin.h +++ b/src/include/gnunet_rest_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h index 787a7ec26d..4a29b3239d 100644 --- a/src/include/gnunet_revocation_service.h +++ b/src/include/gnunet_revocation_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h index d4cf60856f..75ff1756a9 100644 --- a/src/include/gnunet_rps_service.h +++ b/src/include/gnunet_rps_service.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h index 77c7ef4fb0..1a135078dc 100644 --- a/src/include/gnunet_scalarproduct_service.h +++ b/src/include/gnunet_scalarproduct_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index 787fbd0139..5f6f415483 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h index 0d78c418bf..bb16a13a8e 100644 --- a/src/include/gnunet_secretsharing_service.h +++ b/src/include/gnunet_secretsharing_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h index 370f0920c6..38c62761d3 100644 --- a/src/include/gnunet_sensor_service.h +++ b/src/include/gnunet_sensor_service.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h index a211410c3f..94be1aa12d 100644 --- a/src/include/gnunet_sensor_util_lib.h +++ b/src/include/gnunet_sensor_util_lib.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_sensordashboard_service.h b/src/include/gnunet_sensordashboard_service.h index 3272a8ebd1..e9fc75c3cc 100644 --- a/src/include/gnunet_sensordashboard_service.h +++ b/src/include/gnunet_sensordashboard_service.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h index b2a2714d02..43a15ccedb 100644 --- a/src/include/gnunet_service_lib.h +++ b/src/include/gnunet_service_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 760e11757d..36a88e162c 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h index 4a2edffa3c..87c1ddc692 100644 --- a/src/include/gnunet_signal_lib.h +++ b/src/include/gnunet_signal_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h index e7c85eedac..16fc68d0c4 100644 --- a/src/include/gnunet_signatures.h +++ b/src/include/gnunet_signatures.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index 6929a47d15..a93248846a 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h index 7d4f7042b0..daba84b4eb 100644 --- a/src/include/gnunet_socks.h +++ b/src/include/gnunet_socks.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h index 4ec2483934..f3348e2337 100644 --- a/src/include/gnunet_speaker_lib.h +++ b/src/include/gnunet_speaker_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h index db542564d4..3437178976 100644 --- a/src/include/gnunet_sq_lib.h +++ b/src/include/gnunet_sq_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h index 5bdfe7bce4..7ff7972463 100644 --- a/src/include/gnunet_statistics_service.h +++ b/src/include/gnunet_statistics_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index e490c304d0..a50dd47cb7 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h index 7302dec0b1..48c3fa599e 100644 --- a/src/include/gnunet_testbed_logger_service.h +++ b/src/include/gnunet_testbed_logger_service.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 2701d49d75..07a7cf2ac0 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index f88c1ae0a5..a8ee2a9604 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h index a064ca5a83..488faafbe9 100644 --- a/src/include/gnunet_time_lib.h +++ b/src/include/gnunet_time_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h index 92401e3433..cd82b877b8 100644 --- a/src/include/gnunet_transport_communication_service.h +++ b/src/include/gnunet_transport_communication_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h index 143b865e8f..14255eee01 100644 --- a/src/include/gnunet_transport_core_service.h +++ b/src/include/gnunet_transport_core_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h index 2ce3fc8332..3a0baa146b 100644 --- a/src/include/gnunet_transport_hello_service.h +++ b/src/include/gnunet_transport_hello_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h index f04b1572b2..56a426a1bf 100644 --- a/src/include/gnunet_transport_manipulation_service.h +++ b/src/include/gnunet_transport_manipulation_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h index c91c6a8c9f..aef9bdadc8 100644 --- a/src/include/gnunet_transport_monitor_service.h +++ b/src/include/gnunet_transport_monitor_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index 7cbdc114f3..29ef379218 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index d291609a8a..9b8eea8473 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h index 0a4a8a7474..666ef16248 100644 --- a/src/include/gnunet_tun_lib.h +++ b/src/include/gnunet_tun_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index 3395da5afa..2cbdc29ec0 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h index 2ec7495aa1..086c7bc747 100644 --- a/src/include/gnunet_util_taler_wallet_lib.h +++ b/src/include/gnunet_util_taler_wallet_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h index 0ea87c5d2f..a081ad5fe9 100644 --- a/src/include/gnunet_vpn_service.h +++ b/src/include/gnunet_vpn_service.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/platform.h b/src/include/platform.h index 8062ca658e..a5cbf718a0 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/include/winproc.h b/src/include/winproc.h index 1540293123..c1f02fc17b 100644 --- a/src/include/winproc.h +++ b/src/include/winproc.h @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index f3c10014ec..3987bd357a 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in @@ -3,7 +3,7 @@ # (C) 2010 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 22b6b07131..59a5aee060 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2017, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index c9b63b3923..117affd436 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index ea3cf57e20..a98b95d497 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index be08b1b42e..2c657a636b 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2017 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index 744af9e533..17019302be 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index da2df45b72..ae6027a37b 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2017 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index be1f720582..118842266a 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/json/json.c b/src/json/json.c index cde0e95032..cc3e84147a 100644 --- a/src/json/json.c +++ b/src/json/json.c @@ -3,7 +3,7 @@ Copyright (C) 2014-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 3daef5b101..609c18395e 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/json/json_helper.c b/src/json/json_helper.c index 772df2e37f..a0c4b88d9e 100644 --- a/src/json/json_helper.c +++ b/src/json/json_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c index 0950924687..9fef4f22e8 100644 --- a/src/json/json_mhd.c +++ b/src/json/json_mhd.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/json/test_json.c b/src/json/test_json.c index 282d0481aa..4c9612b05b 100644 --- a/src/json/test_json.c +++ b/src/json/test_json.c @@ -3,7 +3,7 @@ (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/jsonapi/jsonapi.c b/src/jsonapi/jsonapi.c index 23b555fefd..2ad4e693d2 100644 --- a/src/jsonapi/jsonapi.c +++ b/src/jsonapi/jsonapi.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/jsonapi/test_jsonapi.c b/src/jsonapi/test_jsonapi.c index 9f668bcd98..ff3061abf9 100644 --- a/src/jsonapi/test_jsonapi.c +++ b/src/jsonapi/test_jsonapi.c @@ -3,7 +3,7 @@ (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c index a645d0a222..c56f5ed370 100644 --- a/src/multicast/gnunet-multicast.c +++ b/src/multicast/gnunet-multicast.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 137bc84470..5b1c02575c 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h index 561f8c36ca..d9f5372a1b 100644 --- a/src/multicast/multicast.h +++ b/src/multicast/multicast.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 4f842ca802..71dc705228 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 7f1cb54d7a..00d397ef97 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c index 8f19de40a7..38787d2a92 100644 --- a/src/multicast/test_multicast_2peers.c +++ b/src/multicast/test_multicast_2peers.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 4c0fae51d7..2eb2dee310 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/my/my.c b/src/my/my.c index 59f10db98f..d207e0f740 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -3,7 +3,7 @@ Copyright (C) 2016 Inria & GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c index a842703b8c..13671dc655 100644 --- a/src/my/my_query_helper.c +++ b/src/my/my_query_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c index af3ce72ae9..d355ad1576 100644 --- a/src/my/my_result_helper.c +++ b/src/my/my_result_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/my/test_my.c b/src/my/test_my.c index 5a8dadb992..2db775dc68 100644 --- a/src/my/test_my.c +++ b/src/my/test_my.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c index 673a44fb97..b93428ed61 100644 --- a/src/mysql/mysql.c +++ b/src/mysql/mysql.c @@ -4,7 +4,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c index 55bc5835c5..cb79ea3bb0 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/namecache/gnunet-namecache.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c index a90d7c4411..484a9f4b58 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/namecache/gnunet-service-namecache.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/namecache.h b/src/namecache/namecache.h index e9f7f529ba..f598328760 100644 --- a/src/namecache/namecache.h +++ b/src/namecache/namecache.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c index b70e9f030f..faaf1e3d6f 100644 --- a/src/namecache/namecache_api.c +++ b/src/namecache/namecache_api.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index 7b7705c9c5..7f9ade0077 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2015 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c index 550b59a7a2..4112dc65a9 100644 --- a/src/namecache/plugin_namecache_postgres.c +++ b/src/namecache/plugin_namecache_postgres.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2013, 2016, 2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c index 39090b9040..b66cdcef78 100644 --- a/src/namecache/plugin_namecache_sqlite.c +++ b/src/namecache/plugin_namecache_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c index 415236811b..85f5ddbcfe 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/namecache/test_namecache_api_cache_block.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namecache/test_plugin_namecache.c b/src/namecache/test_plugin_namecache.c index b12c756546..3dd3504276 100644 --- a/src/namecache/test_plugin_namecache.c +++ b/src/namecache/test_plugin_namecache.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 3e3e598e79..89e42ddaca 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index a30cdbb00e..1ff6d5e4a0 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index cf11597706..dfa2c1fb01 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2014, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index 93994ccab7..fc9753b112 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 4935c1c726..2eb5cdc3b5 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index c0a3e0cdd1..ed761ec3e4 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c index 008d257d29..80d34b9ead 100644 --- a/src/namestore/namestore_api_monitor.c +++ b/src/namestore/namestore_api_monitor.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c index cf792751e3..b4e457f44a 100644 --- a/src/namestore/perf_namestore_api_zone_iteration.c +++ b/src/namestore/perf_namestore_api_zone_iteration.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c index 5a9c44a88f..1b3bfa61f2 100644 --- a/src/namestore/plugin_namestore_flat.c +++ b/src/namestore/plugin_namestore_flat.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2015, 2018 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 1db9e174fa..5f40fba0a0 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2013, 2016-2018 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index c3babce46a..e0e8389878 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2009-2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c index 471ea7a788..94cb580ce4 100644 --- a/src/namestore/plugin_rest_namestore.c +++ b/src/namestore/plugin_rest_namestore.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index 93b0b7cfeb..280ea8f9b3 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c index 09b6d5f9c0..f28b7f8883 100644 --- a/src/namestore/test_namestore_api_lookup_private.c +++ b/src/namestore/test_namestore_api_lookup_private.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c index 79f30fe9bd..004604a762 100644 --- a/src/namestore/test_namestore_api_lookup_public.c +++ b/src/namestore/test_namestore_api_lookup_public.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index afe3dbeb85..e67631f27f 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c index ba4d6a1fc6..62c049696f 100644 --- a/src/namestore/test_namestore_api_lookup_shadow_filter.c +++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index b3e38a2376..f0664251b6 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index e1c0929106..5dea6e01fb 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 4a1d580a37..2bae074158 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index ccb764fb75..2327178da0 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index b8e062690f..de24bdc578 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index 846dc8b135..0d1e226865 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 225268144a..fba3bc0ddb 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index 1cf24e0322..24dce20a76 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 34deeab426..326c9ea0f6 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index a1a1bca5b8..17023f81f0 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index fb0c95ca4d..5419df14a9 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index ae0dcb6283..fddc4f2c0d 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c index 098150e2c3..aa66a28236 100644 --- a/src/nat-auto/gnunet-nat-auto.c +++ b/src/nat-auto/gnunet-nat-auto.c @@ -3,7 +3,7 @@ Copyright (C) 2015, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c index 87054d934f..d9deafe2ef 100644 --- a/src/nat-auto/gnunet-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-nat-auto_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c index 913c4a4f63..7656af5c3e 100644 --- a/src/nat-auto/gnunet-nat-server.c +++ b/src/nat-auto/gnunet-nat-server.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/nat-auto/gnunet-service-nat-auto.c index 3084f53e5a..d7037b8110 100644 --- a/src/nat-auto/gnunet-service-nat-auto.c +++ b/src/nat-auto/gnunet-service-nat-auto.c @@ -3,7 +3,7 @@ Copyright (C) 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c index a3d5678adb..a839834e3d 100644 --- a/src/nat-auto/gnunet-service-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/nat-auto.h b/src/nat-auto/nat-auto.h index 1673bea039..10624cba49 100644 --- a/src/nat-auto/nat-auto.h +++ b/src/nat-auto/nat-auto.h @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c index bc180904d1..3fc8bc8ad9 100644 --- a/src/nat-auto/nat_auto_api.c +++ b/src/nat-auto/nat_auto_api.c @@ -3,7 +3,7 @@ Copyright (C) 2007-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c index 8325da5276..7410e5ce0c 100644 --- a/src/nat-auto/nat_auto_api_test.c +++ b/src/nat-auto/nat_auto_api_test.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c index 4d641e5f17..55c6d70073 100644 --- a/src/nat/gnunet-helper-nat-client-windows.c +++ b/src/nat/gnunet-helper-nat-client-windows.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-helper-nat-client.c b/src/nat/gnunet-helper-nat-client.c index 839c9c175e..ec4a1c87a1 100644 --- a/src/nat/gnunet-helper-nat-client.c +++ b/src/nat/gnunet-helper-nat-client.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c index 53f4ed6de1..328189e765 100644 --- a/src/nat/gnunet-helper-nat-server-windows.c +++ b/src/nat/gnunet-helper-nat-server-windows.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-helper-nat-server.c b/src/nat/gnunet-helper-nat-server.c index 2978261e4f..116b3255cd 100644 --- a/src/nat/gnunet-helper-nat-server.c +++ b/src/nat/gnunet-helper-nat-server.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index 60c1c56512..472d4b28ef 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c @@ -3,7 +3,7 @@ Copyright (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 43c1740c30..74d1e5ecf6 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c @@ -3,7 +3,7 @@ Copyright (C) 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat.h b/src/nat/gnunet-service-nat.h index 96cda80cac..ec5578c21b 100644 --- a/src/nat/gnunet-service-nat.h +++ b/src/nat/gnunet-service-nat.h @@ -3,7 +3,7 @@ Copyright (C) 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/nat/gnunet-service-nat_externalip.c index 2c5494d5e9..28ea5b1264 100644 --- a/src/nat/gnunet-service-nat_externalip.c +++ b/src/nat/gnunet-service-nat_externalip.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_externalip.h b/src/nat/gnunet-service-nat_externalip.h index 211856d705..5c0405c7b4 100644 --- a/src/nat/gnunet-service-nat_externalip.h +++ b/src/nat/gnunet-service-nat_externalip.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c index fe591b63fe..e11c89b61f 100644 --- a/src/nat/gnunet-service-nat_helper.c +++ b/src/nat/gnunet-service-nat_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_helper.h b/src/nat/gnunet-service-nat_helper.h index f5e129def7..3692faec12 100644 --- a/src/nat/gnunet-service-nat_helper.h +++ b/src/nat/gnunet-service-nat_helper.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c index 10bebaa7ad..c27908518b 100644 --- a/src/nat/gnunet-service-nat_mini.c +++ b/src/nat/gnunet-service-nat_mini.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_mini.h b/src/nat/gnunet-service-nat_mini.h index 341954c8b1..7643f43d9a 100644 --- a/src/nat/gnunet-service-nat_mini.h +++ b/src/nat/gnunet-service-nat_mini.h @@ -3,7 +3,7 @@ Copyright (C) 2011-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_stun.c b/src/nat/gnunet-service-nat_stun.c index 26acf71519..7f1bae5f17 100644 --- a/src/nat/gnunet-service-nat_stun.c +++ b/src/nat/gnunet-service-nat_stun.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/gnunet-service-nat_stun.h b/src/nat/gnunet-service-nat_stun.h index 070a0dab89..a5d3c50a37 100644 --- a/src/nat/gnunet-service-nat_stun.h +++ b/src/nat/gnunet-service-nat_stun.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/nat.h b/src/nat/nat.h index 89832cc2b6..0fb32a1870 100644 --- a/src/nat/nat.h +++ b/src/nat/nat.h @@ -3,7 +3,7 @@ Copyright (C) 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c index 339b7c0387..9c8de0c2cd 100644 --- a/src/nat/nat_api.c +++ b/src/nat/nat_api.c @@ -3,7 +3,7 @@ Copyright (C) 2007-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c index 3697d93419..a3cb6aaa72 100644 --- a/src/nat/nat_api_stun.c +++ b/src/nat/nat_api_stun.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h index 5fa160ce69..707f3754dd 100644 --- a/src/nat/nat_stun.h +++ b/src/nat/nat_stun.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 8afee1e78e..2d0b5d1b45 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index 047348dd58..70f7803e21 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index be226afd28..e8e3a0ec25 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c index d2b768569e..0d593bfe8c 100644 --- a/src/nat/test_stun.c +++ b/src/nat/test_stun.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index d02aed17cb..33163c6337 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c index 730d233c18..23c962c5bb 100644 --- a/src/nse/gnunet-nse.c +++ b/src/nse/gnunet-nse.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 1e8257513f..58b1525056 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/nse.h b/src/nse/nse.h index e1219dfa24..1e00f78196 100644 --- a/src/nse/nse.h +++ b/src/nse/nse.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index f9acd93142..91e92acdeb 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c index 7900095aee..42636d5377 100644 --- a/src/nse/perf_kdf.c +++ b/src/nse/perf_kdf.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 5714c33fa5..35dc5902e5 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index aeea216d7f..02af534b7d 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c index ddc295eef7..7366c54417 100644 --- a/src/peerinfo-tool/gnunet-peerinfo.c +++ b/src/peerinfo-tool/gnunet-peerinfo.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.c b/src/peerinfo-tool/gnunet-peerinfo_plugins.c index dd1be3eeac..9c6177b247 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.h b/src/peerinfo-tool/gnunet-peerinfo_plugins.h index a8420c7ab3..4ee059638a 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.h +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index cbd6191b85..6a0ea939c3 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index bb05fbc953..e00067e2ac 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h index 607cf00338..8c38ff47d8 100644 --- a/src/peerinfo/peerinfo.h +++ b/src/peerinfo/peerinfo.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index d84338417d..ded566a282 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c index 195bd78ae8..d607a43a2a 100644 --- a/src/peerinfo/peerinfo_api_notify.c +++ b/src/peerinfo/peerinfo_api_notify.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 0e093673f4..2ae7637898 100644 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009, 2010, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 3bf6c4ff0a..9a1d2e681a 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/test_peerinfo_api_friend_only.c b/src/peerinfo/test_peerinfo_api_friend_only.c index 0c2c203a07..148ca3da9c 100644 --- a/src/peerinfo/test_peerinfo_api_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_friend_only.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c index 0192e2246b..8f4e920b01 100644 --- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c index 1411d24c73..989c15a024 100644 --- a/src/peerinfo/test_peerinfo_shipped_hellos.c +++ b/src/peerinfo/test_peerinfo_shipped_hellos.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c index dfff50cb73..552a419f2a 100644 --- a/src/peerstore/gnunet-peerstore.c +++ b/src/peerstore/gnunet-peerstore.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c index ee92a25b07..e174af6311 100644 --- a/src/peerstore/gnunet-service-peerstore.c +++ b/src/peerstore/gnunet-service-peerstore.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h index 5c866f3c2c..6461649dec 100644 --- a/src/peerstore/peerstore.h +++ b/src/peerstore/peerstore.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c index 788ea43cbe..c40e1bf4bd 100644 --- a/src/peerstore/peerstore_api.c +++ b/src/peerstore/peerstore_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c index c046344eb6..8c9d62d522 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/peerstore/peerstore_common.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h index 2b8d621da6..16fdfd1b7b 100644 --- a/src/peerstore/peerstore_common.h +++ b/src/peerstore/peerstore_common.h @@ -3,7 +3,7 @@ Copyright (C) 2013-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c index dcbaab3b41..60f4c6ecaf 100644 --- a/src/peerstore/perf_peerstore_store.c +++ b/src/peerstore/perf_peerstore_store.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index b8903908a7..098aa37b08 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Christian Grothoff (and other contributing authors) * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c index 31add2bad1..e8d8423113 100644 --- a/src/peerstore/plugin_peerstore_sqlite.c +++ b/src/peerstore/plugin_peerstore_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2013, 2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c index 98089e867a..4c8d64ff1e 100644 --- a/src/peerstore/test_peerstore_api_iterate.c +++ b/src/peerstore/test_peerstore_api_iterate.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c index 3ee2789ea6..8059dc9d98 100644 --- a/src/peerstore/test_peerstore_api_store.c +++ b/src/peerstore/test_peerstore_api_store.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c index b18575220d..7a575efa5c 100644 --- a/src/peerstore/test_peerstore_api_sync.c +++ b/src/peerstore/test_peerstore_api_sync.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c index ccb9414759..39173da2b3 100644 --- a/src/peerstore/test_peerstore_api_watch.c +++ b/src/peerstore/test_peerstore_api_watch.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/peerstore/test_plugin_peerstore.c b/src/peerstore/test_plugin_peerstore.c index c20f7cbe17..81d7d3f216 100644 --- a/src/peerstore/test_plugin_peerstore.c +++ b/src/peerstore/test_plugin_peerstore.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq.c b/src/pq/pq.c index 2097e7f806..05d9e13e13 100644 --- a/src/pq/pq.c +++ b/src/pq/pq.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c index eedc901706..e55f51cbe5 100644 --- a/src/pq/pq_connect.c +++ b/src/pq/pq_connect.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_eval.c b/src/pq/pq_eval.c index 20926ce10b..d40e0fb612 100644 --- a/src/pq/pq_eval.c +++ b/src/pq/pq_eval.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c index feb51415d3..1d84ac7a8e 100644 --- a/src/pq/pq_exec.c +++ b/src/pq/pq_exec.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c index af5c5e29dd..2ddae67ee1 100644 --- a/src/pq/pq_prepare.c +++ b/src/pq/pq_prepare.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c index b532fe1c32..1d35cda07e 100644 --- a/src/pq/pq_query_helper.c +++ b/src/pq/pq_query_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c index e10afbb74c..a011e4d084 100644 --- a/src/pq/pq_result_helper.c +++ b/src/pq/pq_result_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c index 6f5208c3dc..2c839d9ee0 100644 --- a/src/pq/test_pq.c +++ b/src/pq/test_pq.c @@ -3,7 +3,7 @@ (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index be6d442c45..93ad7516fc 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h index c6a5b26dd2..e630ae57bb 100644 --- a/src/psyc/psyc.h +++ b/src/psyc/psyc.h @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c index 6d431c2003..9fd588a80a 100644 --- a/src/psyc/psyc_api.c +++ b/src/psyc/psyc_api.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/psyc_test_lib.h b/src/psyc/psyc_test_lib.h index 02a09cdfcf..4f261e7388 100644 --- a/src/psyc/psyc_test_lib.h +++ b/src/psyc/psyc_test_lib.h @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index f76ebbaac7..1765666b25 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c index 636d49b86f..598b60a569 100644 --- a/src/psyc/test_psyc2.c +++ b/src/psyc/test_psyc2.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c index c42274fed7..2c850e9b77 100644 --- a/src/psyc/test_psyc_api_join.c +++ b/src/psyc/test_psyc_api_join.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index b544ecb86a..28d301b8b0 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index 4a75e9997d..5992d3aa0d 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c index 3fba646d6d..bf3f9f29e2 100644 --- a/src/psycstore/plugin_psycstore_postgres.c +++ b/src/psycstore/plugin_psycstore_postgres.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c index 44a9f4a56b..cab3b0686b 100644 --- a/src/psycstore/plugin_psycstore_sqlite.c +++ b/src/psycstore/plugin_psycstore_sqlite.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h index 23308ba48e..d8d44b9911 100644 --- a/src/psycstore/psycstore.h +++ b/src/psycstore/psycstore.h @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c index 4cfd3c2c56..7e20f7fe99 100644 --- a/src/psycstore/psycstore_api.c +++ b/src/psycstore/psycstore_api.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c index 7a0fb7fa1c..c544a568d9 100644 --- a/src/psycstore/test_plugin_psycstore.c +++ b/src/psycstore/test_plugin_psycstore.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 771c929a89..9ef430c005 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c index f06259dbbd..6f1a11df53 100644 --- a/src/psycutil/psyc_env.c +++ b/src/psycutil/psyc_env.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c index f5c91f4d23..cdf87d9de7 100644 --- a/src/psycutil/psyc_message.c +++ b/src/psycutil/psyc_message.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c index a93b6633b1..471d83b4b9 100644 --- a/src/psycutil/psyc_slicer.c +++ b/src/psycutil/psyc_slicer.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c index 91be092b86..afbcf26af1 100644 --- a/src/psycutil/test_psyc_env.c +++ b/src/psycutil/test_psyc_env.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c index d194a37b1b..f3073c0261 100644 --- a/src/pt/gnunet-daemon-pt.c +++ b/src/pt/gnunet-daemon-pt.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012, 2017 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index b4e46da19a..4b471710cf 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c @@ -3,7 +3,7 @@ Copyright (C) 2007, 2009, 2011, 2012, 2015, 2017 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 5addcf172f..1144ab68e4 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c @@ -3,7 +3,7 @@ Copyright (C) 2007, 2009, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index 198ac1dd7b..d6e26bd1b8 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 6cdbfcfe96..2fe3a08734 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2011 - 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c index cdeeaf0f0b..40ae9befb7 100644 --- a/src/regex/gnunet-regex-simulation-profiler.c +++ b/src/regex/gnunet-regex-simulation-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c index 0c697c3d84..3e474e2fa3 100644 --- a/src/regex/gnunet-service-regex.c +++ b/src/regex/gnunet-service-regex.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c index 9940ba388e..35b680993c 100644 --- a/src/regex/perf-regex.c +++ b/src/regex/perf-regex.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c index 95b4df4611..fc12495dd7 100644 --- a/src/regex/plugin_block_regex.c +++ b/src/regex/plugin_block_regex.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c index 14ab15948d..73be729409 100644 --- a/src/regex/regex_api_announce.c +++ b/src/regex/regex_api_announce.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c index 9695195ecc..4c41adc21f 100644 --- a/src/regex/regex_api_search.c +++ b/src/regex/regex_api_search.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c index 1ae295745b..fa847493ac 100644 --- a/src/regex/regex_block_lib.c +++ b/src/regex/regex_block_lib.c @@ -3,7 +3,7 @@ Copyright (C) 2012,2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_block_lib.h b/src/regex/regex_block_lib.h index e0ccf5f83e..81e6da1d3f 100644 --- a/src/regex/regex_block_lib.h +++ b/src/regex/regex_block_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012,2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c index 740e1be3d6..ea5bca9a9c 100644 --- a/src/regex/regex_internal.c +++ b/src/regex/regex_internal.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h index 6180305c06..28a999da62 100644 --- a/src/regex/regex_internal.h +++ b/src/regex/regex_internal.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c index b68341a2c8..50bc3ceae7 100644 --- a/src/regex/regex_internal_dht.c +++ b/src/regex/regex_internal_dht.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h index 8b2dfce523..aca97cd3e6 100644 --- a/src/regex/regex_internal_lib.h +++ b/src/regex/regex_internal_lib.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_ipc.h b/src/regex/regex_ipc.h index 2b3345f989..769a2e4b14 100644 --- a/src/regex/regex_ipc.h +++ b/src/regex/regex_ipc.h @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c index be0f65ece5..4d8c32f292 100644 --- a/src/regex/regex_test_graph.c +++ b/src/regex/regex_test_graph.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index 4ae2892ebb..84eebcb1c7 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c @@ -3,7 +3,7 @@ * Copyright (C) 2012-2017 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/regex/regex_test_lib.h b/src/regex/regex_test_lib.h index f7af542017..7d7867f385 100644 --- a/src/regex/regex_test_lib.h +++ b/src/regex/regex_test_lib.h @@ -3,7 +3,7 @@ * Copyright (C) 2012 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c index 3307bd0435..d9d72b2501 100644 --- a/src/regex/regex_test_random.c +++ b/src/regex/regex_test_random.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c index fa9b05baf4..7865ed7a53 100644 --- a/src/regex/test_regex_api.c +++ b/src/regex/test_regex_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c index d0a4a5be82..d421e26f3e 100644 --- a/src/regex/test_regex_eval_api.c +++ b/src/regex/test_regex_eval_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c index c9ab692a13..ced4c53460 100644 --- a/src/regex/test_regex_graph_api.c +++ b/src/regex/test_regex_graph_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c index 41121404c8..cfcf72fa00 100644 --- a/src/regex/test_regex_integration.c +++ b/src/regex/test_regex_integration.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c index 4ffdb973c2..129dd83cb4 100644 --- a/src/regex/test_regex_iterate_api.c +++ b/src/regex/test_regex_iterate_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c index a29fe52b47..92bdb37924 100644 --- a/src/regex/test_regex_proofs.c +++ b/src/regex/test_regex_proofs.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index 19084af164..f71ba1deae 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rest/rest.c b/src/rest/rest.c index fa54a5c2d8..1a7a1868f2 100644 --- a/src/rest/rest.c +++ b/src/rest/rest.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index 51e33a62f3..e7c256f2c4 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index f60141fe6a..8a7ca61305 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c index 53b61d1062..c6ea1d040c 100644 --- a/src/revocation/plugin_block_revocation.c +++ b/src/revocation/plugin_block_revocation.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/revocation.h b/src/revocation/revocation.h index 934d678510..eff4ea66c9 100644 --- a/src/revocation/revocation.h +++ b/src/revocation/revocation.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c index 8bde51fc83..e435086385 100644 --- a/src/revocation/revocation_api.c +++ b/src/revocation/revocation_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index b9acd10dbc..d8c15a0e4a 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.py.in @@ -3,7 +3,7 @@ # (C) 2010, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index b28cf5ba53..95a457590c 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index 217c2fbbc2..429f645bee 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c index b91fdf6cd9..0162b64516 100644 --- a/src/rps/gnunet-rps.c +++ b/src/rps/gnunet-rps.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 9a9f6a91e7..187770e167 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c index 335f4d2e3f..2fff30de7a 100644 --- a/src/rps/gnunet-service-rps_custommap.c +++ b/src/rps/gnunet-service-rps_custommap.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_custommap.h b/src/rps/gnunet-service-rps_custommap.h index f2cb58bc96..87cf3f1c4f 100644 --- a/src/rps/gnunet-service-rps_custommap.h +++ b/src/rps/gnunet-service-rps_custommap.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c index de8b516981..5debcfe670 100644 --- a/src/rps/gnunet-service-rps_sampler.c +++ b/src/rps/gnunet-service-rps_sampler.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/rps/gnunet-service-rps_sampler.h index de82d9f33d..fa6e111832 100644 --- a/src/rps/gnunet-service-rps_sampler.h +++ b/src/rps/gnunet-service-rps_sampler.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_sampler_elem.c b/src/rps/gnunet-service-rps_sampler_elem.c index 7d6c7f8452..9d595ebef2 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.c +++ b/src/rps/gnunet-service-rps_sampler_elem.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_sampler_elem.h b/src/rps/gnunet-service-rps_sampler_elem.h index e52be95ed3..70063263ea 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.h +++ b/src/rps/gnunet-service-rps_sampler_elem.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_view.c b/src/rps/gnunet-service-rps_view.c index 7181a33373..968c5515b4 100644 --- a/src/rps/gnunet-service-rps_view.c +++ b/src/rps/gnunet-service-rps_view.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/gnunet-service-rps_view.h b/src/rps/gnunet-service-rps_view.h index ee04699f86..3ff3f2ba01 100644 --- a/src/rps/gnunet-service-rps_view.h +++ b/src/rps/gnunet-service-rps_view.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 2d53cbffd4..64b9581ac2 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index e05b0cf6cf..0741051c07 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/rps.h b/src/rps/rps.h index 76485c56da..6682613c7e 100644 --- a/src/rps/rps.h +++ b/src/rps/rps.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c index 9e591510cc..083e1e0471 100644 --- a/src/rps/rps_api.c +++ b/src/rps/rps_api.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index 1f6d88f326..84a3da42d0 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/test_rps_api.c b/src/rps/test_rps_api.c index d3ca4d2360..32258135c3 100644 --- a/src/rps/test_rps_api.c +++ b/src/rps/test_rps_api.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c index eeab0db92a..263bdb3f53 100644 --- a/src/rps/test_service_rps_custommap.c +++ b/src/rps/test_service_rps_custommap.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/test_service_rps_sampler_elem.c b/src/rps/test_service_rps_sampler_elem.c index f97ee57191..3d6dbef44d 100644 --- a/src/rps/test_service_rps_sampler_elem.c +++ b/src/rps/test_service_rps_sampler_elem.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/rps/test_service_rps_view.c b/src/rps/test_service_rps_view.c index 2606c6deb3..f5a59cb0d7 100644 --- a/src/rps/test_service_rps_view.c +++ b/src/rps/test_service_rps_view.c @@ -3,7 +3,7 @@ Copyright (C) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c index fe5099c078..6c8a947a92 100644 --- a/src/scalarproduct/gnunet-scalarproduct.c +++ b/src/scalarproduct/gnunet-scalarproduct.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h index 1fab820014..f33ad2a90a 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c index 94b2029afa..a0f71c5114 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index 63d1490cd7..f6382cb54b 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h b/src/scalarproduct/gnunet-service-scalarproduct.h index f8d7f197f6..91652bcf01 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct.h +++ b/src/scalarproduct/gnunet-service-scalarproduct.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index ddd4e42f40..1a76a3ffb9 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 0f94093b77..a4b394537a 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h index 700a545299..c9ea3aeb00 100644 --- a/src/scalarproduct/scalarproduct.h +++ b/src/scalarproduct/scalarproduct.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c index 061929000c..1b72c55f1d 100644 --- a/src/scalarproduct/scalarproduct_api.c +++ b/src/scalarproduct/scalarproduct_api.c @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/scalarproduct/test_ecc_scalarproduct.c b/src/scalarproduct/test_ecc_scalarproduct.c index d04bc9b649..8fbc126df0 100644 --- a/src/scalarproduct/test_ecc_scalarproduct.c +++ b/src/scalarproduct/test_ecc_scalarproduct.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index 89c2315096..774e727212 100644 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index 34b71f4a2b..5c81080d3d 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/secretsharing.h b/src/secretsharing/secretsharing.h index 6c3c2deaaf..61e280797e 100644 --- a/src/secretsharing/secretsharing.h +++ b/src/secretsharing/secretsharing.h @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c index 9792c58d0b..744a3443b0 100644 --- a/src/secretsharing/secretsharing_api.c +++ b/src/secretsharing/secretsharing_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/secretsharing_common.c b/src/secretsharing/secretsharing_common.c index 5f0380ba33..7f8f050a6c 100644 --- a/src/secretsharing/secretsharing_common.c +++ b/src/secretsharing/secretsharing_common.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/secretsharing_protocol.h b/src/secretsharing/secretsharing_protocol.h index 4b94238363..be47053467 100644 --- a/src/secretsharing/secretsharing_protocol.h +++ b/src/secretsharing/secretsharing_protocol.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c index 43b6787f32..375daa2422 100644 --- a/src/secretsharing/test_secretsharing_api.c +++ b/src/secretsharing/test_secretsharing_api.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 3e0955108e..698ec65a4d 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h index 416e136d74..9fa585d0f3 100644 --- a/src/set/gnunet-service-set.h +++ b/src/set/gnunet-service-set.h @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index 44c7e6d5d2..bdd2714601 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_intersection.h b/src/set/gnunet-service-set_intersection.h index 2506c83eb7..cce97f60ff 100644 --- a/src/set/gnunet-service-set_intersection.h +++ b/src/set/gnunet-service-set_intersection.h @@ -4,7 +4,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_protocol.h b/src/set/gnunet-service-set_protocol.h index b134818c41..d1c60f48b9 100644 --- a/src/set/gnunet-service-set_protocol.h +++ b/src/set/gnunet-service-set_protocol.h @@ -3,7 +3,7 @@ Copyright (C) 2013, 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index f8253da2e4..440d0d1b0d 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c @@ -3,7 +3,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_union.h b/src/set/gnunet-service-set_union.h index f9fe1d2651..ba02ad20d3 100644 --- a/src/set/gnunet-service-set_union.h +++ b/src/set/gnunet-service-set_union.h @@ -4,7 +4,7 @@ Copyright (C) 2013-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c index 16eb9c9ff1..ebdf030a65 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.c +++ b/src/set/gnunet-service-set_union_strata_estimator.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-service-set_union_strata_estimator.h b/src/set/gnunet-service-set_union_strata_estimator.h index 0b01aaee94..0abe162da8 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.h +++ b/src/set/gnunet-service-set_union_strata_estimator.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c index 8ed4935b3e..e66b384233 100644 --- a/src/set/gnunet-set-ibf-profiler.c +++ b/src/set/gnunet-set-ibf-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index c622049231..6d6d3e247c 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/ibf.c b/src/set/ibf.c index 8002c173f2..5427847591 100644 --- a/src/set/ibf.c +++ b/src/set/ibf.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/ibf.h b/src/set/ibf.h index 71589a49dd..8da6cb11b5 100644 --- a/src/set/ibf.h +++ b/src/set/ibf.h @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c index d1b665f854..65c852af5f 100644 --- a/src/set/ibf_sim.c +++ b/src/set/ibf_sim.c @@ -3,7 +3,7 @@ Copyright (C) 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c index 9e0113464e..789f787d86 100644 --- a/src/set/plugin_block_set_test.c +++ b/src/set/plugin_block_set_test.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/set.h b/src/set/set.h index b22f98a8b9..0af9536888 100644 --- a/src/set/set.h +++ b/src/set/set.h @@ -3,7 +3,7 @@ Copyright (C) 2012-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/set_api.c b/src/set/set_api.c index 5026e9b04c..7ca6116798 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c index 67e8bff05c..c694365e10 100644 --- a/src/set/test_set_api.c +++ b/src/set/test_set_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c index 755d08fdbb..0ac21846b7 100644 --- a/src/set/test_set_intersection_result_full.c +++ b/src/set/test_set_intersection_result_full.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/test_set_union_copy.c b/src/set/test_set_union_copy.c index 7940fdd14a..63171c1414 100644 --- a/src/set/test_set_union_copy.c +++ b/src/set/test_set_union_copy.c @@ -3,7 +3,7 @@ Copyright (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c index 79275c5861..6b38ff500d 100644 --- a/src/set/test_set_union_result_symmetric.c +++ b/src/set/test_set_union_result_symmetric.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 52c466e64e..62c822547e 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index 353081648c..9bc85ad165 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/social/social.h b/src/social/social.h index 8069310488..6334935aa6 100644 --- a/src/social/social.h +++ b/src/social/social.h @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/social/social_api.c b/src/social/social_api.c index 8c32760ae9..7fb21371d9 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/social/test_social.c b/src/social/test_social.c index 09b1322465..926a49fba4 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c @@ -3,7 +3,7 @@ * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published + * under the terms of the GNU Affero General Public License as published * by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * diff --git a/src/sq/sq.c b/src/sq/sq.c index 7352cc3d9b..43539fbc04 100644 --- a/src/sq/sq.c +++ b/src/sq/sq.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/sq/sq_exec.c b/src/sq/sq_exec.c index c5d581c38a..27173c096b 100644 --- a/src/sq/sq_exec.c +++ b/src/sq/sq_exec.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c index 5afff1749a..838451fcb6 100644 --- a/src/sq/sq_prepare.c +++ b/src/sq/sq_prepare.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c index e4fcdbab66..7572ba0f00 100644 --- a/src/sq/sq_query_helper.c +++ b/src/sq/sq_query_helper.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c index 6b551bafc7..93ce848565 100644 --- a/src/sq/sq_result_helper.c +++ b/src/sq/sq_result_helper.c @@ -4,7 +4,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c index 914af8fdea..9b5d805f2e 100644 --- a/src/sq/test_sq.c +++ b/src/sq/test_sq.c @@ -3,7 +3,7 @@ (C) 2015, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c index c14969ae31..256c6c9f13 100644 --- a/src/statistics/gnunet-service-statistics.c +++ b/src/statistics/gnunet-service-statistics.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2012, 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c index 659b76d340..af84455f65 100644 --- a/src/statistics/gnunet-statistics.c +++ b/src/statistics/gnunet-statistics.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004-2007, 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/statistics.h b/src/statistics/statistics.h index 79abe7daa4..d3293448f8 100644 --- a/src/statistics/statistics.h +++ b/src/statistics/statistics.h @@ -3,7 +3,7 @@ Copyright (C) 2001-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c index 66a4c3a642..f5a1b30076 100644 --- a/src/statistics/statistics_api.c +++ b/src/statistics/statistics_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 1776d39a93..0e980a8e0b 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index 02dfeaa1df..aada36de07 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index d8814083db..122b5a29bf 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index 7c1130a542..8d433e08a3 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2011, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c index b23550f3cd..c6d149c6bd 100644 --- a/src/template/gnunet-service-template.c +++ b/src/template/gnunet-service-template.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c index 66b6590613..42215ff230 100644 --- a/src/template/gnunet-template.c +++ b/src/template/gnunet-template.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c index bea01f5c4e..1aee521524 100644 --- a/src/template/test_template_api.c +++ b/src/template/test_template_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c index 046440fa14..4c9fced7e2 100644 --- a/src/testbed-logger/gnunet-service-testbed-logger.c +++ b/src/testbed-logger/gnunet-service-testbed-logger.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed-logger/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c index 199ba1cd80..4dca572fa3 100644 --- a/src/testbed-logger/test_testbed_logger_api.c +++ b/src/testbed-logger/test_testbed_logger_api.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index cb2e7f326a..fbd4c494f4 100644 --- a/src/testbed-logger/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in index caf8434364..19d6f51c32 100644 --- a/src/testbed/buildvars.py.in +++ b/src/testbed/buildvars.py.in @@ -2,7 +2,7 @@ # (C) 2008--2013, 2018 Christian Grothoff (and other contributing authors) # # GNUnet is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published +# under the terms of the GNU Affero General Public License as published # by the Free Software Foundation, either version 3 of the License, # or (at your option) any later version. # diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c index 55bd938f1d..1518b0004b 100644 --- a/src/testbed/generate-underlay-topology.c +++ b/src/testbed/generate-underlay-topology.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index 36fd441ed5..5f269966b6 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index a6308f4139..1d725ebac3 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index e61e3838b0..0fadfe85be 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index 554bafbbb5..b4d20f9b08 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c index 5a5d4de822..634d0baf44 100644 --- a/src/testbed/gnunet-service-test-barriers.c +++ b/src/testbed/gnunet-service-test-barriers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index e1a397e5b5..b810448869 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index d01aab8cd1..52f5442310 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index 4404b5d7f0..0d73a33ff2 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_barriers.h b/src/testbed/gnunet-service-testbed_barriers.h index 45ac574400..a713f545d5 100644 --- a/src/testbed/gnunet-service-testbed_barriers.h +++ b/src/testbed/gnunet-service-testbed_barriers.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index b7c2118730..d9ee707fa6 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index a67a907394..40ddc8b65c 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_connectionpool.h b/src/testbed/gnunet-service-testbed_connectionpool.h index 6d7709d34a..8957921ba8 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.h +++ b/src/testbed/gnunet-service-testbed_connectionpool.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 2f70d887ba..89f5a1cc9a 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c index 24f8874588..1b3a5d17b4 100644 --- a/src/testbed/gnunet-service-testbed_links.c +++ b/src/testbed/gnunet-service-testbed_links.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_links.h b/src/testbed/gnunet-service-testbed_links.h index a0c8717417..e380a58ff9 100644 --- a/src/testbed/gnunet-service-testbed_links.h +++ b/src/testbed/gnunet-service-testbed_links.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c index 38c56be207..38f38f0b16 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.c +++ b/src/testbed/gnunet-service-testbed_meminfo.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_meminfo.h b/src/testbed/gnunet-service-testbed_meminfo.h index 0704e9331b..c54a661996 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.h +++ b/src/testbed/gnunet-service-testbed_meminfo.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 3f12dd9503..f6003ba111 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index 09498b6c75..e29192c142 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 95a29670f8..5ab66358a9 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index 8666e93169..3bd6f19f98 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 3960a29798..bd2b221ed1 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index 187d37505b..c8b98cc39a 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index c35c703570..3e2a094d92 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c index 07e0a46969..33e69c204e 100644 --- a/src/testbed/test_testbed_api_barriers.c +++ b/src/testbed/test_testbed_api_barriers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 2a880e8cb0..aa37c4f221 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index 18f4431f8b..caad7fc05c 100644 --- a/src/testbed/test_testbed_api_hosts.c +++ b/src/testbed/test_testbed_api_hosts.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index 8bdcabd1d3..38548a87a8 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 5b9416c512..58a92fb943 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index aa58158dba..63ecc8fb5c 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c index 5cf1e2ca05..8d83acca13 100644 --- a/src/testbed/test_testbed_api_sd.c +++ b/src/testbed/test_testbed_api_sd.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index 327934f2c0..e3c9719ea2 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index b47615d1c8..6d5b1b3afa 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c index 94b9cccd0b..cd7fbda38f 100644 --- a/src/testbed/test_testbed_api_test_timeout.c +++ b/src/testbed/test_testbed_api_test_timeout.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index 1ceae012e6..fe4e501494 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index dda08a0263..9d267b5a9c 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 6995c65e59..775325c7fc 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c index 384cbe2659..7b73860f97 100644 --- a/src/testbed/test_testbed_underlay.c +++ b/src/testbed/test_testbed_underlay.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index 1357c2a88b..a433594af2 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 86ef3ae1a7..69d86ea305 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index ba929d3110..981a6311b3 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index 118ebba21d..ddf80a359b 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 4948ae0cef..0ccc534c23 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h index 56a23a5f98..1b19a4cab9 100644 --- a/src/testbed/testbed_api_hosts.h +++ b/src/testbed/testbed_api_hosts.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index f567d22ccf..d0c7092ce6 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index 3f176e8747..235631a0f4 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index 1b70a7249f..0ca798feae 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h index 6dccd254ec..e361fe3963 100644 --- a/src/testbed/testbed_api_peers.h +++ b/src/testbed/testbed_api_peers.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c index 264a7dc75d..88647bf843 100644 --- a/src/testbed/testbed_api_sd.c +++ b/src/testbed/testbed_api_sd.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_sd.h b/src/testbed/testbed_api_sd.h index d1109627c6..ff3c930e9b 100644 --- a/src/testbed/testbed_api_sd.h +++ b/src/testbed/testbed_api_sd.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c index a433f38969..8450b0aa0c 100644 --- a/src/testbed/testbed_api_services.c +++ b/src/testbed/testbed_api_services.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c index f308c7b38e..2b32c6e843 100644 --- a/src/testbed/testbed_api_statistics.c +++ b/src/testbed/testbed_api_statistics.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index dbd9e745e6..715d0977ac 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index 2b6a1728af..f22c838732 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index a0168e644b..39d695d4c0 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_topology.h b/src/testbed/testbed_api_topology.h index 2f7bd11ffe..6cf8e5b7ae 100644 --- a/src/testbed/testbed_api_topology.h +++ b/src/testbed/testbed_api_topology.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_api_underlay.c b/src/testbed/testbed_api_underlay.c index 47b08d8afa..e09c7ec7af 100644 --- a/src/testbed/testbed_api_underlay.c +++ b/src/testbed/testbed_api_underlay.c @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h index 3750f1cf99..3d34538af7 100644 --- a/src/testbed/testbed_helper.h +++ b/src/testbed/testbed_helper.h @@ -3,7 +3,7 @@ Copyright (C) 2008--2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c index 4676428c15..4f77d26c1f 100644 --- a/src/testing/gnunet-testing.c +++ b/src/testing/gnunet-testing.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c index f97f812945..7c3337d217 100644 --- a/src/testing/test_testing_peerstartup.c +++ b/src/testing/test_testing_peerstartup.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c index f300b8dcbe..4341845534 100644 --- a/src/testing/test_testing_peerstartup2.c +++ b/src/testing/test_testing_peerstartup2.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c index 876a3bf5c6..282df6ee2b 100644 --- a/src/testing/test_testing_portreservation.c +++ b/src/testing/test_testing_portreservation.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/test_testing_servicestartup.c b/src/testing/test_testing_servicestartup.c index 8872b2b356..8dec786a08 100644 --- a/src/testing/test_testing_servicestartup.c +++ b/src/testing/test_testing_servicestartup.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/test_testing_sharedservices.c b/src/testing/test_testing_sharedservices.c index 41ad356887..98110aa293 100644 --- a/src/testing/test_testing_sharedservices.c +++ b/src/testing/test_testing_sharedservices.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/testing/testing.c b/src/testing/testing.c index fdd4f90081..51fab0027e 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/topology/friends.c b/src/topology/friends.c index d00f5fcc8a..c97e815642 100644 --- a/src/topology/friends.c +++ b/src/topology/friends.c @@ -3,7 +3,7 @@ Copyright (C) 2013 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 3838d21d04..44446270cd 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -3,7 +3,7 @@ Copyright (C) 2007-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index a8d8cf8921..d8dc6937d2 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 181a6e3350..7fa8c71e7f 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c @@ -5,7 +5,7 @@ Copyright Copyright (C) 2009 Thomas d'Otreppe GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c index a18a82a149..2f93d488df 100644 --- a/src/transport/gnunet-helper-transport-wlan-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index 0ba8de1dbd..2912fca32a 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c @@ -5,7 +5,7 @@ Copyright Copyright (C) 2009 Thomas d'Otreppe GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 0451b50758..5a486e2946 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport.h b/src/transport/gnunet-service-transport.h index fd556a5a21..153c28f0dd 100644 --- a/src/transport/gnunet-service-transport.h +++ b/src/transport/gnunet-service-transport.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c index abb45fc1fd..719b3ad785 100644 --- a/src/transport/gnunet-service-transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h index d366741648..4d3dc6c6f4 100644 --- a/src/transport/gnunet-service-transport_ats.h +++ b/src/transport/gnunet-service-transport_ats.h @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c index fc7c0249c6..8bc1fdb928 100644 --- a/src/transport/gnunet-service-transport_hello.c +++ b/src/transport/gnunet-service-transport_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h index 7cfbf4f794..86c961232b 100644 --- a/src/transport/gnunet-service-transport_hello.h +++ b/src/transport/gnunet-service-transport_hello.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index 4c02f2ee08..f981913282 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_manipulation.h b/src/transport/gnunet-service-transport_manipulation.h index 715125eb92..8c86b5cdc1 100644 --- a/src/transport/gnunet-service-transport_manipulation.h +++ b/src/transport/gnunet-service-transport_manipulation.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 3757c0ee32..a673ff3ee1 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 26e9cb7638..1d534a2fee 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c index 5466d32b7d..09a8f633a2 100644 --- a/src/transport/gnunet-service-transport_plugins.c +++ b/src/transport/gnunet-service-transport_plugins.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h index 5bb31d9e5a..49c046ebac 100644 --- a/src/transport/gnunet-service-transport_plugins.h +++ b/src/transport/gnunet-service-transport_plugins.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index 66bb86d548..bfb4f15430 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h index bcc394c0b0..c4e939b685 100644 --- a/src/transport/gnunet-service-transport_validation.h +++ b/src/transport/gnunet-service-transport_validation.h @@ -3,7 +3,7 @@ Copyright (C) 2010,2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 28fd1c6d33..4377f3aeb4 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c index 3906230ff7..f7574f4442 100644 --- a/src/transport/gnunet-transport-profiler.c +++ b/src/transport/gnunet-transport-profiler.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-transport-wlan-receiver.c b/src/transport/gnunet-transport-wlan-receiver.c index 82429dd050..a895acb819 100644 --- a/src/transport/gnunet-transport-wlan-receiver.c +++ b/src/transport/gnunet-transport-wlan-receiver.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c index 42ed9af2fc..58b35423e2 100644 --- a/src/transport/gnunet-transport-wlan-sender.c +++ b/src/transport/gnunet-transport-wlan-sender.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index d336e22348..a852e97824 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2014, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h index ae5cfee3d8..de82ecc909 100644 --- a/src/transport/plugin_transport_http.h +++ b/src/transport/plugin_transport_http.h @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index ad2d428c46..b1a92f1081 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index 95f63445ad..02f7144066 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index 2f2c5fdc9b..2cb48e3a2d 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h @@ -3,7 +3,7 @@ Copyright (C) 2002-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 28ea354b3b..1ce918ce3b 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2014, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c index c17ae2daa7..97fba52cb8 100644 --- a/src/transport/plugin_transport_smtp.c +++ b/src/transport/plugin_transport_smtp.c @@ -3,7 +3,7 @@ Copyright (C) 2003-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index b1f7900f25..5c17a5a08e 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -3,7 +3,7 @@ Copyright (C) 2002--2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c index 81595d93eb..d6d3f0d5e8 100644 --- a/src/transport/plugin_transport_template.c +++ b/src/transport/plugin_transport_template.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 32c3a29ab2..b3bed2dbb7 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h index 3282a09dcc..6e37e2ab7c 100644 --- a/src/transport/plugin_transport_udp.h +++ b/src/transport/plugin_transport_udp.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index 8fd77ebdcb..443fcf1ce2 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index f79fc00e5b..d4af540c8a 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 610979464c..9070a1c71e 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h index 5a2796ef1e..dcccfd9b47 100644 --- a/src/transport/plugin_transport_wlan.h +++ b/src/transport/plugin_transport_wlan.h @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c index d1457239be..66190f9f25 100644 --- a/src/transport/plugin_transport_xt.c +++ b/src/transport/plugin_transport_xt.c @@ -3,7 +3,7 @@ Copyright (C) 2002--2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_xu.c b/src/transport/plugin_transport_xu.c index 8e3f483f0a..fd0757c075 100644 --- a/src/transport/plugin_transport_xu.c +++ b/src/transport/plugin_transport_xu.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/plugin_transport_xu.h b/src/transport/plugin_transport_xu.h index 4354f11bc2..f178fdbff8 100644 --- a/src/transport/plugin_transport_xu.h +++ b/src/transport/plugin_transport_xu.h @@ -3,7 +3,7 @@ Copyright (C) 2010-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c index 28563173b6..97208688da 100644 --- a/src/transport/tcp_connection_legacy.c +++ b/src/transport/tcp_connection_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c index dd83640916..7b67986a2a 100644 --- a/src/transport/tcp_server_legacy.c +++ b/src/transport/tcp_server_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c index ca8cb5bf17..9db62bef7d 100644 --- a/src/transport/tcp_server_mst_legacy.c +++ b/src/transport/tcp_server_mst_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index c6926711fc..ad9ede6f5c 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c index cae4a24923..926e735d18 100644 --- a/src/transport/test_http_common.c +++ b/src/transport/test_http_common.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index aa8d6b7bf2..6745299457 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index 864e42b942..d2384b89ed 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c index 45fc1eebec..d9037fe98d 100644 --- a/src/transport/test_transport_address_switch.c +++ b/src/transport/test_transport_address_switch.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index e461c54a6a..2ac4b5255c 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 99b69a3911..4816754f2e 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index 88d3ea3cd3..db3f159acc 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index 622c1f6646..d9c6e9500b 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index 3bf252a02d..dd6888fa9c 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 125438f27c..102bb1d968 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c index 9204244241..d24d69c90f 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp.c +++ b/src/transport/test_transport_api_manipulation_send_tcp.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c index 97951d26b7..55c8ec70a3 100644 --- a/src/transport/test_transport_api_monitor_peers.c +++ b/src/transport/test_transport_api_monitor_peers.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index d0e26aec5f..898b3845aa 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_restart_reconnect.c b/src/transport/test_transport_api_restart_reconnect.c index ccd978fa79..75654cc837 100644 --- a/src/transport/test_transport_api_restart_reconnect.c +++ b/src/transport/test_transport_api_restart_reconnect.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index 78094335a1..eae5c9c6d3 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c index d01fa758f6..cc14f32894 100644 --- a/src/transport/test_transport_blacklisting.c +++ b/src/transport/test_transport_blacklisting.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c index 09797de35b..1a4997edd2 100644 --- a/src/transport/test_transport_testing_restart.c +++ b/src/transport/test_transport_testing_restart.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c index 41983ebbe7..dc2a780ab6 100644 --- a/src/transport/test_transport_testing_startstop.c +++ b/src/transport/test_transport_testing_startstop.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c index 93098e4709..0307531c34 100644 --- a/src/transport/transport-testing-filenames.c +++ b/src/transport/transport-testing-filenames.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c index 4d42343196..69b5627dbb 100644 --- a/src/transport/transport-testing-loggers.c +++ b/src/transport/transport-testing-loggers.c @@ -4,7 +4,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c index abdf8ef84b..7477c4f788 100644 --- a/src/transport/transport-testing-main.c +++ b/src/transport/transport-testing-main.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c index cbb701dbca..177adc0313 100644 --- a/src/transport/transport-testing-send.c +++ b/src/transport/transport-testing-send.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index 31c88d7a63..7690bdeb09 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index 393a20baa4..c2d2126236 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport.h b/src/transport/transport.h index 3e8284fe49..0ad7927329 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -3,7 +3,7 @@ Copyright (C) 2009-2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index 36d00fbac6..6a6c25750a 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c index d995a8df5d..946b2c99f5 100644 --- a/src/transport/transport_api_blacklist.c +++ b/src/transport/transport_api_blacklist.c @@ -3,7 +3,7 @@ Copyright (C) 2010-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c index e9d0a5a784..239e64f528 100644 --- a/src/transport/transport_api_core.c +++ b/src/transport/transport_api_core.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c index 6f4b6349e4..a951034b46 100644 --- a/src/transport/transport_api_hello_get.c +++ b/src/transport/transport_api_hello_get.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c index c6b16520f1..fbf153b744 100644 --- a/src/transport/transport_api_manipulation.c +++ b/src/transport/transport_api_manipulation.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c index 17dce9f5cd..af67ecec75 100644 --- a/src/transport/transport_api_monitor_peers.c +++ b/src/transport/transport_api_monitor_peers.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c index 3b912b433d..95007b48b9 100644 --- a/src/transport/transport_api_monitor_plugins.c +++ b/src/transport/transport_api_monitor_plugins.c @@ -3,7 +3,7 @@ Copyright (C) 2014, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c index d58e344c16..4b4b41b796 100644 --- a/src/transport/transport_api_offer_hello.c +++ b/src/transport/transport_api_offer_hello.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/tun/regex.c b/src/tun/regex.c index bf1c762250..1c6bb8448a 100644 --- a/src/tun/regex.c +++ b/src/tun/regex.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/tun/test_regex.c b/src/tun/test_regex.c index 5e8c17c65c..c2ed35ea42 100644 --- a/src/tun/test_regex.c +++ b/src/tun/test_regex.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/tun/test_tun.c b/src/tun/test_tun.c index 14d8557316..6923486f40 100644 --- a/src/tun/test_tun.c +++ b/src/tun/test_tun.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/tun/tun.c b/src/tun/tun.c index 380c61beca..167d963202 100644 --- a/src/tun/tun.c +++ b/src/tun/tun.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index 0571ebbe90..3d5ffb8a8e 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/bio.c b/src/util/bio.c index cbc294e185..2c2f4980fa 100644 --- a/src/util/bio.c +++ b/src/util/bio.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2009, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/client.c b/src/util/client.c index 681b61ac46..18b4cbbc9f 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index b3672e5e8f..dc428871ad 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2005, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/common_endian.c b/src/util/common_endian.c index 320cf3fa7c..6adef8b4ef 100644 --- a/src/util/common_endian.c +++ b/src/util/common_endian.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2006, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/common_logging.c b/src/util/common_logging.c index cecdf45845..11f71ebadb 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -3,7 +3,7 @@ Copyright (C) 2006-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/configuration.c b/src/util/configuration.c index ecc0990b56..a0196f4ca4 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c index 1007c9e745..d65f5f9971 100644 --- a/src/util/configuration_loader.c +++ b/src/util/configuration_loader.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c index 244262aeec..c864f5a146 100644 --- a/src/util/container_bloomfilter.c +++ b/src/util/container_bloomfilter.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2006, 2008, 2011, 2012, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 440c190f91..70c1e03925 100644 --- a/src/util/container_heap.c +++ b/src/util/container_heap.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index 7f83864cac..a7672be734 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c index e09645914c..f9ae4b366e 100644 --- a/src/util/container_multihashmap.c +++ b/src/util/container_multihashmap.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c index 4b37b1ef31..142d03f4c7 100644 --- a/src/util/container_multihashmap32.c +++ b/src/util/container_multihashmap32.c @@ -3,7 +3,7 @@ Copyright (C) 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c index bb5c61fd2d..3c65e7e29d 100644 --- a/src/util/container_multipeermap.c +++ b/src/util/container_multipeermap.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c index 2b9171a855..45c3949531 100644 --- a/src/util/container_multishortmap.c +++ b/src/util/container_multishortmap.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c index bb63e6d146..d3c3a19940 100644 --- a/src/util/crypto_abe.c +++ b/src/util/crypto_abe.c @@ -3,7 +3,7 @@ (and other contributing authors) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_bug.c b/src/util/crypto_bug.c index 011df65112..255f4ec24d 100644 --- a/src/util/crypto_bug.c +++ b/src/util/crypto_bug.c @@ -3,7 +3,7 @@ Copyright (C) 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c index e4af407536..12cb169e87 100644 --- a/src/util/crypto_crc.c +++ b/src/util/crypto_crc.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c index 8db01009ad..4c838d4495 100644 --- a/src/util/crypto_ecc.c +++ b/src/util/crypto_ecc.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c index 02cc608d73..1a2c670bdb 100644 --- a/src/util/crypto_ecc_dlog.c +++ b/src/util/crypto_ecc_dlog.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c index 54ba375a82..feb34653cb 100644 --- a/src/util/crypto_ecc_setup.c +++ b/src/util/crypto_ecc_setup.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index b476a96cfb..dbc4c07a3e 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c index 89c05eb837..4da09ce081 100644 --- a/src/util/crypto_hash_file.c +++ b/src/util/crypto_hash_file.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index fb9d0a6bc1..fdc1348f1a 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c index b6d4bfdf46..793c7aea71 100644 --- a/src/util/crypto_mpi.c +++ b/src/util/crypto_mpi.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c index ccadcfb22b..c9e777b374 100644 --- a/src/util/crypto_paillier.c +++ b/src/util/crypto_paillier.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c index d3200d2bb5..1ed82170ef 100644 --- a/src/util/crypto_random.c +++ b/src/util/crypto_random.c @@ -3,7 +3,7 @@ (and other contributing authors) GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c index 192b011e2d..67dfec57b9 100644 --- a/src/util/crypto_rsa.c +++ b/src/util/crypto_rsa.c @@ -3,7 +3,7 @@ Copyright (C) 2014,2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index eceb3b0ea9..0862c3af7a 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/disk.c b/src/util/disk.c index 6b07831732..151f65662d 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -3,7 +3,7 @@ Copyright (C) 2001--2013, 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/disk.h b/src/util/disk.h index bd84ee54e1..a6f563e24f 100644 --- a/src/util/disk.h +++ b/src/util/disk.h @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index 2158eb1774..f3b7d0b020 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index 51e7d516a7..81e09fdbf8 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c index b335681898..8c5a72742a 100644 --- a/src/util/gnunet-ecc.c +++ b/src/util/gnunet-ecc.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-helper-w32-console.c b/src/util/gnunet-helper-w32-console.c index c95361a8e0..360c6ac676 100644 --- a/src/util/gnunet-helper-w32-console.c +++ b/src/util/gnunet-helper-w32-console.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-helper-w32-console.h b/src/util/gnunet-helper-w32-console.h index 33713d0adf..c854ec059a 100644 --- a/src/util/gnunet-helper-w32-console.h +++ b/src/util/gnunet-helper-w32-console.h @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index 95ede47065..873a181469 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c @@ -3,7 +3,7 @@ Copyright (C) 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index 62dd668f26..12899a8bba 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index 6c48476197..cd40728362 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c @@ -3,7 +3,7 @@ Copyright (C) 2007-2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c index 5426d78ec6..e5c17b0226 100644 --- a/src/util/gnunet-uri.c +++ b/src/util/gnunet-uri.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/helper.c b/src/util/helper.c index 7e003cfa97..7b32c1b063 100644 --- a/src/util/helper.c +++ b/src/util/helper.c @@ -3,7 +3,7 @@ Copyright (C) 2011, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/load.c b/src/util/load.c index 6c51194233..1891b8971f 100644 --- a/src/util/load.c +++ b/src/util/load.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/mq.c b/src/util/mq.c index dec9711a3c..ad9437708b 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -3,7 +3,7 @@ Copyright (C) 2012-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/mst.c b/src/util/mst.c index c358389c32..48434f3eaf 100644 --- a/src/util/mst.c +++ b/src/util/mst.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2016, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/nc.c b/src/util/nc.c index 431738d6d8..2866a09fb1 100644 --- a/src/util/nc.c +++ b/src/util/nc.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/network.c b/src/util/network.c index 9684ab511b..b4e5a11396 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/op.c b/src/util/op.c index 8901e377f9..33283a21a5 100644 --- a/src/util/op.c +++ b/src/util/op.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/os_installation.c b/src/util/os_installation.c index 4cc3470248..537b46f187 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c @@ -3,7 +3,7 @@ Copyright (C) 2006-2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/os_network.c b/src/util/os_network.c index effb3f5736..753836832d 100644 --- a/src/util/os_network.c +++ b/src/util/os_network.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2005, 2006, 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 9a83e059da..5e34d3b262 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/peer.c b/src/util/peer.c index 47610c7074..168811cd7f 100644 --- a/src/util/peer.c +++ b/src/util/peer.c @@ -3,7 +3,7 @@ Copyright (C) 2006, 2008, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c index 64a435a3b8..6c3db48fc3 100644 --- a/src/util/perf_crypto_asymmetric.c +++ b/src/util/perf_crypto_asymmetric.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c index 49dbc544cb..3772bc6e2b 100644 --- a/src/util/perf_crypto_ecc_dlog.c +++ b/src/util/perf_crypto_ecc_dlog.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c index 13145743f3..7dd4cf5441 100644 --- a/src/util/perf_crypto_hash.c +++ b/src/util/perf_crypto_hash.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c index 50ea32086d..5167ee93c6 100644 --- a/src/util/perf_crypto_paillier.c +++ b/src/util/perf_crypto_paillier.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c index e00eda6a6f..03676dfd2f 100644 --- a/src/util/perf_crypto_rsa.c +++ b/src/util/perf_crypto_rsa.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c index c1c7c5b566..af88fc27b8 100644 --- a/src/util/perf_crypto_symmetric.c +++ b/src/util/perf_crypto_symmetric.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c index 6277ba2275..1f1744f504 100644 --- a/src/util/perf_malloc.c +++ b/src/util/perf_malloc.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/plugin.c b/src/util/plugin.c index eede9c93d5..1a05b02869 100644 --- a/src/util/plugin.c +++ b/src/util/plugin.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/program.c b/src/util/program.c index 32adac20ff..23e43b91e2 100644 --- a/src/util/program.c +++ b/src/util/program.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/resolver.h b/src/util/resolver.h index d58860f35e..bb1ad35321 100644 --- a/src/util/resolver.h +++ b/src/util/resolver.h @@ -3,7 +3,7 @@ Copyright (C) 2009, 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index a0d8008453..26939a8326 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/scheduler.c b/src/util/scheduler.c index be94a66789..f83c52dec5 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/service.c b/src/util/service.c index 568ed2aae2..f355beb79d 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -3,7 +3,7 @@ Copyright (C) 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/signal.c b/src/util/signal.c index caf3c40b90..acaca08f29 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/socks.c b/src/util/socks.c index 12b9a28513..ad44996281 100644 --- a/src/util/socks.c +++ b/src/util/socks.c @@ -3,7 +3,7 @@ Copyright (C) 2009-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/speedup.c b/src/util/speedup.c index 6e99d53239..95187f378a 100644 --- a/src/util/speedup.c +++ b/src/util/speedup.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/speedup.h b/src/util/speedup.h index 71b7a6de9b..cf27a9d0e5 100644 --- a/src/util/speedup.h +++ b/src/util/speedup.h @@ -3,7 +3,7 @@ Copyright (C) 2009 -- 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/strings.c b/src/util/strings.c index e2f37c8ad7..a7cbeddb08 100644 --- a/src/util/strings.c +++ b/src/util/strings.c @@ -3,7 +3,7 @@ Copyright (C) 2005-2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_bio.c b/src/util/test_bio.c index 84bbbcadd8..65d10b6abc 100644 --- a/src/util/test_bio.c +++ b/src/util/test_bio.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_client.c b/src/util/test_client.c index 73a376e2b7..d1951ebedf 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c index e377331fe2..40eab4181d 100644 --- a/src/util/test_common_allocation.c +++ b/src/util/test_common_allocation.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2005, 2006, 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c index 8c3031e2c7..658e199aac 100644 --- a/src/util/test_common_endian.c +++ b/src/util/test_common_endian.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c index 2925eeb372..cd35dab4ee 100644 --- a/src/util/test_common_logging.c +++ b/src/util/test_common_logging.c @@ -3,7 +3,7 @@ Copyright (C) 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c index 430e7891b4..6445faf839 100644 --- a/src/util/test_common_logging_dummy.c +++ b/src/util/test_common_logging_dummy.c @@ -3,7 +3,7 @@ Copyright (C) 2008-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index 818dddc176..459d996e41 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c @@ -3,7 +3,7 @@ Copyright (C) 2011 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index bd6455bea5..a6cf852d32 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2007 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c index 4916e2cd08..e7b4499a5b 100644 --- a/src/util/test_container_bloomfilter.c +++ b/src/util/test_container_bloomfilter.c @@ -3,7 +3,7 @@ Copyright (C) 2004, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c index 0fc5021d3b..ef33d9f58d 100644 --- a/src/util/test_container_dll.c +++ b/src/util/test_container_dll.c @@ -3,7 +3,7 @@ Copyright (C) 2017 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c index ceb59907a2..5734ff5dcb 100644 --- a/src/util/test_container_heap.c +++ b/src/util/test_container_heap.c @@ -3,7 +3,7 @@ Copyright (C) 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c index 1008c9891c..cc8e9c4fe7 100644 --- a/src/util/test_container_meta_data.c +++ b/src/util/test_container_meta_data.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2006, 2009, 2010 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c index 92c5783922..34480a4339 100644 --- a/src/util/test_container_multihashmap.c +++ b/src/util/test_container_multihashmap.c @@ -3,7 +3,7 @@ Copyright (C) 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c index c094f4c565..e68d8e0867 100644 --- a/src/util/test_container_multihashmap32.c +++ b/src/util/test_container_multihashmap32.c @@ -3,7 +3,7 @@ Copyright (C) 2008 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c index 500dff98a0..976df657a4 100644 --- a/src/util/test_container_multipeermap.c +++ b/src/util/test_container_multipeermap.c @@ -3,7 +3,7 @@ Copyright (C) 2008, 2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c index 7b7dfc3591..79fa3b24fd 100644 --- a/src/util/test_crypto_crc.c +++ b/src/util/test_crypto_crc.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c index 10ed0ee386..ef19fba660 100644 --- a/src/util/test_crypto_ecc_dlog.c +++ b/src/util/test_crypto_ecc_dlog.c @@ -3,7 +3,7 @@ Copyright (C) 2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c index 1c1c083080..9f6d868d43 100644 --- a/src/util/test_crypto_ecdh_eddsa.c +++ b/src/util/test_crypto_ecdh_eddsa.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c index aa9f9c9484..d6af98a997 100644 --- a/src/util/test_crypto_ecdhe.c +++ b/src/util/test_crypto_ecdhe.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c index 827112ff5a..147123646d 100644 --- a/src/util/test_crypto_ecdsa.c +++ b/src/util/test_crypto_ecdsa.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c index 9df9a42fc6..1b420d7914 100644 --- a/src/util/test_crypto_eddsa.c +++ b/src/util/test_crypto_eddsa.c @@ -3,7 +3,7 @@ Copyright (C) 2002-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c index 3d1245a53e..a2bf987002 100644 --- a/src/util/test_crypto_hash.c +++ b/src/util/test_crypto_hash.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c index 4739e46faf..2b27065e2c 100644 --- a/src/util/test_crypto_hash_context.c +++ b/src/util/test_crypto_hash_context.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c index 4569a77d3a..c6d595ff4a 100644 --- a/src/util/test_crypto_paillier.c +++ b/src/util/test_crypto_paillier.c @@ -3,7 +3,7 @@ Copyright (C) 2014 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c index 4c051f7056..7b3bb28d23 100644 --- a/src/util/test_crypto_random.c +++ b/src/util/test_crypto_random.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c index 522767bbb3..f79aba17bd 100644 --- a/src/util/test_crypto_rsa.c +++ b/src/util/test_crypto_rsa.c @@ -3,7 +3,7 @@ Copyright (C) 2014,2015 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c index 462a4ee596..8157895a37 100644 --- a/src/util/test_crypto_symmetric.c +++ b/src/util/test_crypto_symmetric.c @@ -3,7 +3,7 @@ Copyright (C) 2002, 2003, 2004, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_disk.c b/src/util/test_disk.c index 2de5d1844a..ea85fcc6cb 100644 --- a/src/util/test_disk.c +++ b/src/util/test_disk.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2005, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index eb08e7ae82..eafbf38d21 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_mq.c b/src/util/test_mq.c index aef65293bf..669268d518 100644 --- a/src/util/test_mq.c +++ b/src/util/test_mq.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c index e4c3ff3b26..bd5371e60c 100644 --- a/src/util/test_os_network.c +++ b/src/util/test_os_network.c @@ -3,7 +3,7 @@ Copyright (C) 2003, 2004, 2005, 2006, 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index 0d4b8ee4fe..ee18fadc32 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_peer.c b/src/util/test_peer.c index b92e904ae5..630adfb5b5 100644 --- a/src/util/test_peer.c +++ b/src/util/test_peer.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c index 8cfa27694b..3df5863f34 100644 --- a/src/util/test_plugin.c +++ b/src/util/test_plugin.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c index 5179a3788c..8ec39ba30d 100644 --- a/src/util/test_plugin_plug.c +++ b/src/util/test_plugin_plug.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_program.c b/src/util/test_program.c index b3db43d109..5aeacc76ea 100644 --- a/src/util/test_program.c +++ b/src/util/test_program.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 8d88eadc0f..b6c9703be8 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c index 19a2992adc..8f7771b5b2 100644 --- a/src/util/test_scheduler.c +++ b/src/util/test_scheduler.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c index 45ca9b2986..ac0d708e1c 100644 --- a/src/util/test_scheduler_delay.c +++ b/src/util/test_scheduler_delay.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_service.c b/src/util/test_service.c index 9ae884f04f..ef0fa7561a 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -3,7 +3,7 @@ Copyright (C) 2009, 2013, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_socks.c b/src/util/test_socks.c index abe6b5126f..977b0e2620 100644 --- a/src/util/test_socks.c +++ b/src/util/test_socks.c @@ -3,7 +3,7 @@ Copyright (C) 2015, 2016 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c index d0e635f754..bf49fb9ce5 100644 --- a/src/util/test_speedup.c +++ b/src/util/test_speedup.c @@ -3,7 +3,7 @@ Copyright (C) 2011-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_strings.c b/src/util/test_strings.c index 0bfb149769..f263159f91 100644 --- a/src/util/test_strings.c +++ b/src/util/test_strings.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c index f7fb99f1dd..5fbc538028 100644 --- a/src/util/test_strings_to_data.c +++ b/src/util/test_strings_to_data.c @@ -3,7 +3,7 @@ Copyright (C) 2009 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/test_time.c b/src/util/test_time.c index b4ee3bfd75..b030e9c431 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/time.c b/src/util/time.c index 7b0d11d77d..037e31f51e 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -3,7 +3,7 @@ Copyright (C) 2001-2013 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/win.c b/src/util/win.c index 0d9fbbf74d..2340e4db60 100644 --- a/src/util/win.c +++ b/src/util/win.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/util/winproc.c b/src/util/winproc.c index 49727a5ba4..1f63dcbafe 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/gnunet-helper-vpn-windows.c b/src/vpn/gnunet-helper-vpn-windows.c index fde6b70b09..ca2e8141d3 100644 --- a/src/vpn/gnunet-helper-vpn-windows.c +++ b/src/vpn/gnunet-helper-vpn-windows.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index b82b56dc20..ab27f7afbf 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 157aefd748..646429b251 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c @@ -3,7 +3,7 @@ Copyright (C) 2010, 2011, 2012, 2016, 2017 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c index d29409f09f..d3eafdcb20 100644 --- a/src/vpn/gnunet-vpn.c +++ b/src/vpn/gnunet-vpn.c @@ -3,7 +3,7 @@ Copyright (C) 2012 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index 0c70f8efef..622e99d7e0 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h @@ -3,7 +3,7 @@ Copyright (C) 2012 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c index cfe94a9559..3303c7b2cf 100644 --- a/src/vpn/vpn_api.c +++ b/src/vpn/vpn_api.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2016 Christian Grothoff GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c index 905a1548e8..56f7a958be 100644 --- a/src/zonemaster/gnunet-service-zonemaster-monitor.c +++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2014, 2017, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c index 0b58c307ca..12c15eb55f 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/zonemaster/gnunet-service-zonemaster.c @@ -3,7 +3,7 @@ Copyright (C) 2012, 2013, 2014, 2017, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -- cgit v1.2.3-18-g5258 From 3eedf50775f5857416e1943901ffcef5f0504815 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 16:55:11 +0200 Subject: avoid looping on listing of zone --- src/namestore/gnunet-namestore-fcfsd.c | 105 ++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 40 deletions(-) diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 89e42ddaca..b4f8a7b26a 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -155,11 +155,6 @@ struct Request */ struct ZoneinfoRequest { - /** - * Connection - */ - struct MHD_Connection *connection; - /** * List iterator */ @@ -206,6 +201,16 @@ static struct GNUNET_CRYPTO_EcdsaPrivateKey fcfs_zone_pkey; */ static struct GNUNET_IDENTITY_Handle *identity; +/** + * Zoneinfo page we currently use. + */ +static struct MHD_Response *info_page; + +/** + * Task that runs #update_zoneinfo_page peridicially. + */ +static struct GNUNET_SCHEDULER_Task *uzp_task; + /** * Request for our ego. */ @@ -246,6 +251,13 @@ run_httpd_now () } +/** + * Create fresh version of zone information. + */ +static void +update_zoneinfo_page (void *cls); + + /** * Function called on error in zone iteration. */ @@ -253,19 +265,13 @@ static void zone_iteration_error (void *cls) { struct ZoneinfoRequest *zr = cls; - struct MHD_Response *response; zr->list_it = NULL; - response = MHD_create_response_from_buffer (strlen ("internal error"), - (void *) "internal error", - MHD_RESPMEM_PERSISTENT); - MHD_queue_response (zr->connection, - MHD_HTTP_INTERNAL_SERVER_ERROR, - response); - MHD_destroy_response (response); GNUNET_free (zr->zoneinfo); GNUNET_free (zr); - run_httpd_now (); + GNUNET_SCHEDULER_cancel (uzp_task); + uzp_task = GNUNET_SCHEDULER_add_now (&update_zoneinfo_page, + NULL); } @@ -292,13 +298,10 @@ zone_iteration_end (void *cls) MHD_add_response_header (response, MHD_HTTP_HEADER_CONTENT_TYPE, MIME_HTML); - MHD_queue_response (zr->connection, - MHD_HTTP_OK, - response); - MHD_destroy_response (response); + MHD_destroy_response (info_page); + info_page = response; GNUNET_free (zr->zoneinfo); GNUNET_free (zr); - run_httpd_now (); } @@ -373,27 +376,41 @@ iterate_cb (void *cls, * Handler that returns FCFS zoneinfo page. * * @param connection connection to use - * @return MHD_YES on success */ -static int +static int serve_zoneinfo_page (struct MHD_Connection *connection) { - struct ZoneinfoRequest *zr; - - zr = GNUNET_new (struct ZoneinfoRequest); - zr->zoneinfo = GNUNET_malloc (DEFAULT_ZONEINFO_BUFSIZE); - zr->buf_len = DEFAULT_ZONEINFO_BUFSIZE; - zr->connection = connection; - zr->write_offset = 0; - zr->list_it = GNUNET_NAMESTORE_zone_iteration_start (ns, - &fcfs_zone_pkey, - &zone_iteration_error, - zr, - &iterate_cb, - zr, - &zone_iteration_end, - zr); - return MHD_YES; + return MHD_queue_response (connection, + MHD_HTTP_OK, + info_page); +} + + +/** + * Create fresh version of zone information. + */ +static void +update_zoneinfo_page (void *cls) +{ + static struct ZoneinfoRequest zr; + + (void) cls; + uzp_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, + &update_zoneinfo_page, + NULL); + if (NULL != zr.list_it) + return; + zr.zoneinfo = GNUNET_malloc (DEFAULT_ZONEINFO_BUFSIZE); + zr.buf_len = DEFAULT_ZONEINFO_BUFSIZE; + zr.write_offset = 0; + zr.list_it = GNUNET_NAMESTORE_zone_iteration_start (ns, + &fcfs_zone_pkey, + &zone_iteration_error, + &zr, + &iterate_cb, + &zr, + &zone_iteration_end, + &zr); } @@ -401,7 +418,7 @@ serve_zoneinfo_page (struct MHD_Connection *connection) * Handler that returns a simple static HTTP page. * * @param connection connection to use - * @return MHD_YES on success + * @return #MHD_YES on success */ static int serve_main_page (struct MHD_Connection *connection) @@ -703,8 +720,8 @@ lookup_block_processor (void *cls, * @a upload_data provided; the method must update this * value to the number of bytes NOT processed; * @param ptr pointer to location where we store the 'struct Request' - * @return MHD_YES if the connection was handled successfully, - * MHD_NO if the socket must be closed due to a serious + * @return #MHD_YES if the connection was handled successfully, + * #MHD_NO if the socket must be closed due to a serious * error while handling the request */ static int @@ -959,6 +976,11 @@ do_shutdown (void *cls) GNUNET_SCHEDULER_cancel (httpd_task); httpd_task = NULL; } + if (NULL != uzp_task) + { + GNUNET_SCHEDULER_cancel (uzp_task); + uzp_task = NULL; + } if (NULL != ns) { GNUNET_NAMESTORE_disconnect (ns); @@ -1045,6 +1067,7 @@ identity_cb (void *cls, while (NULL == httpd); if (NULL == httpd) { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to start HTTP server\n")); GNUNET_SCHEDULER_shutdown (); @@ -1097,6 +1120,8 @@ run (void *cls, _("Failed to connect to identity\n")); return; } + uzp_task = GNUNET_SCHEDULER_add_now (&update_zoneinfo_page, + NULL); GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); } -- cgit v1.2.3-18-g5258 From 7b56a05a27cfc5a5ef1403f616e2734cacc1597c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 7 Jun 2018 16:58:37 +0200 Subject: fix the stupid --- src/namestore/gnunet-namestore-fcfsd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index b4f8a7b26a..4687300fb4 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -268,7 +268,6 @@ zone_iteration_error (void *cls) zr->list_it = NULL; GNUNET_free (zr->zoneinfo); - GNUNET_free (zr); GNUNET_SCHEDULER_cancel (uzp_task); uzp_task = GNUNET_SCHEDULER_add_now (&update_zoneinfo_page, NULL); @@ -301,7 +300,6 @@ zone_iteration_end (void *cls) MHD_destroy_response (info_page); info_page = response; GNUNET_free (zr->zoneinfo); - GNUNET_free (zr); } -- cgit v1.2.3-18-g5258 From 2cdccc796f93117f5c74ec3b586f7654307b02e0 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Thu, 7 Jun 2018 17:22:22 +0200 Subject: config: file name expansion in all -f cases --- src/util/gnunet-config.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index 81e09fdbf8..c01528a450 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c @@ -72,12 +72,28 @@ print_option (void *cls, const char *option, const char *value) { - (void) cls; (void) section; - fprintf (stdout, - "%s = %s\n", - option, - value); + const struct GNUNET_CONFIGURATION_Handle *cfg = cls; + char *value_fn; + if (is_filename) + { + GNUNET_assert (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_filename (cfg, + section, + option, + &value_fn)); + fprintf (stdout, + "%s = %s\n", + option, + GNUNET_STRINGS_filename_expand (value_fn)); + } + else + { + fprintf (stdout, + "%s = %s\n", + option, + value); + } } @@ -156,8 +172,8 @@ run (void *cls, { GNUNET_CONFIGURATION_iterate_section_values (cfg, section, - &print_option, - NULL); + &print_option, + (void *) cfg); } else { -- cgit v1.2.3-18-g5258 From 4e2504a967ba09643c6dd7e3b9ce400e30adcb3d Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Thu, 7 Jun 2018 15:23:35 +0000 Subject: paragraph for gnunet devs that don't know how to use the web --- configure.ac | 3 +++ contrib/scripts/afferify | 2 ++ contrib/scripts/documentation/gnunet-doc.scm | 3 +++ contrib/scripts/gnunet-chk.py.in | 3 +++ contrib/scripts/gnunet_janitor.py.in | 3 +++ contrib/scripts/gnunet_pyexpect.py.in | 3 +++ contrib/scripts/terminate.py.in | 3 +++ contrib/test_gnunet_prefix.c | 3 +++ contrib/timeout_watchdog.c | 3 +++ contrib/timeout_watchdog_w32.c | 3 +++ guix-env.scm | 3 +++ src/abe/abe.c | 3 +++ src/abe/test_cpabe.c | 3 +++ src/arm/arm.h | 3 +++ src/arm/arm_api.c | 3 +++ src/arm/arm_monitor_api.c | 3 +++ src/arm/gnunet-arm.c | 3 +++ src/arm/gnunet-service-arm.c | 3 +++ src/arm/mockup-service.c | 3 +++ src/arm/test_arm_api.c | 3 +++ src/arm/test_exponential_backoff.c | 3 +++ src/arm/test_gnunet_service_arm.c | 3 +++ src/ats-tests/ats-testing-experiment.c | 3 +++ src/ats-tests/ats-testing-log.c | 3 +++ src/ats-tests/ats-testing-preferences.c | 3 +++ src/ats-tests/ats-testing-traffic.c | 3 +++ src/ats-tests/ats-testing.c | 3 +++ src/ats-tests/ats-testing.h | 3 +++ src/ats-tests/gnunet-ats-sim.c | 3 +++ src/ats-tests/gnunet-solver-eval.c | 3 +++ src/ats-tests/perf_ats.c | 3 +++ src/ats-tests/perf_ats.h | 3 +++ src/ats-tests/perf_ats_logging.c | 3 +++ src/ats-tool/gnunet-ats.c | 3 +++ src/ats/ats.h | 3 +++ src/ats/ats_api_connectivity.c | 3 +++ src/ats/ats_api_performance.c | 3 +++ src/ats/ats_api_scanner.c | 3 +++ src/ats/ats_api_scheduling.c | 3 +++ src/ats/gnunet-ats-solver-eval.c | 3 +++ src/ats/gnunet-ats-solver-eval.h | 3 +++ src/ats/gnunet-service-ats.c | 3 +++ src/ats/gnunet-service-ats.h | 3 +++ src/ats/gnunet-service-ats_addresses.c | 3 +++ src/ats/gnunet-service-ats_addresses.h | 3 +++ src/ats/gnunet-service-ats_connectivity.c | 3 +++ src/ats/gnunet-service-ats_connectivity.h | 3 +++ src/ats/gnunet-service-ats_normalization.c | 3 +++ src/ats/gnunet-service-ats_normalization.h | 3 +++ src/ats/gnunet-service-ats_performance.c | 3 +++ src/ats/gnunet-service-ats_performance.h | 3 +++ src/ats/gnunet-service-ats_plugins.c | 3 +++ src/ats/gnunet-service-ats_plugins.h | 3 +++ src/ats/gnunet-service-ats_preferences.c | 3 +++ src/ats/gnunet-service-ats_preferences.h | 3 +++ src/ats/gnunet-service-ats_reservations.c | 3 +++ src/ats/gnunet-service-ats_reservations.h | 3 +++ src/ats/gnunet-service-ats_scheduling.c | 3 +++ src/ats/gnunet-service-ats_scheduling.h | 3 +++ src/ats/perf_ats_solver.c | 3 +++ src/ats/plugin_ats_mlp.c | 3 +++ src/ats/plugin_ats_proportional.c | 3 +++ src/ats/plugin_ats_ril.c | 3 +++ src/ats/test_ats_api.c | 3 +++ src/ats/test_ats_lib.c | 3 +++ src/ats/test_ats_lib.h | 3 +++ src/ats/test_ats_reservation_api.c | 3 +++ src/auction/auction.h | 3 +++ src/auction/gnunet-auction-create.c | 3 +++ src/auction/gnunet-auction-info.c | 3 +++ src/auction/gnunet-auction-join.c | 3 +++ src/auction/gnunet-service-auction.c | 3 +++ src/auction/test_auction_api.c | 3 +++ src/block/bg_bf.c | 3 +++ src/block/block.c | 3 +++ src/block/plugin_block_template.c | 3 +++ src/block/plugin_block_test.c | 3 +++ src/cadet/cadet.h | 3 +++ src/cadet/cadet_api.c | 3 +++ src/cadet/cadet_protocol.h | 3 +++ src/cadet/cadet_test_lib.c | 3 +++ src/cadet/cadet_test_lib.h | 3 +++ src/cadet/gnunet-cadet-profiler.c | 3 +++ src/cadet/gnunet-cadet.c | 3 +++ src/cadet/gnunet-service-cadet.c | 3 +++ src/cadet/gnunet-service-cadet.h | 3 +++ src/cadet/gnunet-service-cadet_channel.c | 3 +++ src/cadet/gnunet-service-cadet_channel.h | 3 +++ src/cadet/gnunet-service-cadet_connection.c | 3 +++ src/cadet/gnunet-service-cadet_connection.h | 3 +++ src/cadet/gnunet-service-cadet_core.c | 3 +++ src/cadet/gnunet-service-cadet_core.h | 3 +++ src/cadet/gnunet-service-cadet_dht.c | 3 +++ src/cadet/gnunet-service-cadet_dht.h | 3 +++ src/cadet/gnunet-service-cadet_hello.c | 3 +++ src/cadet/gnunet-service-cadet_hello.h | 3 +++ src/cadet/gnunet-service-cadet_paths.c | 3 +++ src/cadet/gnunet-service-cadet_paths.h | 3 +++ src/cadet/gnunet-service-cadet_peer.c | 3 +++ src/cadet/gnunet-service-cadet_peer.h | 3 +++ src/cadet/gnunet-service-cadet_tunnels.c | 3 +++ src/cadet/gnunet-service-cadet_tunnels.h | 3 +++ src/cadet/test_cadet.c | 3 +++ src/cadet/test_cadet_flow.c | 3 +++ src/cadet/test_cadet_local_mq.c | 3 +++ src/consensus/consensus-simulation.py.in | 3 +++ src/consensus/consensus.h | 3 +++ src/consensus/consensus_api.c | 3 +++ src/consensus/consensus_protocol.h | 3 +++ src/consensus/gnunet-consensus-profiler.c | 3 +++ src/consensus/gnunet-service-consensus.c | 3 +++ src/consensus/plugin_block_consensus.c | 3 +++ src/consensus/test_consensus_api.c | 3 +++ src/conversation/conversation.h | 3 +++ src/conversation/conversation_api.c | 3 +++ src/conversation/conversation_api_call.c | 3 +++ src/conversation/gnunet-conversation-test.c | 3 +++ src/conversation/gnunet-conversation.c | 3 +++ src/conversation/gnunet-helper-audio-playback-gst.c | 3 +++ src/conversation/gnunet-helper-audio-playback.c | 3 +++ src/conversation/gnunet-helper-audio-record-gst.c | 3 +++ src/conversation/gnunet-helper-audio-record.c | 3 +++ src/conversation/gnunet-service-conversation.c | 3 +++ src/conversation/gnunet_gst.c | 3 +++ src/conversation/gnunet_gst.h | 3 +++ src/conversation/gnunet_gst_def.h | 3 +++ src/conversation/gnunet_gst_test.c | 3 +++ src/conversation/microphone.c | 3 +++ src/conversation/plugin_gnsrecord_conversation.c | 3 +++ src/conversation/speaker.c | 3 +++ src/conversation/test_conversation_api.c | 3 +++ src/conversation/test_conversation_api_reject.c | 3 +++ src/conversation/test_conversation_api_twocalls.c | 3 +++ src/core/core.h | 3 +++ src/core/core_api.c | 3 +++ src/core/core_api_monitor_peers.c | 3 +++ src/core/gnunet-core.c | 3 +++ src/core/gnunet-service-core.c | 3 +++ src/core/gnunet-service-core.h | 3 +++ src/core/gnunet-service-core_kx.c | 3 +++ src/core/gnunet-service-core_kx.h | 3 +++ src/core/gnunet-service-core_sessions.c | 3 +++ src/core/gnunet-service-core_sessions.h | 3 +++ src/core/gnunet-service-core_typemap.c | 3 +++ src/core/gnunet-service-core_typemap.h | 3 +++ src/core/test_core_api.c | 3 +++ src/core/test_core_api_reliability.c | 3 +++ src/core/test_core_api_send_to_self.c | 3 +++ src/core/test_core_api_start_only.c | 3 +++ src/core/test_core_quota_compliance.c | 3 +++ src/credential/credential.h | 3 +++ src/credential/credential_api.c | 3 +++ src/credential/credential_misc.c | 3 +++ src/credential/credential_misc.h | 3 +++ src/credential/credential_serialization.c | 3 +++ src/credential/credential_serialization.h | 3 +++ src/credential/gnunet-credential.c | 3 +++ src/credential/gnunet-service-credential.c | 3 +++ src/credential/plugin_gnsrecord_credential.c | 3 +++ src/credential/plugin_rest_credential.c | 3 +++ src/curl/curl.c | 3 +++ src/curl/curl_reschedule.c | 3 +++ src/datacache/datacache.c | 3 +++ src/datacache/perf_datacache.c | 3 +++ src/datacache/plugin_datacache_heap.c | 3 +++ src/datacache/plugin_datacache_postgres.c | 3 +++ src/datacache/plugin_datacache_sqlite.c | 3 +++ src/datacache/plugin_datacache_template.c | 3 +++ src/datacache/test_datacache.c | 3 +++ src/datacache/test_datacache_quota.c | 3 +++ src/datastore/datastore.h | 3 +++ src/datastore/datastore_api.c | 3 +++ src/datastore/gnunet-datastore.c | 3 +++ src/datastore/gnunet-service-datastore.c | 3 +++ src/datastore/perf_datastore_api.c | 3 +++ src/datastore/perf_plugin_datastore.c | 3 +++ src/datastore/plugin_datastore_heap.c | 3 +++ src/datastore/plugin_datastore_mysql.c | 3 +++ src/datastore/plugin_datastore_postgres.c | 3 +++ src/datastore/plugin_datastore_sqlite.c | 3 +++ src/datastore/plugin_datastore_template.c | 3 +++ src/datastore/test_datastore_api.c | 3 +++ src/datastore/test_datastore_api_management.c | 3 +++ src/datastore/test_plugin_datastore.c | 3 +++ src/dht/dht.h | 3 +++ src/dht/dht_api.c | 3 +++ src/dht/dht_test_lib.c | 3 +++ src/dht/dht_test_lib.h | 3 +++ src/dht/gnunet-dht-get.c | 3 +++ src/dht/gnunet-dht-monitor.c | 3 +++ src/dht/gnunet-dht-put.c | 3 +++ src/dht/gnunet-service-dht.c | 3 +++ src/dht/gnunet-service-dht.h | 3 +++ src/dht/gnunet-service-dht_clients.c | 3 +++ src/dht/gnunet-service-dht_datacache.c | 3 +++ src/dht/gnunet-service-dht_datacache.h | 3 +++ src/dht/gnunet-service-dht_hello.c | 3 +++ src/dht/gnunet-service-dht_hello.h | 3 +++ src/dht/gnunet-service-dht_neighbours.c | 3 +++ src/dht/gnunet-service-dht_neighbours.h | 3 +++ src/dht/gnunet-service-dht_nse.c | 3 +++ src/dht/gnunet-service-dht_nse.h | 3 +++ src/dht/gnunet-service-dht_routing.c | 3 +++ src/dht/gnunet-service-dht_routing.h | 3 +++ src/dht/gnunet_dht_profiler.c | 3 +++ src/dht/plugin_block_dht.c | 3 +++ src/dht/test_dht_api.c | 3 +++ src/dht/test_dht_monitor.c | 3 +++ src/dht/test_dht_topo.c | 3 +++ src/dns/dns.h | 3 +++ src/dns/dns_api.c | 3 +++ src/dns/dnsparser.c | 3 +++ src/dns/dnsstub.c | 3 +++ src/dns/gnunet-dns-monitor.c | 3 +++ src/dns/gnunet-dns-redirector.c | 3 +++ src/dns/gnunet-helper-dns.c | 3 +++ src/dns/gnunet-service-dns.c | 3 +++ src/dns/gnunet-zonewalk.c | 3 +++ src/dns/plugin_block_dns.c | 3 +++ src/dns/test_hexcoder.c | 3 +++ src/dv/dv.h | 3 +++ src/dv/dv_api.c | 3 +++ src/dv/gnunet-dv.c | 3 +++ src/dv/gnunet-service-dv.c | 3 +++ src/dv/plugin_transport_dv.c | 3 +++ src/dv/test_transport_blacklist.c | 3 +++ src/dv/test_transport_dv.c | 3 +++ src/exit/exit.h | 3 +++ src/exit/gnunet-daemon-exit.c | 3 +++ src/exit/gnunet-helper-exit-windows.c | 3 +++ src/exit/gnunet-helper-exit.c | 3 +++ src/fragmentation/defragmentation.c | 3 +++ src/fragmentation/fragmentation.c | 3 +++ src/fragmentation/fragmentation.h | 3 +++ src/fragmentation/test_fragmentation.c | 3 +++ src/fragmentation/test_fragmentation_parallel.c | 3 +++ src/fs/fs.h | 3 +++ src/fs/fs_api.c | 3 +++ src/fs/fs_api.h | 3 +++ src/fs/fs_directory.c | 3 +++ src/fs/fs_dirmetascan.c | 3 +++ src/fs/fs_download.c | 3 +++ src/fs/fs_file_information.c | 3 +++ src/fs/fs_getopt.c | 3 +++ src/fs/fs_list_indexed.c | 3 +++ src/fs/fs_misc.c | 3 +++ src/fs/fs_namespace.c | 3 +++ src/fs/fs_publish.c | 3 +++ src/fs/fs_publish_ksk.c | 3 +++ src/fs/fs_publish_ublock.c | 3 +++ src/fs/fs_publish_ublock.h | 3 +++ src/fs/fs_search.c | 3 +++ src/fs/fs_sharetree.c | 3 +++ src/fs/fs_test_lib.c | 3 +++ src/fs/fs_test_lib.h | 3 +++ src/fs/fs_tree.c | 3 +++ src/fs/fs_tree.h | 3 +++ src/fs/fs_unindex.c | 3 +++ src/fs/fs_uri.c | 3 +++ src/fs/gnunet-auto-share.c | 3 +++ src/fs/gnunet-daemon-fsprofiler.c | 3 +++ src/fs/gnunet-directory.c | 3 +++ src/fs/gnunet-download.c | 3 +++ src/fs/gnunet-fs-profiler.c | 3 +++ src/fs/gnunet-fs.c | 3 +++ src/fs/gnunet-helper-fs-publish.c | 3 +++ src/fs/gnunet-publish.c | 3 +++ src/fs/gnunet-search.c | 3 +++ src/fs/gnunet-service-fs.c | 3 +++ src/fs/gnunet-service-fs.h | 3 +++ src/fs/gnunet-service-fs_cadet.h | 3 +++ src/fs/gnunet-service-fs_cadet_client.c | 3 +++ src/fs/gnunet-service-fs_cadet_server.c | 3 +++ src/fs/gnunet-service-fs_cp.c | 3 +++ src/fs/gnunet-service-fs_cp.h | 3 +++ src/fs/gnunet-service-fs_indexing.c | 3 +++ src/fs/gnunet-service-fs_indexing.h | 3 +++ src/fs/gnunet-service-fs_pe.c | 3 +++ src/fs/gnunet-service-fs_pe.h | 3 +++ src/fs/gnunet-service-fs_pr.c | 3 +++ src/fs/gnunet-service-fs_pr.h | 3 +++ src/fs/gnunet-service-fs_push.c | 3 +++ src/fs/gnunet-service-fs_push.h | 3 +++ src/fs/gnunet-service-fs_put.c | 3 +++ src/fs/gnunet-service-fs_put.h | 3 +++ src/fs/gnunet-unindex.c | 3 +++ src/fs/perf_gnunet_service_fs_p2p.c | 3 +++ src/fs/perf_gnunet_service_fs_p2p_respect.c | 3 +++ src/fs/plugin_block_fs.c | 3 +++ src/fs/test_fs.c | 3 +++ src/fs/test_fs_directory.c | 3 +++ src/fs/test_fs_download.c | 3 +++ src/fs/test_fs_download_persistence.c | 3 +++ src/fs/test_fs_file_information.c | 3 +++ src/fs/test_fs_getopt.c | 3 +++ src/fs/test_fs_list_indexed.c | 3 +++ src/fs/test_fs_namespace.c | 3 +++ src/fs/test_fs_namespace_list_updateable.c | 3 +++ src/fs/test_fs_publish.c | 3 +++ src/fs/test_fs_publish_persistence.c | 3 +++ src/fs/test_fs_search.c | 3 +++ src/fs/test_fs_search_persistence.c | 3 +++ src/fs/test_fs_search_probes.c | 3 +++ src/fs/test_fs_search_with_and.c | 3 +++ src/fs/test_fs_start_stop.c | 3 +++ src/fs/test_fs_test_lib.c | 3 +++ src/fs/test_fs_unindex.c | 3 +++ src/fs/test_fs_unindex_persistence.c | 3 +++ src/fs/test_fs_uri.c | 3 +++ src/fs/test_gnunet_fs_idx.py.in | 3 +++ src/fs/test_gnunet_fs_psd.py.in | 3 +++ src/fs/test_gnunet_fs_rec.py.in | 3 +++ src/fs/test_gnunet_service_fs_migration.c | 3 +++ src/fs/test_gnunet_service_fs_p2p.c | 3 +++ src/fs/test_plugin_block_fs.c | 3 +++ src/gns/gns.h | 3 +++ src/gns/gns_api.c | 3 +++ src/gns/gns_api.h | 3 +++ src/gns/gns_tld_api.c | 3 +++ src/gns/gnunet-bcd.c | 3 +++ src/gns/gnunet-dns2gns.c | 3 +++ src/gns/gnunet-gns-benchmark.c | 3 +++ src/gns/gnunet-gns-helper-service-w32.c | 3 +++ src/gns/gnunet-gns-import.c | 3 +++ src/gns/gnunet-gns-proxy.c | 3 +++ src/gns/gnunet-gns.c | 3 +++ src/gns/gnunet-service-gns.c | 3 +++ src/gns/gnunet-service-gns.h | 3 +++ src/gns/gnunet-service-gns_interceptor.c | 3 +++ src/gns/gnunet-service-gns_interceptor.h | 3 +++ src/gns/gnunet-service-gns_resolver.c | 3 +++ src/gns/gnunet-service-gns_resolver.h | 3 +++ src/gns/nss/nss_gns_query.c | 3 +++ src/gns/nss/nss_gns_query.h | 3 +++ src/gns/plugin_block_gns.c | 3 +++ src/gns/plugin_gnsrecord_gns.c | 3 +++ src/gns/plugin_rest_gns.c | 3 +++ src/gns/test_gns_proxy.c | 3 +++ src/gns/w32nsp-install.c | 3 +++ src/gns/w32nsp-resolve.c | 3 +++ src/gns/w32nsp.c | 3 +++ src/gns/w32resolver.h | 3 +++ src/gnsrecord/gnsrecord.c | 3 +++ src/gnsrecord/gnsrecord_crypto.c | 3 +++ src/gnsrecord/gnsrecord_misc.c | 3 +++ src/gnsrecord/gnsrecord_serialization.c | 3 +++ src/gnsrecord/perf_gnsrecord_crypto.c | 3 +++ src/gnsrecord/plugin_gnsrecord_dns.c | 3 +++ src/gnsrecord/test_gnsrecord_block_expiration.c | 3 +++ src/gnsrecord/test_gnsrecord_crypto.c | 3 +++ src/gnsrecord/test_gnsrecord_serialization.c | 3 +++ src/hello/address.c | 3 +++ src/hello/gnunet-hello.c | 3 +++ src/hello/hello.c | 3 +++ src/hello/test_friend_hello.c | 3 +++ src/hello/test_hello.c | 3 +++ src/hostlist/gnunet-daemon-hostlist.c | 3 +++ src/hostlist/gnunet-daemon-hostlist.h | 3 +++ src/hostlist/gnunet-daemon-hostlist_client.c | 3 +++ src/hostlist/gnunet-daemon-hostlist_client.h | 3 +++ src/hostlist/gnunet-daemon-hostlist_server.c | 3 +++ src/hostlist/gnunet-daemon-hostlist_server.h | 3 +++ src/hostlist/test_gnunet_daemon_hostlist.c | 3 +++ src/hostlist/test_gnunet_daemon_hostlist_learning.c | 3 +++ src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 3 +++ src/identity-attribute/identity_attribute.c | 3 +++ src/identity-attribute/identity_attribute.h | 3 +++ src/identity-attribute/plugin_identity_attribute_gnuid.c | 3 +++ src/identity-provider/gnunet-idp.c | 3 +++ src/identity-provider/gnunet-service-identity-provider.c | 3 +++ src/identity-provider/identity_provider.h | 3 +++ src/identity-provider/identity_provider_api.c | 3 +++ src/identity-provider/jwt.c | 3 +++ src/identity-provider/plugin_gnsrecord_identity_provider.c | 3 +++ src/identity-provider/plugin_identity_provider_sqlite.c | 3 +++ src/identity-provider/plugin_rest_identity_provider.c | 3 +++ src/identity-provider/plugin_rest_openid_connect.c | 3 +++ src/identity/gnunet-identity.c | 3 +++ src/identity/gnunet-service-identity.c | 3 +++ src/identity/identity.h | 3 +++ src/identity/identity_api.c | 3 +++ src/identity/identity_api_lookup.c | 3 +++ src/identity/plugin_rest_identity.c | 3 +++ src/identity/test_identity.c | 3 +++ src/identity/test_identity_defaults.c | 3 +++ src/include/block_dns.h | 3 +++ src/include/block_fs.h | 3 +++ src/include/block_regex.h | 3 +++ src/include/gnunet_abe_lib.h | 3 +++ src/include/gnunet_applications.h | 3 +++ src/include/gnunet_arm_service.h | 3 +++ src/include/gnunet_ats_plugin.h | 3 +++ src/include/gnunet_ats_service.h | 3 +++ src/include/gnunet_bandwidth_lib.h | 3 +++ src/include/gnunet_bio_lib.h | 3 +++ src/include/gnunet_block_group_lib.h | 3 +++ src/include/gnunet_block_lib.h | 3 +++ src/include/gnunet_block_plugin.h | 3 +++ src/include/gnunet_cadet_service.h | 3 +++ src/include/gnunet_client_lib.h | 3 +++ src/include/gnunet_common.h | 3 +++ src/include/gnunet_configuration_lib.h | 3 +++ src/include/gnunet_consensus_service.h | 3 +++ src/include/gnunet_constants.h | 3 +++ src/include/gnunet_container_lib.h | 3 +++ src/include/gnunet_conversation_service.h | 3 +++ src/include/gnunet_core_service.h | 3 +++ src/include/gnunet_credential_service.h | 3 +++ src/include/gnunet_crypto_lib.h | 3 +++ src/include/gnunet_curl_lib.h | 3 +++ src/include/gnunet_datacache_lib.h | 3 +++ src/include/gnunet_datacache_plugin.h | 3 +++ src/include/gnunet_datastore_plugin.h | 3 +++ src/include/gnunet_datastore_service.h | 3 +++ src/include/gnunet_db_lib.h | 3 +++ src/include/gnunet_dht_service.h | 3 +++ src/include/gnunet_disk_lib.h | 3 +++ src/include/gnunet_dns_service.h | 3 +++ src/include/gnunet_dnsparser_lib.h | 3 +++ src/include/gnunet_dnsstub_lib.h | 3 +++ src/include/gnunet_dv_service.h | 3 +++ src/include/gnunet_fragmentation_lib.h | 3 +++ src/include/gnunet_friends_lib.h | 3 +++ src/include/gnunet_fs_service.h | 3 +++ src/include/gnunet_getopt_lib.h | 3 +++ src/include/gnunet_gns_service.h | 3 +++ src/include/gnunet_gnsrecord_lib.h | 3 +++ src/include/gnunet_gnsrecord_plugin.h | 3 +++ src/include/gnunet_hello_lib.h | 3 +++ src/include/gnunet_helper_lib.h | 3 +++ src/include/gnunet_identity_attribute_lib.h | 3 +++ src/include/gnunet_identity_attribute_plugin.h | 3 +++ src/include/gnunet_identity_provider_plugin.h | 3 +++ src/include/gnunet_identity_provider_service.h | 3 +++ src/include/gnunet_identity_service.h | 3 +++ src/include/gnunet_json_lib.h | 3 +++ src/include/gnunet_jsonapi_lib.h | 3 +++ src/include/gnunet_jsonapi_util.h | 3 +++ src/include/gnunet_load_lib.h | 3 +++ src/include/gnunet_microphone_lib.h | 3 +++ src/include/gnunet_mq_lib.h | 3 +++ src/include/gnunet_mst_lib.h | 3 +++ src/include/gnunet_multicast_service.h | 3 +++ src/include/gnunet_my_lib.h | 3 +++ src/include/gnunet_mysql_lib.h | 3 +++ src/include/gnunet_namecache_plugin.h | 3 +++ src/include/gnunet_namecache_service.h | 3 +++ src/include/gnunet_namestore_plugin.h | 3 +++ src/include/gnunet_namestore_service.h | 3 +++ src/include/gnunet_nat_auto_service.h | 3 +++ src/include/gnunet_nat_service.h | 3 +++ src/include/gnunet_nc_lib.h | 3 +++ src/include/gnunet_network_lib.h | 3 +++ src/include/gnunet_nse_service.h | 3 +++ src/include/gnunet_op_lib.h | 3 +++ src/include/gnunet_os_lib.h | 3 +++ src/include/gnunet_peer_lib.h | 3 +++ src/include/gnunet_peerinfo_service.h | 3 +++ src/include/gnunet_peerstore_plugin.h | 3 +++ src/include/gnunet_peerstore_service.h | 3 +++ src/include/gnunet_plugin_lib.h | 3 +++ src/include/gnunet_pq_lib.h | 3 +++ src/include/gnunet_program_lib.h | 3 +++ src/include/gnunet_protocols.h | 3 +++ src/include/gnunet_psyc_env.h | 3 +++ src/include/gnunet_psyc_message.h | 3 +++ src/include/gnunet_psyc_service.h | 3 +++ src/include/gnunet_psyc_slicer.h | 3 +++ src/include/gnunet_psyc_util_lib.h | 3 +++ src/include/gnunet_psycstore_plugin.h | 3 +++ src/include/gnunet_psycstore_service.h | 3 +++ src/include/gnunet_regex_service.h | 3 +++ src/include/gnunet_resolver_service.h | 3 +++ src/include/gnunet_rest_lib.h | 3 +++ src/include/gnunet_rest_plugin.h | 3 +++ src/include/gnunet_revocation_service.h | 3 +++ src/include/gnunet_rps_service.h | 3 +++ src/include/gnunet_scalarproduct_service.h | 3 +++ src/include/gnunet_scheduler_lib.h | 3 +++ src/include/gnunet_secretsharing_service.h | 3 +++ src/include/gnunet_sensor_service.h | 3 +++ src/include/gnunet_sensor_util_lib.h | 3 +++ src/include/gnunet_sensordashboard_service.h | 3 +++ src/include/gnunet_service_lib.h | 3 +++ src/include/gnunet_set_service.h | 3 +++ src/include/gnunet_signal_lib.h | 3 +++ src/include/gnunet_signatures.h | 3 +++ src/include/gnunet_social_service.h | 3 +++ src/include/gnunet_socks.h | 3 +++ src/include/gnunet_speaker_lib.h | 3 +++ src/include/gnunet_sq_lib.h | 3 +++ src/include/gnunet_statistics_service.h | 3 +++ src/include/gnunet_strings_lib.h | 3 +++ src/include/gnunet_testbed_logger_service.h | 3 +++ src/include/gnunet_testbed_service.h | 3 +++ src/include/gnunet_testing_lib.h | 3 +++ src/include/gnunet_time_lib.h | 3 +++ src/include/gnunet_transport_communication_service.h | 3 +++ src/include/gnunet_transport_core_service.h | 3 +++ src/include/gnunet_transport_hello_service.h | 3 +++ src/include/gnunet_transport_manipulation_service.h | 3 +++ src/include/gnunet_transport_monitor_service.h | 3 +++ src/include/gnunet_transport_plugin.h | 3 +++ src/include/gnunet_transport_service.h | 3 +++ src/include/gnunet_tun_lib.h | 3 +++ src/include/gnunet_util_lib.h | 3 +++ src/include/gnunet_util_taler_wallet_lib.h | 3 +++ src/include/gnunet_vpn_service.h | 3 +++ src/include/platform.h | 3 +++ src/include/winproc.h | 3 +++ src/integration-tests/gnunet_pyexpect.py.in | 3 +++ src/integration-tests/gnunet_testing.py.in | 3 +++ src/integration-tests/test_integration_bootstrap_and_connect.py.in | 3 +++ src/integration-tests/test_integration_clique.py.in | 3 +++ src/integration-tests/test_integration_disconnect.py.in | 3 +++ src/integration-tests/test_integration_disconnect_nat.py.in | 3 +++ src/integration-tests/test_integration_reconnect.py.in | 3 +++ src/integration-tests/test_integration_reconnect_nat.py.in | 3 +++ src/json/json.c | 3 +++ src/json/json_generator.c | 3 +++ src/json/json_helper.c | 3 +++ src/json/json_mhd.c | 3 +++ src/json/test_json.c | 3 +++ src/jsonapi/jsonapi.c | 3 +++ src/jsonapi/test_jsonapi.c | 3 +++ src/multicast/gnunet-multicast.c | 3 +++ src/multicast/gnunet-service-multicast.c | 3 +++ src/multicast/multicast.h | 3 +++ src/multicast/multicast_api.c | 3 +++ src/multicast/test_multicast.c | 3 +++ src/multicast/test_multicast_2peers.c | 3 +++ src/multicast/test_multicast_multipeer.c | 3 +++ src/my/my.c | 3 +++ src/my/my_query_helper.c | 3 +++ src/my/my_result_helper.c | 3 +++ src/my/test_my.c | 3 +++ src/mysql/mysql.c | 3 +++ src/namecache/gnunet-namecache.c | 3 +++ src/namecache/gnunet-service-namecache.c | 3 +++ src/namecache/namecache.h | 3 +++ src/namecache/namecache_api.c | 3 +++ src/namecache/plugin_namecache_flat.c | 3 +++ src/namecache/plugin_namecache_postgres.c | 3 +++ src/namecache/plugin_namecache_sqlite.c | 3 +++ src/namecache/test_namecache_api_cache_block.c | 3 +++ src/namecache/test_plugin_namecache.c | 3 +++ src/namestore/gnunet-namestore-fcfsd.c | 3 +++ src/namestore/gnunet-namestore.c | 3 +++ src/namestore/gnunet-service-namestore.c | 3 +++ src/namestore/gnunet-zoneimport.c | 3 +++ src/namestore/namestore.h | 3 +++ src/namestore/namestore_api.c | 3 +++ src/namestore/namestore_api_monitor.c | 3 +++ src/namestore/perf_namestore_api_zone_iteration.c | 3 +++ src/namestore/plugin_namestore_flat.c | 3 +++ src/namestore/plugin_namestore_postgres.c | 3 +++ src/namestore/plugin_namestore_sqlite.c | 3 +++ src/namestore/plugin_rest_namestore.c | 3 +++ src/namestore/test_namestore_api_lookup_nick.c | 3 +++ src/namestore/test_namestore_api_lookup_private.c | 3 +++ src/namestore/test_namestore_api_lookup_public.c | 3 +++ src/namestore/test_namestore_api_lookup_shadow.c | 3 +++ src/namestore/test_namestore_api_lookup_shadow_filter.c | 3 +++ src/namestore/test_namestore_api_monitoring.c | 3 +++ src/namestore/test_namestore_api_monitoring_existing.c | 3 +++ src/namestore/test_namestore_api_remove.c | 3 +++ src/namestore/test_namestore_api_remove_not_existing_record.c | 3 +++ src/namestore/test_namestore_api_store.c | 3 +++ src/namestore/test_namestore_api_store_update.c | 3 +++ src/namestore/test_namestore_api_zone_iteration.c | 3 +++ src/namestore/test_namestore_api_zone_iteration_nick.c | 3 +++ src/namestore/test_namestore_api_zone_iteration_specific_zone.c | 3 +++ src/namestore/test_namestore_api_zone_iteration_stop.c | 3 +++ src/namestore/test_namestore_api_zone_to_name.c | 3 +++ src/namestore/test_plugin_namestore.c | 3 +++ src/nat-auto/gnunet-nat-auto.c | 3 +++ src/nat-auto/gnunet-nat-auto_legacy.c | 3 +++ src/nat-auto/gnunet-nat-server.c | 3 +++ src/nat-auto/gnunet-service-nat-auto.c | 3 +++ src/nat-auto/gnunet-service-nat-auto_legacy.c | 3 +++ src/nat-auto/nat-auto.h | 3 +++ src/nat-auto/nat_auto_api.c | 3 +++ src/nat-auto/nat_auto_api_test.c | 3 +++ src/nat/gnunet-helper-nat-client-windows.c | 3 +++ src/nat/gnunet-helper-nat-client.c | 3 +++ src/nat/gnunet-helper-nat-server-windows.c | 3 +++ src/nat/gnunet-helper-nat-server.c | 3 +++ src/nat/gnunet-nat.c | 3 +++ src/nat/gnunet-service-nat.c | 3 +++ src/nat/gnunet-service-nat.h | 3 +++ src/nat/gnunet-service-nat_externalip.c | 3 +++ src/nat/gnunet-service-nat_externalip.h | 3 +++ src/nat/gnunet-service-nat_helper.c | 3 +++ src/nat/gnunet-service-nat_helper.h | 3 +++ src/nat/gnunet-service-nat_mini.c | 3 +++ src/nat/gnunet-service-nat_mini.h | 3 +++ src/nat/gnunet-service-nat_stun.c | 3 +++ src/nat/gnunet-service-nat_stun.h | 3 +++ src/nat/nat.h | 3 +++ src/nat/nat_api.c | 3 +++ src/nat/nat_api_stun.c | 3 +++ src/nat/nat_stun.h | 3 +++ src/nat/test_nat.c | 3 +++ src/nat/test_nat_mini.c | 3 +++ src/nat/test_nat_test.c | 3 +++ src/nat/test_stun.c | 3 +++ src/nse/gnunet-nse-profiler.c | 3 +++ src/nse/gnunet-nse.c | 3 +++ src/nse/gnunet-service-nse.c | 3 +++ src/nse/nse.h | 3 +++ src/nse/nse_api.c | 3 +++ src/nse/perf_kdf.c | 3 +++ src/nse/test_nse_api.c | 3 +++ src/nse/test_nse_multipeer.c | 3 +++ src/peerinfo-tool/gnunet-peerinfo.c | 3 +++ src/peerinfo-tool/gnunet-peerinfo_plugins.c | 3 +++ src/peerinfo-tool/gnunet-peerinfo_plugins.h | 3 +++ src/peerinfo-tool/test_gnunet_peerinfo.py.in | 3 +++ src/peerinfo/gnunet-service-peerinfo.c | 3 +++ src/peerinfo/peerinfo.h | 3 +++ src/peerinfo/peerinfo_api.c | 3 +++ src/peerinfo/peerinfo_api_notify.c | 3 +++ src/peerinfo/perf_peerinfo_api.c | 3 +++ src/peerinfo/test_peerinfo_api.c | 3 +++ src/peerinfo/test_peerinfo_api_friend_only.c | 3 +++ src/peerinfo/test_peerinfo_api_notify_friend_only.c | 3 +++ src/peerinfo/test_peerinfo_shipped_hellos.c | 3 +++ src/peerstore/gnunet-peerstore.c | 3 +++ src/peerstore/gnunet-service-peerstore.c | 3 +++ src/peerstore/peerstore.h | 3 +++ src/peerstore/peerstore_api.c | 3 +++ src/peerstore/peerstore_common.c | 3 +++ src/peerstore/peerstore_common.h | 3 +++ src/peerstore/perf_peerstore_store.c | 3 +++ src/peerstore/plugin_peerstore_flat.c | 3 +++ src/peerstore/plugin_peerstore_sqlite.c | 3 +++ src/peerstore/test_peerstore_api_iterate.c | 3 +++ src/peerstore/test_peerstore_api_store.c | 3 +++ src/peerstore/test_peerstore_api_sync.c | 3 +++ src/peerstore/test_peerstore_api_watch.c | 3 +++ src/peerstore/test_plugin_peerstore.c | 3 +++ src/pq/pq.c | 3 +++ src/pq/pq_connect.c | 3 +++ src/pq/pq_eval.c | 3 +++ src/pq/pq_exec.c | 3 +++ src/pq/pq_prepare.c | 3 +++ src/pq/pq_query_helper.c | 3 +++ src/pq/pq_result_helper.c | 3 +++ src/pq/test_pq.c | 3 +++ src/psyc/gnunet-service-psyc.c | 3 +++ src/psyc/psyc.h | 3 +++ src/psyc/psyc_api.c | 3 +++ src/psyc/psyc_test_lib.h | 3 +++ src/psyc/test_psyc.c | 3 +++ src/psyc/test_psyc2.c | 3 +++ src/psyc/test_psyc_api_join.c | 3 +++ src/psycstore/gnunet-service-psycstore.c | 3 +++ src/psycstore/plugin_psycstore_mysql.c | 3 +++ src/psycstore/plugin_psycstore_postgres.c | 3 +++ src/psycstore/plugin_psycstore_sqlite.c | 3 +++ src/psycstore/psycstore.h | 3 +++ src/psycstore/psycstore_api.c | 3 +++ src/psycstore/test_plugin_psycstore.c | 3 +++ src/psycstore/test_psycstore.c | 3 +++ src/psycutil/psyc_env.c | 3 +++ src/psycutil/psyc_message.c | 3 +++ src/psycutil/psyc_slicer.c | 3 +++ src/psycutil/test_psyc_env.c | 3 +++ src/pt/gnunet-daemon-pt.c | 3 +++ src/pt/test_gns_vpn.c | 3 +++ src/pt/test_gnunet_vpn.c | 3 +++ src/regex/gnunet-daemon-regexprofiler.c | 3 +++ src/regex/gnunet-regex-profiler.c | 3 +++ src/regex/gnunet-regex-simulation-profiler.c | 3 +++ src/regex/gnunet-service-regex.c | 3 +++ src/regex/perf-regex.c | 3 +++ src/regex/plugin_block_regex.c | 3 +++ src/regex/regex_api_announce.c | 3 +++ src/regex/regex_api_search.c | 3 +++ src/regex/regex_block_lib.c | 3 +++ src/regex/regex_block_lib.h | 3 +++ src/regex/regex_internal.c | 3 +++ src/regex/regex_internal.h | 3 +++ src/regex/regex_internal_dht.c | 3 +++ src/regex/regex_internal_lib.h | 3 +++ src/regex/regex_ipc.h | 3 +++ src/regex/regex_test_graph.c | 3 +++ src/regex/regex_test_lib.c | 3 +++ src/regex/regex_test_lib.h | 3 +++ src/regex/regex_test_random.c | 3 +++ src/regex/test_regex_api.c | 3 +++ src/regex/test_regex_eval_api.c | 3 +++ src/regex/test_regex_graph_api.c | 3 +++ src/regex/test_regex_integration.c | 3 +++ src/regex/test_regex_iterate_api.c | 3 +++ src/regex/test_regex_proofs.c | 3 +++ src/rest/gnunet-rest-server.c | 3 +++ src/rest/rest.c | 3 +++ src/revocation/gnunet-revocation.c | 3 +++ src/revocation/gnunet-service-revocation.c | 3 +++ src/revocation/plugin_block_revocation.c | 3 +++ src/revocation/revocation.h | 3 +++ src/revocation/revocation_api.c | 3 +++ src/revocation/test_local_revocation.py.in | 3 +++ src/revocation/test_revocation.c | 3 +++ src/rps/gnunet-rps-profiler.c | 3 +++ src/rps/gnunet-rps.c | 3 +++ src/rps/gnunet-service-rps.c | 3 +++ src/rps/gnunet-service-rps_custommap.c | 3 +++ src/rps/gnunet-service-rps_custommap.h | 3 +++ src/rps/gnunet-service-rps_sampler.c | 3 +++ src/rps/gnunet-service-rps_sampler.h | 3 +++ src/rps/gnunet-service-rps_sampler_elem.c | 3 +++ src/rps/gnunet-service-rps_sampler_elem.h | 3 +++ src/rps/gnunet-service-rps_view.c | 3 +++ src/rps/gnunet-service-rps_view.h | 3 +++ src/rps/rps-test_util.c | 3 +++ src/rps/rps-test_util.h | 3 +++ src/rps/rps.h | 3 +++ src/rps/rps_api.c | 3 +++ src/rps/test_rps.c | 3 +++ src/rps/test_rps_api.c | 3 +++ src/rps/test_service_rps_custommap.c | 3 +++ src/rps/test_service_rps_sampler_elem.c | 3 +++ src/rps/test_service_rps_view.c | 3 +++ src/scalarproduct/gnunet-scalarproduct.c | 3 +++ src/scalarproduct/gnunet-service-scalarproduct-ecc.h | 3 +++ src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c | 3 +++ src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | 3 +++ src/scalarproduct/gnunet-service-scalarproduct.h | 3 +++ src/scalarproduct/gnunet-service-scalarproduct_alice.c | 3 +++ src/scalarproduct/gnunet-service-scalarproduct_bob.c | 3 +++ src/scalarproduct/scalarproduct.h | 3 +++ src/scalarproduct/scalarproduct_api.c | 3 +++ src/scalarproduct/test_ecc_scalarproduct.c | 3 +++ src/secretsharing/gnunet-secretsharing-profiler.c | 3 +++ src/secretsharing/gnunet-service-secretsharing.c | 3 +++ src/secretsharing/secretsharing.h | 3 +++ src/secretsharing/secretsharing_api.c | 3 +++ src/secretsharing/secretsharing_common.c | 3 +++ src/secretsharing/secretsharing_protocol.h | 3 +++ src/secretsharing/test_secretsharing_api.c | 3 +++ src/set/gnunet-service-set.c | 3 +++ src/set/gnunet-service-set.h | 3 +++ src/set/gnunet-service-set_intersection.c | 3 +++ src/set/gnunet-service-set_intersection.h | 3 +++ src/set/gnunet-service-set_protocol.h | 3 +++ src/set/gnunet-service-set_union.c | 3 +++ src/set/gnunet-service-set_union.h | 3 +++ src/set/gnunet-service-set_union_strata_estimator.c | 3 +++ src/set/gnunet-service-set_union_strata_estimator.h | 3 +++ src/set/gnunet-set-ibf-profiler.c | 3 +++ src/set/gnunet-set-profiler.c | 3 +++ src/set/ibf.c | 3 +++ src/set/ibf.h | 3 +++ src/set/ibf_sim.c | 3 +++ src/set/plugin_block_set_test.c | 3 +++ src/set/set.h | 3 +++ src/set/set_api.c | 3 +++ src/set/test_set_api.c | 3 +++ src/set/test_set_intersection_result_full.c | 3 +++ src/set/test_set_union_copy.c | 3 +++ src/set/test_set_union_result_symmetric.c | 3 +++ src/social/gnunet-service-social.c | 3 +++ src/social/gnunet-social.c | 3 +++ src/social/social.h | 3 +++ src/social/social_api.c | 3 +++ src/social/test_social.c | 3 +++ src/sq/sq.c | 3 +++ src/sq/sq_exec.c | 3 +++ src/sq/sq_prepare.c | 3 +++ src/sq/sq_query_helper.c | 3 +++ src/sq/sq_result_helper.c | 3 +++ src/sq/test_sq.c | 3 +++ src/statistics/gnunet-service-statistics.c | 3 +++ src/statistics/gnunet-statistics.c | 3 +++ src/statistics/statistics.h | 3 +++ src/statistics/statistics_api.c | 3 +++ src/statistics/test_statistics_api.c | 3 +++ src/statistics/test_statistics_api_loop.c | 3 +++ src/statistics/test_statistics_api_watch.c | 3 +++ src/statistics/test_statistics_api_watch_zero_value.c | 3 +++ src/template/gnunet-service-template.c | 3 +++ src/template/gnunet-template.c | 3 +++ src/template/test_template_api.c | 3 +++ src/testbed-logger/gnunet-service-testbed-logger.c | 3 +++ src/testbed-logger/test_testbed_logger_api.c | 3 +++ src/testbed-logger/testbed_logger_api.c | 3 +++ src/testbed/buildvars.py.in | 3 +++ src/testbed/generate-underlay-topology.c | 3 +++ src/testbed/gnunet-daemon-latency-logger.c | 3 +++ src/testbed/gnunet-daemon-testbed-blacklist.c | 3 +++ src/testbed/gnunet-daemon-testbed-underlay.c | 3 +++ src/testbed/gnunet-helper-testbed.c | 3 +++ src/testbed/gnunet-service-test-barriers.c | 3 +++ src/testbed/gnunet-service-testbed.c | 3 +++ src/testbed/gnunet-service-testbed.h | 3 +++ src/testbed/gnunet-service-testbed_barriers.c | 3 +++ src/testbed/gnunet-service-testbed_barriers.h | 3 +++ src/testbed/gnunet-service-testbed_cache.c | 3 +++ src/testbed/gnunet-service-testbed_connectionpool.c | 3 +++ src/testbed/gnunet-service-testbed_connectionpool.h | 3 +++ src/testbed/gnunet-service-testbed_cpustatus.c | 3 +++ src/testbed/gnunet-service-testbed_links.c | 3 +++ src/testbed/gnunet-service-testbed_links.h | 3 +++ src/testbed/gnunet-service-testbed_meminfo.c | 3 +++ src/testbed/gnunet-service-testbed_meminfo.h | 3 +++ src/testbed/gnunet-service-testbed_oc.c | 3 +++ src/testbed/gnunet-service-testbed_peers.c | 3 +++ src/testbed/gnunet-testbed-profiler.c | 3 +++ src/testbed/test_gnunet_helper_testbed.c | 3 +++ src/testbed/test_testbed_api.c | 3 +++ src/testbed/test_testbed_api_2peers_1controller.c | 3 +++ src/testbed/test_testbed_api_3peers_3controllers.c | 3 +++ src/testbed/test_testbed_api_barriers.c | 3 +++ src/testbed/test_testbed_api_controllerlink.c | 3 +++ src/testbed/test_testbed_api_hosts.c | 3 +++ src/testbed/test_testbed_api_operations.c | 3 +++ src/testbed/test_testbed_api_peer_reconfiguration.c | 3 +++ src/testbed/test_testbed_api_peers_manage_services.c | 3 +++ src/testbed/test_testbed_api_sd.c | 3 +++ src/testbed/test_testbed_api_statistics.c | 3 +++ src/testbed/test_testbed_api_test.c | 3 +++ src/testbed/test_testbed_api_test_timeout.c | 3 +++ src/testbed/test_testbed_api_testbed_run.c | 3 +++ src/testbed/test_testbed_api_topology.c | 3 +++ src/testbed/test_testbed_api_topology_clique.c | 3 +++ src/testbed/test_testbed_underlay.c | 3 +++ src/testbed/testbed.h | 3 +++ src/testbed/testbed_api.c | 3 +++ src/testbed/testbed_api.h | 3 +++ src/testbed/testbed_api_barriers.c | 3 +++ src/testbed/testbed_api_hosts.c | 3 +++ src/testbed/testbed_api_hosts.h | 3 +++ src/testbed/testbed_api_operations.c | 3 +++ src/testbed/testbed_api_operations.h | 3 +++ src/testbed/testbed_api_peers.c | 3 +++ src/testbed/testbed_api_peers.h | 3 +++ src/testbed/testbed_api_sd.c | 3 +++ src/testbed/testbed_api_sd.h | 3 +++ src/testbed/testbed_api_services.c | 3 +++ src/testbed/testbed_api_statistics.c | 3 +++ src/testbed/testbed_api_test.c | 3 +++ src/testbed/testbed_api_testbed.c | 3 +++ src/testbed/testbed_api_topology.c | 3 +++ src/testbed/testbed_api_topology.h | 3 +++ src/testbed/testbed_api_underlay.c | 3 +++ src/testbed/testbed_helper.h | 3 +++ src/testing/gnunet-testing.c | 3 +++ src/testing/test_testing_peerstartup.c | 3 +++ src/testing/test_testing_peerstartup2.c | 3 +++ src/testing/test_testing_portreservation.c | 3 +++ src/testing/test_testing_servicestartup.c | 3 +++ src/testing/test_testing_sharedservices.c | 3 +++ src/testing/testing.c | 3 +++ src/topology/friends.c | 3 +++ src/topology/gnunet-daemon-topology.c | 3 +++ src/topology/test_gnunet_daemon_topology.c | 3 +++ src/transport/gnunet-helper-transport-bluetooth.c | 3 +++ src/transport/gnunet-helper-transport-wlan-dummy.c | 3 +++ src/transport/gnunet-helper-transport-wlan.c | 3 +++ src/transport/gnunet-service-transport.c | 3 +++ src/transport/gnunet-service-transport.h | 3 +++ src/transport/gnunet-service-transport_ats.c | 3 +++ src/transport/gnunet-service-transport_ats.h | 3 +++ src/transport/gnunet-service-transport_hello.c | 3 +++ src/transport/gnunet-service-transport_hello.h | 3 +++ src/transport/gnunet-service-transport_manipulation.c | 3 +++ src/transport/gnunet-service-transport_manipulation.h | 3 +++ src/transport/gnunet-service-transport_neighbours.c | 3 +++ src/transport/gnunet-service-transport_neighbours.h | 3 +++ src/transport/gnunet-service-transport_plugins.c | 3 +++ src/transport/gnunet-service-transport_plugins.h | 3 +++ src/transport/gnunet-service-transport_validation.c | 3 +++ src/transport/gnunet-service-transport_validation.h | 3 +++ src/transport/gnunet-transport-certificate-creation.c | 3 +++ src/transport/gnunet-transport-profiler.c | 3 +++ src/transport/gnunet-transport-wlan-receiver.c | 3 +++ src/transport/gnunet-transport-wlan-sender.c | 3 +++ src/transport/gnunet-transport.c | 3 +++ src/transport/plugin_transport_http.h | 3 +++ src/transport/plugin_transport_http_client.c | 3 +++ src/transport/plugin_transport_http_common.c | 3 +++ src/transport/plugin_transport_http_common.h | 3 +++ src/transport/plugin_transport_http_server.c | 3 +++ src/transport/plugin_transport_smtp.c | 3 +++ src/transport/plugin_transport_tcp.c | 3 +++ src/transport/plugin_transport_template.c | 3 +++ src/transport/plugin_transport_udp.c | 3 +++ src/transport/plugin_transport_udp.h | 3 +++ src/transport/plugin_transport_udp_broadcasting.c | 3 +++ src/transport/plugin_transport_unix.c | 3 +++ src/transport/plugin_transport_wlan.c | 3 +++ src/transport/plugin_transport_wlan.h | 3 +++ src/transport/plugin_transport_xt.c | 3 +++ src/transport/plugin_transport_xu.c | 3 +++ src/transport/plugin_transport_xu.h | 3 +++ src/transport/tcp_connection_legacy.c | 3 +++ src/transport/tcp_server_legacy.c | 3 +++ src/transport/tcp_server_mst_legacy.c | 3 +++ src/transport/tcp_service_legacy.c | 3 +++ src/transport/test_http_common.c | 3 +++ src/transport/test_plugin_transport.c | 3 +++ src/transport/test_quota_compliance.c | 3 +++ src/transport/test_transport_address_switch.c | 3 +++ src/transport/test_transport_api.c | 3 +++ src/transport/test_transport_api_blacklisting.c | 3 +++ src/transport/test_transport_api_disconnect.c | 3 +++ src/transport/test_transport_api_limited_sockets.c | 3 +++ src/transport/test_transport_api_manipulation_cfg.c | 3 +++ src/transport/test_transport_api_manipulation_recv_tcp.c | 3 +++ src/transport/test_transport_api_manipulation_send_tcp.c | 3 +++ src/transport/test_transport_api_monitor_peers.c | 3 +++ src/transport/test_transport_api_reliability.c | 3 +++ src/transport/test_transport_api_restart_reconnect.c | 3 +++ src/transport/test_transport_api_timeout.c | 3 +++ src/transport/test_transport_blacklisting.c | 3 +++ src/transport/test_transport_testing_restart.c | 3 +++ src/transport/test_transport_testing_startstop.c | 3 +++ src/transport/transport-testing-filenames.c | 3 +++ src/transport/transport-testing-loggers.c | 3 +++ src/transport/transport-testing-main.c | 3 +++ src/transport/transport-testing-send.c | 3 +++ src/transport/transport-testing.c | 3 +++ src/transport/transport-testing.h | 3 +++ src/transport/transport.h | 3 +++ src/transport/transport_api_address_to_string.c | 3 +++ src/transport/transport_api_blacklist.c | 3 +++ src/transport/transport_api_core.c | 3 +++ src/transport/transport_api_hello_get.c | 3 +++ src/transport/transport_api_manipulation.c | 3 +++ src/transport/transport_api_monitor_peers.c | 3 +++ src/transport/transport_api_monitor_plugins.c | 3 +++ src/transport/transport_api_offer_hello.c | 3 +++ src/tun/regex.c | 3 +++ src/tun/test_regex.c | 3 +++ src/tun/test_tun.c | 3 +++ src/tun/tun.c | 3 +++ src/util/bandwidth.c | 3 +++ src/util/bio.c | 3 +++ src/util/client.c | 3 +++ src/util/common_allocation.c | 3 +++ src/util/common_endian.c | 3 +++ src/util/common_logging.c | 3 +++ src/util/configuration.c | 3 +++ src/util/configuration_loader.c | 3 +++ src/util/container_bloomfilter.c | 3 +++ src/util/container_heap.c | 3 +++ src/util/container_meta_data.c | 3 +++ src/util/container_multihashmap.c | 3 +++ src/util/container_multihashmap32.c | 3 +++ src/util/container_multipeermap.c | 3 +++ src/util/container_multishortmap.c | 3 +++ src/util/crypto_abe.c | 3 +++ src/util/crypto_bug.c | 3 +++ src/util/crypto_crc.c | 3 +++ src/util/crypto_ecc.c | 3 +++ src/util/crypto_ecc_dlog.c | 3 +++ src/util/crypto_ecc_setup.c | 3 +++ src/util/crypto_hash.c | 3 +++ src/util/crypto_hash_file.c | 3 +++ src/util/crypto_kdf.c | 3 +++ src/util/crypto_mpi.c | 3 +++ src/util/crypto_paillier.c | 3 +++ src/util/crypto_random.c | 3 +++ src/util/crypto_rsa.c | 3 +++ src/util/crypto_symmetric.c | 3 +++ src/util/disk.c | 3 +++ src/util/disk.h | 3 +++ src/util/getopt_helpers.c | 3 +++ src/util/gnunet-config.c | 3 +++ src/util/gnunet-ecc.c | 3 +++ src/util/gnunet-helper-w32-console.c | 3 +++ src/util/gnunet-helper-w32-console.h | 3 +++ src/util/gnunet-resolver.c | 3 +++ src/util/gnunet-scrypt.c | 3 +++ src/util/gnunet-service-resolver.c | 3 +++ src/util/gnunet-uri.c | 3 +++ src/util/helper.c | 3 +++ src/util/load.c | 3 +++ src/util/mq.c | 3 +++ src/util/mst.c | 3 +++ src/util/nc.c | 3 +++ src/util/network.c | 3 +++ src/util/op.c | 3 +++ src/util/os_installation.c | 3 +++ src/util/os_network.c | 3 +++ src/util/os_priority.c | 3 +++ src/util/peer.c | 3 +++ src/util/perf_crypto_asymmetric.c | 3 +++ src/util/perf_crypto_ecc_dlog.c | 3 +++ src/util/perf_crypto_hash.c | 3 +++ src/util/perf_crypto_paillier.c | 3 +++ src/util/perf_crypto_rsa.c | 3 +++ src/util/perf_crypto_symmetric.c | 3 +++ src/util/perf_malloc.c | 3 +++ src/util/plugin.c | 3 +++ src/util/program.c | 3 +++ src/util/resolver.h | 3 +++ src/util/resolver_api.c | 3 +++ src/util/scheduler.c | 3 +++ src/util/service.c | 3 +++ src/util/signal.c | 3 +++ src/util/socks.c | 3 +++ src/util/speedup.c | 3 +++ src/util/speedup.h | 3 +++ src/util/strings.c | 3 +++ src/util/test_bio.c | 3 +++ src/util/test_client.c | 3 +++ src/util/test_common_allocation.c | 3 +++ src/util/test_common_endian.c | 3 +++ src/util/test_common_logging.c | 3 +++ src/util/test_common_logging_dummy.c | 3 +++ src/util/test_common_logging_runtime_loglevels.c | 3 +++ src/util/test_configuration.c | 3 +++ src/util/test_container_bloomfilter.c | 3 +++ src/util/test_container_dll.c | 3 +++ src/util/test_container_heap.c | 3 +++ src/util/test_container_meta_data.c | 3 +++ src/util/test_container_multihashmap.c | 3 +++ src/util/test_container_multihashmap32.c | 3 +++ src/util/test_container_multipeermap.c | 3 +++ src/util/test_crypto_crc.c | 3 +++ src/util/test_crypto_ecc_dlog.c | 3 +++ src/util/test_crypto_ecdh_eddsa.c | 3 +++ src/util/test_crypto_ecdhe.c | 3 +++ src/util/test_crypto_ecdsa.c | 3 +++ src/util/test_crypto_eddsa.c | 3 +++ src/util/test_crypto_hash.c | 3 +++ src/util/test_crypto_hash_context.c | 3 +++ src/util/test_crypto_paillier.c | 3 +++ src/util/test_crypto_random.c | 3 +++ src/util/test_crypto_rsa.c | 3 +++ src/util/test_crypto_symmetric.c | 3 +++ src/util/test_disk.c | 3 +++ src/util/test_getopt.c | 3 +++ src/util/test_mq.c | 3 +++ src/util/test_os_network.c | 3 +++ src/util/test_os_start_process.c | 3 +++ src/util/test_peer.c | 3 +++ src/util/test_plugin.c | 3 +++ src/util/test_plugin_plug.c | 3 +++ src/util/test_program.c | 3 +++ src/util/test_resolver_api.c | 3 +++ src/util/test_scheduler.c | 3 +++ src/util/test_scheduler_delay.c | 3 +++ src/util/test_service.c | 3 +++ src/util/test_socks.c | 3 +++ src/util/test_speedup.c | 3 +++ src/util/test_strings.c | 3 +++ src/util/test_strings_to_data.c | 3 +++ src/util/test_time.c | 3 +++ src/util/time.c | 3 +++ src/util/win.c | 3 +++ src/util/winproc.c | 3 +++ src/vpn/gnunet-helper-vpn-windows.c | 3 +++ src/vpn/gnunet-helper-vpn.c | 3 +++ src/vpn/gnunet-service-vpn.c | 3 +++ src/vpn/gnunet-vpn.c | 3 +++ src/vpn/vpn.h | 3 +++ src/vpn/vpn_api.c | 3 +++ src/zonemaster/gnunet-service-zonemaster-monitor.c | 3 +++ src/zonemaster/gnunet-service-zonemaster.c | 3 +++ 1063 files changed, 3188 insertions(+) diff --git a/configure.ac b/configure.ac index b019813ea7..d031b9998a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. # +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# # # Process this file with autoconf to produce a configure script. # diff --git a/contrib/scripts/afferify b/contrib/scripts/afferify index 7bd7dbd9f7..2fa607e1a6 100755 --- a/contrib/scripts/afferify +++ b/contrib/scripts/afferify @@ -82,6 +82,8 @@ if (0) { print STDERR "\nTrying $name\t"; # There was a mistake in the replacement text! return unless s#under the terms of the GNU General Public License as published#under the terms of the GNU Affero General Public License as published#; + # Don't apply this one twice! +# return unless s#(\n\W*)(\s+)(Affero General Public License for more details\.)#\1\2\3\1\1\2You should have received a copy of the GNU Affero General Public License\1\2along with this program. If not, see .#; print STDERR "FIXED"; } diff --git a/contrib/scripts/documentation/gnunet-doc.scm b/contrib/scripts/documentation/gnunet-doc.scm index 2c0509dc38..4ae23b298d 100644 --- a/contrib/scripts/documentation/gnunet-doc.scm +++ b/contrib/scripts/documentation/gnunet-doc.scm @@ -11,6 +11,9 @@ ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; Affero General Public License for more details. ;;; +;;; You should have received a copy of the GNU Affero General Public License +;;; along with this program. If not, see . +;;; (use-modules (ice-9 popen) diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index 02de2f7361..cabaef6c40 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in @@ -12,6 +12,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. # +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# # File: gnunet-chk.py # Brief: Computes GNUNET style Content Hash Key for a given file # Author: Sree Harsha Totakura diff --git a/contrib/scripts/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index 8a891f0dc8..cbe96a8ebe 100644 --- a/contrib/scripts/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Finds any gnunet processes still running in the system and kills them # diff --git a/contrib/scripts/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index 8908ca6a88..f155db5be6 100644 --- a/contrib/scripts/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for gnunet-peerinfo from __future__ import print_function diff --git a/contrib/scripts/terminate.py.in b/contrib/scripts/terminate.py.in index f3cfb23f5b..30f5dc97f1 100644 --- a/contrib/scripts/terminate.py.in +++ b/contrib/scripts/terminate.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Utility module that implements safe process termination for W32. # For other platforms it's equivalent to Popen.kill () diff --git a/contrib/test_gnunet_prefix.c b/contrib/test_gnunet_prefix.c index 5d85912360..4614ee9e2c 100644 --- a/contrib/test_gnunet_prefix.c +++ b/contrib/test_gnunet_prefix.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/contrib/timeout_watchdog.c b/contrib/timeout_watchdog.c index f8ec459bd9..70e840d555 100644 --- a/contrib/timeout_watchdog.c +++ b/contrib/timeout_watchdog.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/contrib/timeout_watchdog_w32.c b/contrib/timeout_watchdog_w32.c index 0c27388a24..901eb62075 100644 --- a/contrib/timeout_watchdog_w32.c +++ b/contrib/timeout_watchdog_w32.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/guix-env.scm b/guix-env.scm index 362c63830b..16fdc7528f 100644 --- a/guix-env.scm +++ b/guix-env.scm @@ -10,6 +10,9 @@ ;;; WITHOUT ANY WARRANTY; without even the implied warranty of ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;;; Affero General Public License for more details. +;;; +;;; You should have received a copy of the GNU Affero General Public License +;;; along with this program. If not, see . (use-modules (ice-9 popen) diff --git a/src/abe/abe.c b/src/abe/abe.c index 2405afb2d3..be9e95bee8 100644 --- a/src/abe/abe.c +++ b/src/abe/abe.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/abe/test_cpabe.c b/src/abe/test_cpabe.c index 90847b0e6a..7b433c4749 100644 --- a/src/abe/test_cpabe.c +++ b/src/abe/test_cpabe.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/arm.h b/src/arm/arm.h index fb7649adbd..251ec58e7c 100644 --- a/src/arm/arm.h +++ b/src/arm/arm.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index a8ff49609a..5e31e038e0 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c index 0f52eea5c9..fbc59a5b13 100644 --- a/src/arm/arm_monitor_api.c +++ b/src/arm/arm_monitor_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 97eea62492..e8180e9209 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index a4440f7cb8..6924ca6763 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/arm/mockup-service.c b/src/arm/mockup-service.c index 7d8734aa5a..2d9b1f72f2 100644 --- a/src/arm/mockup-service.c +++ b/src/arm/mockup-service.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #include diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c index c8733bbf9b..05c3a8a4e5 100644 --- a/src/arm/test_arm_api.c +++ b/src/arm/test_arm_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file arm/test_arm_api.c diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index b9adb64cfd..4a7d51bc79 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file arm/test_exponential_backoff.c diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c index 6e52b2807c..8b6d09bd9a 100644 --- a/src/arm/test_gnunet_service_arm.c +++ b/src/arm/test_gnunet_service_arm.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file arm/test_gnunet_service_arm.c diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c index 5614d1be5b..05ee833733 100644 --- a/src/ats-tests/ats-testing-experiment.c +++ b/src/ats-tests/ats-testing-experiment.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index b5e5c7a7b3..3d409d53ad 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-log.c diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index da5133141b..fa119d7c7b 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-preferences.c diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index b46dc9fecc..f52ed4a2f2 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-traffic.c diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 636368431f..058e29cded 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing.c diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index 6278a75666..123ada03d9 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing.h diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index e31457cb80..98a4338730 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/gnunet-ats-sim.c diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c index cdf3d6c158..381f0f4311 100644 --- a/src/ats-tests/gnunet-solver-eval.c +++ b/src/ats-tests/gnunet-solver-eval.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats-tests/perf_ats.c b/src/ats-tests/perf_ats.c index 1a73549332..85b57ddb97 100644 --- a/src/ats-tests/perf_ats.c +++ b/src/ats-tests/perf_ats.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/perf_ats.c diff --git a/src/ats-tests/perf_ats.h b/src/ats-tests/perf_ats.h index ed6b3faa62..1d1dfd73fa 100644 --- a/src/ats-tests/perf_ats.h +++ b/src/ats-tests/perf_ats.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/perf_ats.c diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c index 113fcba3ec..c7ac9383dd 100644 --- a/src/ats-tests/perf_ats_logging.c +++ b/src/ats-tests/perf_ats_logging.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/perf_ats_logging.c diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index 07bf955aeb..2db0a47d99 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/ats.h b/src/ats/ats.h index 56db03f10f..09542f240c 100644 --- a/src/ats/ats.h +++ b/src/ats/ats.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/ats.h diff --git a/src/ats/ats_api_connectivity.c b/src/ats/ats_api_connectivity.c index 8983b10cd9..875b3021b8 100644 --- a/src/ats/ats_api_connectivity.c +++ b/src/ats/ats_api_connectivity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/ats_api_connectivity.c diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c index b8bd91cb97..caa1da0340 100644 --- a/src/ats/ats_api_performance.c +++ b/src/ats/ats_api_performance.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/ats_api_performance.c diff --git a/src/ats/ats_api_scanner.c b/src/ats/ats_api_scanner.c index 0f751b4b00..46afb46f0c 100644 --- a/src/ats/ats_api_scanner.c +++ b/src/ats/ats_api_scanner.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/ats_api_scanner.c diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index ea9ca6d55c..783b9f5961 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/ats_api_scheduling.c diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index 56fbae3355..13119dea08 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h index 80d1b27968..92693bd38e 100644 --- a/src/ats/gnunet-ats-solver-eval.h +++ b/src/ats/gnunet-ats-solver-eval.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats-tests/ats-testing-experiment.c diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c index 3632e3426c..f8bd6adec4 100644 --- a/src/ats/gnunet-service-ats.c +++ b/src/ats/gnunet-service-ats.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats.c diff --git a/src/ats/gnunet-service-ats.h b/src/ats/gnunet-service-ats.h index e6e440a29e..90916fbd55 100644 --- a/src/ats/gnunet-service-ats.h +++ b/src/ats/gnunet-service-ats.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 51ba489327..55fa226819 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index eec1f1b349..d90ca1375f 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c index 763f94c64c..6719a92b2c 100644 --- a/src/ats/gnunet-service-ats_connectivity.c +++ b/src/ats/gnunet-service-ats_connectivity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_connectivity.h b/src/ats/gnunet-service-ats_connectivity.h index b70eb9ed4a..2a9a944779 100644 --- a/src/ats/gnunet-service-ats_connectivity.h +++ b/src/ats/gnunet-service-ats_connectivity.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats_connectivity.h diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c index 1cb7bfc058..e70be018e0 100644 --- a/src/ats/gnunet-service-ats_normalization.c +++ b/src/ats/gnunet-service-ats_normalization.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h index c404a3279b..36debebb3e 100644 --- a/src/ats/gnunet-service-ats_normalization.h +++ b/src/ats/gnunet-service-ats_normalization.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 24073c2c90..92a9aca6d7 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats_performance.c diff --git a/src/ats/gnunet-service-ats_performance.h b/src/ats/gnunet-service-ats_performance.h index 6c8b7e58bf..4fe4f68b71 100644 --- a/src/ats/gnunet-service-ats_performance.h +++ b/src/ats/gnunet-service-ats_performance.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index 632b19cd6f..4b998b982f 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h index b9de7ad47c..00fb910cc5 100644 --- a/src/ats/gnunet-service-ats_plugins.h +++ b/src/ats/gnunet-service-ats_plugins.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c index b68dccd6e6..e1a7863592 100644 --- a/src/ats/gnunet-service-ats_preferences.c +++ b/src/ats/gnunet-service-ats_preferences.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats_preferences.c diff --git a/src/ats/gnunet-service-ats_preferences.h b/src/ats/gnunet-service-ats_preferences.h index ef5262b201..4857e0a0a5 100644 --- a/src/ats/gnunet-service-ats_preferences.h +++ b/src/ats/gnunet-service-ats_preferences.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats_preferences.h diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 8ad093a8e3..a272170b70 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/gnunet-service-ats_reservations.c diff --git a/src/ats/gnunet-service-ats_reservations.h b/src/ats/gnunet-service-ats_reservations.h index 327aef6cce..7ffe5ed631 100644 --- a/src/ats/gnunet-service-ats_reservations.h +++ b/src/ats/gnunet-service-ats_reservations.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index e056e1ea2a..0a1ad99cdc 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/gnunet-service-ats_scheduling.h b/src/ats/gnunet-service-ats_scheduling.h index c89d5ffea0..73f35d21ed 100644 --- a/src/ats/gnunet-service-ats_scheduling.h +++ b/src/ats/gnunet-service-ats_scheduling.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c index ec11a61bb1..c2885bbefd 100644 --- a/src/ats/perf_ats_solver.c +++ b/src/ats/perf_ats_solver.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/perf_ats_solver.c diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c index 0b9cf8c15b..7e7594f909 100644 --- a/src/ats/plugin_ats_mlp.c +++ b/src/ats/plugin_ats_mlp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c index 4fe9a49a4d..b4ca70dc79 100644 --- a/src/ats/plugin_ats_proportional.c +++ b/src/ats/plugin_ats_proportional.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/plugin_ats_proportional.c diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c index 4a17d31bdc..204852085c 100644 --- a/src/ats/plugin_ats_ril.c +++ b/src/ats/plugin_ats_ril.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/ats/test_ats_api.c b/src/ats/test_ats_api.c index 925d3528fe..b449e5066c 100644 --- a/src/ats/test_ats_api.c +++ b/src/ats/test_ats_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/test_ats_api.c diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index 316ae608c4..c9f88a6606 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/test_ats_lib.c diff --git a/src/ats/test_ats_lib.h b/src/ats/test_ats_lib.h index a8e2f3ab26..15b3dec1e5 100644 --- a/src/ats/test_ats_lib.h +++ b/src/ats/test_ats_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/test_ats_lib.h diff --git a/src/ats/test_ats_reservation_api.c b/src/ats/test_ats_reservation_api.c index 73e0ba5fd2..19028cb3c7 100644 --- a/src/ats/test_ats_reservation_api.c +++ b/src/ats/test_ats_reservation_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file ats/test_ats_reservation_api.c diff --git a/src/auction/auction.h b/src/auction/auction.h index 337f944dbd..1d21855a87 100644 --- a/src/auction/auction.h +++ b/src/auction/auction.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/auction/gnunet-auction-create.c b/src/auction/gnunet-auction-create.c index 6e46c35ab2..e5d48fe9ed 100644 --- a/src/auction/gnunet-auction-create.c +++ b/src/auction/gnunet-auction-create.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/auction/gnunet-auction-info.c b/src/auction/gnunet-auction-info.c index 4378bc710f..0fa34a31a1 100644 --- a/src/auction/gnunet-auction-info.c +++ b/src/auction/gnunet-auction-info.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/auction/gnunet-auction-join.c b/src/auction/gnunet-auction-join.c index 4378bc710f..0fa34a31a1 100644 --- a/src/auction/gnunet-auction-join.c +++ b/src/auction/gnunet-auction-join.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c index 025de267d9..17a72d95e0 100644 --- a/src/auction/gnunet-service-auction.c +++ b/src/auction/gnunet-service-auction.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/auction/test_auction_api.c b/src/auction/test_auction_api.c index 84eb9a1bf7..7451258849 100644 --- a/src/auction/test_auction_api.c +++ b/src/auction/test_auction_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file auction/test_auction_api.c diff --git a/src/block/bg_bf.c b/src/block/bg_bf.c index 225c95d7ae..0fde5aa5be 100644 --- a/src/block/bg_bf.c +++ b/src/block/bg_bf.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file block/bg_bf.c diff --git a/src/block/block.c b/src/block/block.c index 3053c6cf93..f669ed9e32 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c index 9cffdbfa1e..5817f69f3d 100644 --- a/src/block/plugin_block_template.c +++ b/src/block/plugin_block_template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/block/plugin_block_test.c b/src/block/plugin_block_test.c index f1f338c223..f3d4e9dd84 100644 --- a/src/block/plugin_block_test.c +++ b/src/block/plugin_block_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h index a3eb8fd768..69be4e537b 100644 --- a/src/cadet/cadet.h +++ b/src/cadet/cadet.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index eef0d95ff6..91054cd4f0 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/cadet_api.c diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h index 6b8a033ea2..4b4cfbf526 100644 --- a/src/cadet/cadet_protocol.h +++ b/src/cadet/cadet_protocol.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/cadet_test_lib.c b/src/cadet/cadet_test_lib.c index 0bc9bbfaad..760378c895 100644 --- a/src/cadet/cadet_test_lib.c +++ b/src/cadet/cadet_test_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/cadet_test_lib.c diff --git a/src/cadet/cadet_test_lib.h b/src/cadet/cadet_test_lib.h index 29724e1374..3a43d3dedb 100644 --- a/src/cadet/cadet_test_lib.h +++ b/src/cadet/cadet_test_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/cadet_test_lib.h diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c index 6f21790572..784ee662ac 100644 --- a/src/cadet/gnunet-cadet-profiler.c +++ b/src/cadet/gnunet-cadet-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-cadet-profiler.c diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 13e27aecda..0cabb86e91 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index 1f91e77e91..668b4ddb5c 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h index e7a8f2168f..5587755d18 100644 --- a/src/cadet/gnunet-service-cadet.h +++ b/src/cadet/gnunet-service-cadet.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index c10c07e818..06711dc8b3 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-service-cadet_channel.c diff --git a/src/cadet/gnunet-service-cadet_channel.h b/src/cadet/gnunet-service-cadet_channel.h index cd46cc73a7..b9d09b8d19 100644 --- a/src/cadet/gnunet-service-cadet_channel.h +++ b/src/cadet/gnunet-service-cadet_channel.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 919b769460..b4f1d37342 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_connection.h b/src/cadet/gnunet-service-cadet_connection.h index 91f42f0d76..fe59ebb772 100644 --- a/src/cadet/gnunet-service-cadet_connection.h +++ b/src/cadet/gnunet-service-cadet_connection.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index ec1cc72490..64c86d7d49 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_core.h b/src/cadet/gnunet-service-cadet_core.h index db56903adf..b528961b03 100644 --- a/src/cadet/gnunet-service-cadet_core.h +++ b/src/cadet/gnunet-service-cadet_core.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c index 0f215d99e0..b4fed66c0c 100644 --- a/src/cadet/gnunet-service-cadet_dht.c +++ b/src/cadet/gnunet-service-cadet_dht.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-service-cadet_dht.c diff --git a/src/cadet/gnunet-service-cadet_dht.h b/src/cadet/gnunet-service-cadet_dht.h index 5f798bff6a..7fe1f0c0b4 100644 --- a/src/cadet/gnunet-service-cadet_dht.h +++ b/src/cadet/gnunet-service-cadet_dht.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c index 55984a34b2..61686e5dac 100644 --- a/src/cadet/gnunet-service-cadet_hello.c +++ b/src/cadet/gnunet-service-cadet_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-service-cadet_hello.c diff --git a/src/cadet/gnunet-service-cadet_hello.h b/src/cadet/gnunet-service-cadet_hello.h index d09ea5f57b..be7fdf1cea 100644 --- a/src/cadet/gnunet-service-cadet_hello.h +++ b/src/cadet/gnunet-service-cadet_hello.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c index 05f0569047..e77d54e553 100644 --- a/src/cadet/gnunet-service-cadet_paths.c +++ b/src/cadet/gnunet-service-cadet_paths.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-service-cadet_paths.c diff --git a/src/cadet/gnunet-service-cadet_paths.h b/src/cadet/gnunet-service-cadet_paths.h index 2a64839d18..2625253fbe 100644 --- a/src/cadet/gnunet-service-cadet_paths.h +++ b/src/cadet/gnunet-service-cadet_paths.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index 64b6009df4..9cd1f5229f 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_peer.h b/src/cadet/gnunet-service-cadet_peer.h index 630477f252..2357a293d6 100644 --- a/src/cadet/gnunet-service-cadet_peer.h +++ b/src/cadet/gnunet-service-cadet_peer.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 79bd28d333..1e7a8e0862 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/gnunet-service-cadet_tunnels.c diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h index a87f5230d5..492eb6d24b 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.h +++ b/src/cadet/gnunet-service-cadet_tunnels.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c index 1fe7882920..5187bc5042 100644 --- a/src/cadet/test_cadet.c +++ b/src/cadet/test_cadet.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/test_cadet.c diff --git a/src/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c index 46d07e2c67..4645ea8405 100644 --- a/src/cadet/test_cadet_flow.c +++ b/src/cadet/test_cadet_flow.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file cadet/test_cadet_flow.c diff --git a/src/cadet/test_cadet_local_mq.c b/src/cadet/test_cadet_local_mq.c index 9524e8a2e1..2e9cfa918a 100644 --- a/src/cadet/test_cadet_local_mq.c +++ b/src/cadet/test_cadet_local_mq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/consensus-simulation.py.in b/src/consensus/consensus-simulation.py.in index 0e8057073b..3ce44cd91a 100644 --- a/src/consensus/consensus-simulation.py.in +++ b/src/consensus/consensus-simulation.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . from __future__ import absolute_import from __future__ import print_function diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index c6feb30ba8..19bf3e8ad6 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index f642443929..3f0087b0f2 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/consensus_protocol.h b/src/consensus/consensus_protocol.h index c3c7338b27..68505eb281 100644 --- a/src/consensus/consensus_protocol.h +++ b/src/consensus/consensus_protocol.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c index 5d75dc9f0b..4928f04b41 100644 --- a/src/consensus/gnunet-consensus-profiler.c +++ b/src/consensus/gnunet-consensus-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index da285c540a..86d056aafd 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/plugin_block_consensus.c b/src/consensus/plugin_block_consensus.c index 8a53055519..a1cbaa35fa 100644 --- a/src/consensus/plugin_block_consensus.c +++ b/src/consensus/plugin_block_consensus.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/consensus/test_consensus_api.c b/src/consensus/test_consensus_api.c index 23d5931269..9c257f2e93 100644 --- a/src/consensus/test_consensus_api.c +++ b/src/consensus/test_consensus_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h index b9b1426b67..0a71fd723e 100644 --- a/src/conversation/conversation.h +++ b/src/conversation/conversation.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 59f01add31..b7f1af0cfd 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 761669abe4..dee4a60956 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index cbc5d0aa57..2c9ed715bc 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 52f981e961..92a435d55f 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-conversation.c diff --git a/src/conversation/gnunet-helper-audio-playback-gst.c b/src/conversation/gnunet-helper-audio-playback-gst.c index 9b672855c1..b3656417e9 100644 --- a/src/conversation/gnunet-helper-audio-playback-gst.c +++ b/src/conversation/gnunet-helper-audio-playback-gst.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-helper-audio-playback-gst.c diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index c8529b4657..093b08ec30 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-helper-audio-playback.c diff --git a/src/conversation/gnunet-helper-audio-record-gst.c b/src/conversation/gnunet-helper-audio-record-gst.c index 610a777471..fbba7da393 100644 --- a/src/conversation/gnunet-helper-audio-record-gst.c +++ b/src/conversation/gnunet-helper-audio-record-gst.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-helper-audio-record-gst.c diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 5e1ebb5654..89800faa2e 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-helper-audio-record.c diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 15f9881da4..fb9eec26eb 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet-service-conversation.c diff --git a/src/conversation/gnunet_gst.c b/src/conversation/gnunet_gst.c index 47be6524d3..279c5522b3 100644 --- a/src/conversation/gnunet_gst.c +++ b/src/conversation/gnunet_gst.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet_gst.c diff --git a/src/conversation/gnunet_gst.h b/src/conversation/gnunet_gst.h index 5662017f1a..69ac0933c8 100644 --- a/src/conversation/gnunet_gst.h +++ b/src/conversation/gnunet_gst.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet_gst.c diff --git a/src/conversation/gnunet_gst_def.h b/src/conversation/gnunet_gst_def.h index caf80ef89a..225bb2dc56 100644 --- a/src/conversation/gnunet_gst_def.h +++ b/src/conversation/gnunet_gst_def.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet_gst_def.h diff --git a/src/conversation/gnunet_gst_test.c b/src/conversation/gnunet_gst_test.c index be85efe288..46073ebe3b 100644 --- a/src/conversation/gnunet_gst_test.c +++ b/src/conversation/gnunet_gst_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/gnunet_gst_test.c diff --git a/src/conversation/microphone.c b/src/conversation/microphone.c index d99253d909..7df4362179 100644 --- a/src/conversation/microphone.c +++ b/src/conversation/microphone.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index dd2307bcb8..1825c6d4b2 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c index 5c217e74dd..7f336d632b 100644 --- a/src/conversation/speaker.c +++ b/src/conversation/speaker.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index 89f057dabb..f96a6e79f9 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/test_conversation_api.c diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c index a447f34c62..301574c2fc 100644 --- a/src/conversation/test_conversation_api_reject.c +++ b/src/conversation/test_conversation_api_reject.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/test_conversation_api_reject.c diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index bd65babcb7..499eaba88a 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file conversation/test_conversation_api_twocalls.c diff --git a/src/core/core.h b/src/core/core.h index 06e8729d2f..a2c05d4af6 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/core_api.c b/src/core/core_api.c index 3f0ae51a93..d9e98303d3 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file core/core_api.c diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index 4a5d3e170d..d9b59c71a1 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c index 504d7ec472..a6d7def835 100644 --- a/src/core/gnunet-core.c +++ b/src/core/gnunet-core.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index eb78902be4..0afc75addc 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core.h b/src/core/gnunet-service-core.h index 273511b49a..81e73ec398 100644 --- a/src/core/gnunet-service-core.h +++ b/src/core/gnunet-service-core.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index c399897663..6e713cf619 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_kx.h b/src/core/gnunet-service-core_kx.h index bf5ee121c6..2ffdf339bd 100644 --- a/src/core/gnunet-service-core_kx.h +++ b/src/core/gnunet-service-core_kx.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 92a91d10e3..41fe4dfb79 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_sessions.h b/src/core/gnunet-service-core_sessions.h index ca903d8a61..845edac69d 100644 --- a/src/core/gnunet-service-core_sessions.h +++ b/src/core/gnunet-service-core_sessions.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c index 6980a36a9d..3b4512f234 100644 --- a/src/core/gnunet-service-core_typemap.c +++ b/src/core/gnunet-service-core_typemap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/gnunet-service-core_typemap.h b/src/core/gnunet-service-core_typemap.h index 009349a2f4..bf164cdea1 100644 --- a/src/core/gnunet-service-core_typemap.h +++ b/src/core/gnunet-service-core_typemap.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 136adf9030..67af9fb99a 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file core/test_core_api.c diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index e2aa72af4d..4cc5b4bcda 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file core/test_core_api_reliability.c diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 55dbf35793..a1e61fcb7b 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index 156f72b155..2f6110b5bc 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_core_api_start_only.c diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 88bcb9c185..a15105556a 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file core/test_core_quota_compliance.c diff --git a/src/credential/credential.h b/src/credential/credential.h index 46f8360336..dbb73d3f62 100644 --- a/src/credential/credential.h +++ b/src/credential/credential.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file credential/credential.h diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c index d7692cb9ba..0c4105085a 100644 --- a/src/credential/credential_api.c +++ b/src/credential/credential_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file credential/credential_api.c diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c index ad52837819..ce22e8d17b 100644 --- a/src/credential/credential_misc.c +++ b/src/credential/credential_misc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/credential/credential_misc.h b/src/credential/credential_misc.h index 42db70f39c..236e8913dc 100644 --- a/src/credential/credential_misc.h +++ b/src/credential/credential_misc.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file credential/credential_misc.h diff --git a/src/credential/credential_serialization.c b/src/credential/credential_serialization.c index fcd9c8a843..fc5ef43048 100644 --- a/src/credential/credential_serialization.c +++ b/src/credential/credential_serialization.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/credential/credential_serialization.h b/src/credential/credential_serialization.h index 1a2a6baf0f..15dc819675 100644 --- a/src/credential/credential_serialization.h +++ b/src/credential/credential_serialization.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/credential/gnunet-credential.c b/src/credential/gnunet-credential.c index c0d8b1f52b..0f4fdbd779 100644 --- a/src/credential/gnunet-credential.c +++ b/src/credential/gnunet-credential.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-credential.c diff --git a/src/credential/gnunet-service-credential.c b/src/credential/gnunet-service-credential.c index 14c91b462c..a6468c47ef 100644 --- a/src/credential/gnunet-service-credential.c +++ b/src/credential/gnunet-service-credential.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file credential/gnunet-service-credential.c diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c index 757534e7a2..72f174fca8 100644 --- a/src/credential/plugin_gnsrecord_credential.c +++ b/src/credential/plugin_gnsrecord_credential.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/credential/plugin_rest_credential.c b/src/credential/plugin_rest_credential.c index be2f577158..253378dfc7 100644 --- a/src/credential/plugin_rest_credential.c +++ b/src/credential/plugin_rest_credential.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/curl/curl.c b/src/curl/curl.c index 5a9a925a23..2d0b09d92d 100644 --- a/src/curl/curl.c +++ b/src/curl/curl.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file curl/curl.c diff --git a/src/curl/curl_reschedule.c b/src/curl/curl_reschedule.c index 71e65ff932..ddf27fbd72 100644 --- a/src/curl/curl_reschedule.c +++ b/src/curl/curl_reschedule.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file curl/curl_reschedule.c diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 9bd754c1f2..2a83e07a72 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file datacache/datacache.c diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index f412f1db98..7f699f2af4 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datacache/perf_datacache.c diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index aeb0101633..2a08fc81b2 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 1f9b0a5541..6eeeb5873d 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index b4dd7390fd..4684e514c7 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index fba9a20b30..25f5957d81 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index f6d5979d7d..12edb62f80 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datacache/test_datacache.c diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index 5a61dae2f2..3d02a7244b 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datacache/test_datacache_quota.c diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h index 627afb4e6a..5ce2fef458 100644 --- a/src/datastore/datastore.h +++ b/src/datastore/datastore.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index c6c4473263..00258d7f9a 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/gnunet-datastore.c b/src/datastore/gnunet-datastore.c index d3a080b497..1c86cb096c 100644 --- a/src/datastore/gnunet-datastore.c +++ b/src/datastore/gnunet-datastore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 127cb235c4..58f839efdf 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index ef86598acb..f659dedfff 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datastore/perf_datastore_api.c diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c index 69174072e7..151a3d8457 100644 --- a/src/datastore/perf_plugin_datastore.c +++ b/src/datastore/perf_plugin_datastore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file perf_plugin_datastore.c diff --git a/src/datastore/plugin_datastore_heap.c b/src/datastore/plugin_datastore_heap.c index 142a1f7e9f..a45bd84b1c 100644 --- a/src/datastore/plugin_datastore_heap.c +++ b/src/datastore/plugin_datastore_heap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c index 766f4ac1a2..b09fd1af35 100644 --- a/src/datastore/plugin_datastore_mysql.c +++ b/src/datastore/plugin_datastore_mysql.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c index 1526772a5f..d5b1f70bd7 100644 --- a/src/datastore/plugin_datastore_postgres.c +++ b/src/datastore/plugin_datastore_postgres.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c index ea43d03d46..80960c676c 100644 --- a/src/datastore/plugin_datastore_sqlite.c +++ b/src/datastore/plugin_datastore_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c index ca36983bbb..40f248e5d3 100644 --- a/src/datastore/plugin_datastore_template.c +++ b/src/datastore/plugin_datastore_template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 123f86f4f6..ad13ecd02c 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datastore/test_datastore_api.c diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index 2d1229d024..e44fbfa05c 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file datastore/test_datastore_api_management.c diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index 2f79b88928..150b4ecc5d 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file test_plugin_datastore.c diff --git a/src/dht/dht.h b/src/dht/dht.h index 35a59ab7f4..35d9e7cdb0 100644 --- a/src/dht/dht.h +++ b/src/dht/dht.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index b8624f99c0..ec5da3b0a3 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/dht_test_lib.c b/src/dht/dht_test_lib.c index 20b4b49178..f9bd2c9e3c 100644 --- a/src/dht/dht_test_lib.c +++ b/src/dht/dht_test_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/dht_test_lib.c diff --git a/src/dht/dht_test_lib.h b/src/dht/dht_test_lib.h index 3676192110..2bdcf0158f 100644 --- a/src/dht/dht_test_lib.h +++ b/src/dht/dht_test_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/dht_test_lib.h diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c index 7b8b1141f5..3742ed739a 100644 --- a/src/dht/gnunet-dht-get.c +++ b/src/dht/gnunet-dht-get.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/gnunet-dht-get.c diff --git a/src/dht/gnunet-dht-monitor.c b/src/dht/gnunet-dht-monitor.c index a71a1184e6..b08521c7be 100644 --- a/src/dht/gnunet-dht-monitor.c +++ b/src/dht/gnunet-dht-monitor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/gnunet-dht-monitor.c diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c index 384c01c6e5..fd784871d3 100644 --- a/src/dht/gnunet-dht-put.c +++ b/src/dht/gnunet-dht-put.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/gnunet-dht-put.c diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index e95a8755ab..f9d705873d 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht.h b/src/dht/gnunet-service-dht.h index 7f59670ac1..fa5aa7a555 100644 --- a/src/dht/gnunet-service-dht.h +++ b/src/dht/gnunet-service-dht.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 547ec2e1dc..862654c837 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 280cbf7c8d..1f01387ff8 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/gnunet-service-dht_datacache.c diff --git a/src/dht/gnunet-service-dht_datacache.h b/src/dht/gnunet-service-dht_datacache.h index 62b99a1121..6f65982a56 100644 --- a/src/dht/gnunet-service-dht_datacache.h +++ b/src/dht/gnunet-service-dht_datacache.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c index 9ad73c878a..142d44bccd 100644 --- a/src/dht/gnunet-service-dht_hello.c +++ b/src/dht/gnunet-service-dht_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_hello.h b/src/dht/gnunet-service-dht_hello.h index 8e8c477a53..41351da34d 100644 --- a/src/dht/gnunet-service-dht_hello.h +++ b/src/dht/gnunet-service-dht_hello.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 08d41fdc03..9c13957826 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index edfd5d0e19..fb740c7660 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_nse.c b/src/dht/gnunet-service-dht_nse.c index 2ab4e472a1..446ae2dbda 100644 --- a/src/dht/gnunet-service-dht_nse.c +++ b/src/dht/gnunet-service-dht_nse.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_nse.h b/src/dht/gnunet-service-dht_nse.h index 9683366c89..a5e259cbae 100644 --- a/src/dht/gnunet-service-dht_nse.h +++ b/src/dht/gnunet-service-dht_nse.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c index 1faee498bd..0098ce0964 100644 --- a/src/dht/gnunet-service-dht_routing.c +++ b/src/dht/gnunet-service-dht_routing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet-service-dht_routing.h b/src/dht/gnunet-service-dht_routing.h index 5175af3605..d9c0345b65 100644 --- a/src/dht/gnunet-service-dht_routing.h +++ b/src/dht/gnunet-service-dht_routing.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c index cf822386b7..75ca2a3aa0 100644 --- a/src/dht/gnunet_dht_profiler.c +++ b/src/dht/gnunet_dht_profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c index 7fbe433d81..d4b19677e1 100644 --- a/src/dht/plugin_block_dht.c +++ b/src/dht/plugin_block_dht.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 76f956fb9b..9097a0011b 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/test_dht_api.c diff --git a/src/dht/test_dht_monitor.c b/src/dht/test_dht_monitor.c index fa81009974..33467e89c9 100644 --- a/src/dht/test_dht_monitor.c +++ b/src/dht/test_dht_monitor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/test_dht_monitor.c diff --git a/src/dht/test_dht_topo.c b/src/dht/test_dht_topo.c index e0e68c6442..e09a3be676 100644 --- a/src/dht/test_dht_topo.c +++ b/src/dht/test_dht_topo.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dht/test_dht_topo.c diff --git a/src/dns/dns.h b/src/dns/dns.h index 08e1058c37..3348185651 100644 --- a/src/dns/dns.h +++ b/src/dns/dns.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c index 40eceddb1b..d7c9a7509e 100644 --- a/src/dns/dns_api.c +++ b/src/dns/dns_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c index 1f53a57cd6..32ad7c0c2a 100644 --- a/src/dns/dnsparser.c +++ b/src/dns/dnsparser.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index 3a60be8c44..969ff7beba 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dns/dnsstub.c diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index e5c2417169..c5425de298 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c index 06f580394d..3a652f880b 100644 --- a/src/dns/gnunet-dns-redirector.c +++ b/src/dns/gnunet-dns-redirector.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/gnunet-helper-dns.c b/src/dns/gnunet-helper-dns.c index a034a815ea..3ed18bb7cb 100644 --- a/src/dns/gnunet-helper-dns.c +++ b/src/dns/gnunet-helper-dns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 69008e9d9a..c191f05312 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/gnunet-zonewalk.c b/src/dns/gnunet-zonewalk.c index fc97ba37e4..c43ad1aeb7 100644 --- a/src/dns/gnunet-zonewalk.c +++ b/src/dns/gnunet-zonewalk.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/plugin_block_dns.c b/src/dns/plugin_block_dns.c index 8608cf44c6..28df356416 100644 --- a/src/dns/plugin_block_dns.c +++ b/src/dns/plugin_block_dns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dns/test_hexcoder.c b/src/dns/test_hexcoder.c index d6505ed611..441d7e2000 100644 --- a/src/dns/test_hexcoder.c +++ b/src/dns/test_hexcoder.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dv/dv.h b/src/dv/dv.h index d481846fd7..f54a77a7eb 100644 --- a/src/dv/dv.h +++ b/src/dv/dv.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dv/dv_api.c b/src/dv/dv_api.c index 2c26067188..9d73a40c1a 100644 --- a/src/dv/dv_api.c +++ b/src/dv/dv_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dv/gnunet-dv.c b/src/dv/gnunet-dv.c index 021468063b..ee60d592f0 100644 --- a/src/dv/gnunet-dv.c +++ b/src/dv/gnunet-dv.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dv/gnunet-dv.c diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 09cd47edd2..9079632521 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index 5b615312f7..6c815735e4 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c index bb66b1752d..88f68d55bf 100644 --- a/src/dv/test_transport_blacklist.c +++ b/src/dv/test_transport_blacklist.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dv/test_transport_blacklist.c diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c index fa4c7c6e15..41ff5f302c 100644 --- a/src/dv/test_transport_dv.c +++ b/src/dv/test_transport_dv.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file dv/test_transport_dv.c diff --git a/src/exit/exit.h b/src/exit/exit.h index 9d34f6c8c8..f5b5741a9e 100644 --- a/src/exit/exit.h +++ b/src/exit/exit.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index da691fad35..349f382bb1 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/exit/gnunet-helper-exit-windows.c b/src/exit/gnunet-helper-exit-windows.c index a1b7973f97..b8ea198afc 100644 --- a/src/exit/gnunet-helper-exit-windows.c +++ b/src/exit/gnunet-helper-exit-windows.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file exit/gnunet-helper-exit-windows.c diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c index 7e8e7e870c..8c8a4f3df9 100644 --- a/src/exit/gnunet-helper-exit.c +++ b/src/exit/gnunet-helper-exit.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index 1da2a30297..c1dbc3ad7e 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/fragmentation/defragmentation.c diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index 4667725de6..d8eb6e3eac 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/fragmentation/fragmentation.c diff --git a/src/fragmentation/fragmentation.h b/src/fragmentation/fragmentation.h index 5de90197e2..6ca521d95d 100644 --- a/src/fragmentation/fragmentation.h +++ b/src/fragmentation/fragmentation.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/fragmentation/fragmentation.h diff --git a/src/fragmentation/test_fragmentation.c b/src/fragmentation/test_fragmentation.c index e50afcd4a7..ec81ce9ec2 100644 --- a/src/fragmentation/test_fragmentation.c +++ b/src/fragmentation/test_fragmentation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fragmentation/test_fragmentation.c diff --git a/src/fragmentation/test_fragmentation_parallel.c b/src/fragmentation/test_fragmentation_parallel.c index d6171b9373..2aef0f97c1 100644 --- a/src/fragmentation/test_fragmentation_parallel.c +++ b/src/fragmentation/test_fragmentation_parallel.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fragmentation/test_fragmentation.c diff --git a/src/fs/fs.h b/src/fs/fs.h index 6fa66a4eaf..f176a270e4 100644 --- a/src/fs/fs.h +++ b/src/fs/fs.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c index 3bc96e5165..0857110b1c 100644 --- a/src/fs/fs_api.c +++ b/src/fs/fs_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_api.h b/src/fs/fs_api.h index 2a66816c6f..35a3c68375 100644 --- a/src/fs/fs_api.h +++ b/src/fs/fs_api.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c index e901897bfa..2693ecf228 100644 --- a/src/fs/fs_directory.c +++ b/src/fs/fs_directory.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c index 69e7e1abf2..d002bad441 100644 --- a/src/fs/fs_dirmetascan.c +++ b/src/fs/fs_dirmetascan.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index b96cab1cfd..b32e9ddde1 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/fs_download.c diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c index e9d74b9c0b..5d139812a7 100644 --- a/src/fs/fs_file_information.c +++ b/src/fs/fs_file_information.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_getopt.c b/src/fs/fs_getopt.c index dfc9068686..7b5c2991da 100644 --- a/src/fs/fs_getopt.c +++ b/src/fs/fs_getopt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c index 53ebf753dd..353f779cf6 100644 --- a/src/fs/fs_list_indexed.c +++ b/src/fs/fs_list_indexed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index f2d6aed6d6..0d23f2e6f6 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/fs_misc.c diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 10d117ccf9..130d5debaf 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 75eaef6f1c..2bb7c57504 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/fs_publish.c diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c index 9b20b0e9ff..b80ce3cf27 100644 --- a/src/fs/fs_publish_ksk.c +++ b/src/fs/fs_publish_ksk.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_publish_ublock.c b/src/fs/fs_publish_ublock.c index 5c99ed5b4f..abbc5cc258 100644 --- a/src/fs/fs_publish_ublock.c +++ b/src/fs/fs_publish_ublock.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_publish_ublock.h b/src/fs/fs_publish_ublock.h index 7eb1e74486..f38441dcc3 100644 --- a/src/fs/fs_publish_ublock.h +++ b/src/fs/fs_publish_ublock.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index b07a27794e..6324fba632 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/fs_search.c diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c index 82b8ba9f27..ac6f1ca4a0 100644 --- a/src/fs/fs_sharetree.c +++ b/src/fs/fs_sharetree.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index ec3afc40bf..f8ed3a22f0 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_test_lib.h b/src/fs/fs_test_lib.h index 4a95dcca33..705fde74c7 100644 --- a/src/fs/fs_test_lib.h +++ b/src/fs/fs_test_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c index 50b19e995b..1f391da71e 100644 --- a/src/fs/fs_tree.c +++ b/src/fs/fs_tree.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/fs_tree.c diff --git a/src/fs/fs_tree.h b/src/fs/fs_tree.h index d13fa3b745..f11f66c58b 100644 --- a/src/fs/fs_tree.h +++ b/src/fs/fs_tree.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 81e027df83..776c868e66 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 689ce8f6e6..89699be41e 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c index 0ba3e79586..a540cde0e8 100644 --- a/src/fs/gnunet-auto-share.c +++ b/src/fs/gnunet-auto-share.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-auto-share.c diff --git a/src/fs/gnunet-daemon-fsprofiler.c b/src/fs/gnunet-daemon-fsprofiler.c index e87dc32a50..7015a26b1b 100644 --- a/src/fs/gnunet-daemon-fsprofiler.c +++ b/src/fs/gnunet-daemon-fsprofiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c index 81f876fc50..a7e35be5e6 100644 --- a/src/fs/gnunet-directory.c +++ b/src/fs/gnunet-directory.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-directory.c diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c index e67c90a5cb..1b5b3dcb0e 100644 --- a/src/fs/gnunet-download.c +++ b/src/fs/gnunet-download.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-download.c diff --git a/src/fs/gnunet-fs-profiler.c b/src/fs/gnunet-fs-profiler.c index cf5fd3b801..a703292e54 100644 --- a/src/fs/gnunet-fs-profiler.c +++ b/src/fs/gnunet-fs-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-fs.c b/src/fs/gnunet-fs.c index 7fa4407fac..4dc60a9159 100644 --- a/src/fs/gnunet-fs.c +++ b/src/fs/gnunet-fs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-fs.c diff --git a/src/fs/gnunet-helper-fs-publish.c b/src/fs/gnunet-helper-fs-publish.c index 08c3928b51..cf384aa05f 100644 --- a/src/fs/gnunet-helper-fs-publish.c +++ b/src/fs/gnunet-helper-fs-publish.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c index 0b31fd35b7..999301c2fd 100644 --- a/src/fs/gnunet-publish.c +++ b/src/fs/gnunet-publish.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-publish.c diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c index f40a3c99ac..780b3c93d3 100644 --- a/src/fs/gnunet-search.c +++ b/src/fs/gnunet-search.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-search.c diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 1e3d0937ae..594896c93b 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs.h b/src/fs/gnunet-service-fs.h index ab7fade8af..63cafd4d1d 100644 --- a/src/fs/gnunet-service-fs.h +++ b/src/fs/gnunet-service-fs.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_cadet.h b/src/fs/gnunet-service-fs_cadet.h index e3ec77b9db..d6ce3de633 100644 --- a/src/fs/gnunet-service-fs_cadet.h +++ b/src/fs/gnunet-service-fs_cadet.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c index 441eb04322..3cdac35638 100644 --- a/src/fs/gnunet-service-fs_cadet_client.c +++ b/src/fs/gnunet-service-fs_cadet_client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c index af8d34e07d..15faaeef0e 100644 --- a/src/fs/gnunet-service-fs_cadet_server.c +++ b/src/fs/gnunet-service-fs_cadet_server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index b1997464ac..ed8a112c16 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-service-fs_cp.c diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h index a2e00829f7..5e98f4940a 100644 --- a/src/fs/gnunet-service-fs_cp.h +++ b/src/fs/gnunet-service-fs_cp.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_indexing.c b/src/fs/gnunet-service-fs_indexing.c index 4dc77db14c..5389cb16a4 100644 --- a/src/fs/gnunet-service-fs_indexing.c +++ b/src/fs/gnunet-service-fs_indexing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_indexing.h b/src/fs/gnunet-service-fs_indexing.h index 96a6edcffd..b91d020d67 100644 --- a/src/fs/gnunet-service-fs_indexing.h +++ b/src/fs/gnunet-service-fs_indexing.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 989f4b2973..bb428de9fa 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_pe.h b/src/fs/gnunet-service-fs_pe.h index 0da72692df..62a948bf76 100644 --- a/src/fs/gnunet-service-fs_pe.h +++ b/src/fs/gnunet-service-fs_pe.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 1d4a916ab9..8c431532fb 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_pr.h b/src/fs/gnunet-service-fs_pr.h index ed29bec5ee..83752f1b34 100644 --- a/src/fs/gnunet-service-fs_pr.h +++ b/src/fs/gnunet-service-fs_pr.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index 9302418022..169dcbc983 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_push.h b/src/fs/gnunet-service-fs_push.h index b67b216aeb..0b40d23a4e 100644 --- a/src/fs/gnunet-service-fs_push.h +++ b/src/fs/gnunet-service-fs_push.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c index 4b9aaab725..ab1024c8a7 100644 --- a/src/fs/gnunet-service-fs_put.c +++ b/src/fs/gnunet-service-fs_put.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-service-fs_put.h b/src/fs/gnunet-service-fs_put.h index 6653fbf38a..2b3b797ed1 100644 --- a/src/fs/gnunet-service-fs_put.h +++ b/src/fs/gnunet-service-fs_put.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/gnunet-unindex.c b/src/fs/gnunet-unindex.c index f19be8e0ac..c5c5f1103c 100644 --- a/src/fs/gnunet-unindex.c +++ b/src/fs/gnunet-unindex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/gnunet-unindex.c diff --git a/src/fs/perf_gnunet_service_fs_p2p.c b/src/fs/perf_gnunet_service_fs_p2p.c index dbb7346c60..5736c921b8 100644 --- a/src/fs/perf_gnunet_service_fs_p2p.c +++ b/src/fs/perf_gnunet_service_fs_p2p.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/perf_gnunet_service_fs_p2p_respect.c b/src/fs/perf_gnunet_service_fs_p2p_respect.c index c49b21b095..e1e55516e9 100644 --- a/src/fs/perf_gnunet_service_fs_p2p_respect.c +++ b/src/fs/perf_gnunet_service_fs_p2p_respect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/plugin_block_fs.c b/src/fs/plugin_block_fs.c index abef09e2de..92d30c48d0 100644 --- a/src/fs/plugin_block_fs.c +++ b/src/fs/plugin_block_fs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs.c b/src/fs/test_fs.c index 6b46d80941..47ad34f198 100644 --- a/src/fs/test_fs.c +++ b/src/fs/test_fs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c index 6a6dd7e06b..ea1cf44903 100644 --- a/src/fs/test_fs_directory.c +++ b/src/fs/test_fs_directory.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_directory.c diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 71a8e67de6..226e5a0fde 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_download_persistence.c b/src/fs/test_fs_download_persistence.c index c4a03ceeec..94405a8137 100644 --- a/src/fs/test_fs_download_persistence.c +++ b/src/fs/test_fs_download_persistence.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c index b1262c4292..4de6b5f733 100644 --- a/src/fs/test_fs_file_information.c +++ b/src/fs/test_fs_file_information.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_getopt.c b/src/fs/test_fs_getopt.c index 462ed7bf12..32f324aa7a 100644 --- a/src/fs/test_fs_getopt.c +++ b/src/fs/test_fs_getopt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_getopt.c diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c index c6a943da0b..9524801552 100644 --- a/src/fs/test_fs_list_indexed.c +++ b/src/fs/test_fs_list_indexed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c index 65db9f2fb4..5bdabe5856 100644 --- a/src/fs/test_fs_namespace.c +++ b/src/fs/test_fs_namespace.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index ba0f507c87..6945476af7 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_publish.c b/src/fs/test_fs_publish.c index 5ca89818cc..0a367f31ec 100644 --- a/src/fs/test_fs_publish.c +++ b/src/fs/test_fs_publish.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_publish.c diff --git a/src/fs/test_fs_publish_persistence.c b/src/fs/test_fs_publish_persistence.c index ef532365f4..833d4f0918 100644 --- a/src/fs/test_fs_publish_persistence.c +++ b/src/fs/test_fs_publish_persistence.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_publish_persistence.c diff --git a/src/fs/test_fs_search.c b/src/fs/test_fs_search.c index a270508119..fa5f3988b3 100644 --- a/src/fs/test_fs_search.c +++ b/src/fs/test_fs_search.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_search.c diff --git a/src/fs/test_fs_search_persistence.c b/src/fs/test_fs_search_persistence.c index 794da16d76..f26b27f77c 100644 --- a/src/fs/test_fs_search_persistence.c +++ b/src/fs/test_fs_search_persistence.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_search_persistence.c diff --git a/src/fs/test_fs_search_probes.c b/src/fs/test_fs_search_probes.c index df3b11debb..504fe2032d 100644 --- a/src/fs/test_fs_search_probes.c +++ b/src/fs/test_fs_search_probes.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_search_with_and.c b/src/fs/test_fs_search_with_and.c index 69ea561291..0427425aff 100644 --- a/src/fs/test_fs_search_with_and.c +++ b/src/fs/test_fs_search_with_and.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_search_with_and.c diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c index 4917467d8f..bbe60ee0be 100644 --- a/src/fs/test_fs_start_stop.c +++ b/src/fs/test_fs_start_stop.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_start_stop.c diff --git a/src/fs/test_fs_test_lib.c b/src/fs/test_fs_test_lib.c index 2849f9dff1..f63bf14a74 100644 --- a/src/fs/test_fs_test_lib.c +++ b/src/fs/test_fs_test_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_unindex.c b/src/fs/test_fs_unindex.c index c18b7fd0ff..f0f43edb43 100644 --- a/src/fs/test_fs_unindex.c +++ b/src/fs/test_fs_unindex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_unindex_persistence.c b/src/fs/test_fs_unindex_persistence.c index 9a6bf7e336..0a4d2e3c48 100644 --- a/src/fs/test_fs_unindex_persistence.c +++ b/src/fs/test_fs_unindex_persistence.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_fs_uri.c b/src/fs/test_fs_uri.c index 452194398c..4f6ff0096d 100644 --- a/src/fs/test_fs_uri.c +++ b/src/fs/test_fs_uri.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_fs_uri.c diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index 53dff687b1..e124621385 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for file-sharing command-line tools (indexing and unindexing) import sys diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index 0057be9019..e3a8db1410 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for file-sharing command-line tools (publish, search, download) import sys diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 25e23810fe..99850232b0 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for file-sharing command-line tools (recursive publishing & download) import sys diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index 1974f16466..61cd69e956 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_gnunet_service_fs_p2p.c b/src/fs/test_gnunet_service_fs_p2p.c index db4b12b464..376b4a45e1 100644 --- a/src/fs/test_gnunet_service_fs_p2p.c +++ b/src/fs/test_gnunet_service_fs_p2p.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/fs/test_plugin_block_fs.c b/src/fs/test_plugin_block_fs.c index 8392260f98..3eb7cb67ec 100644 --- a/src/fs/test_plugin_block_fs.c +++ b/src/fs/test_plugin_block_fs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file fs/test_plugin_block_fs.c diff --git a/src/gns/gns.h b/src/gns/gns.h index 1063ed5ff5..8a615f43e8 100644 --- a/src/gns/gns.h +++ b/src/gns/gns.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gns.h diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index 9bc629f18b..8264bf715c 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gns_api.c diff --git a/src/gns/gns_api.h b/src/gns/gns_api.h index 415afd5d3e..622e4339c2 100644 --- a/src/gns/gns_api.h +++ b/src/gns/gns_api.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gns_api.h diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c index b3a928abb1..b053aa0c1e 100644 --- a/src/gns/gns_tld_api.c +++ b/src/gns/gns_tld_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gns_tld_api.c diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index bce98a1962..5279e83a45 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index a29390cf48..e6e53d4052 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-dns2gns.c diff --git a/src/gns/gnunet-gns-benchmark.c b/src/gns/gnunet-gns-benchmark.c index 126f790c5c..6ed4dfe6cd 100644 --- a/src/gns/gnunet-gns-benchmark.c +++ b/src/gns/gnunet-gns-benchmark.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/gns/gnunet-gns-benchmark.c diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index d8930b0af5..0e3b3f0e6b 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-gns-helper-service-w32.c diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c index 02b4d30224..2b2c0ddee2 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/gns/gnunet-gns-import.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-gns.c diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 3a7b9c82af..9a405c49bd 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index df6426e35f..149c8a7bb0 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-gns.c diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 68f7ee2e17..71e7447334 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gnunet-service-gns.c diff --git a/src/gns/gnunet-service-gns.h b/src/gns/gnunet-service-gns.h index 0a0ef03889..952c7178fe 100644 --- a/src/gns/gnunet-service-gns.h +++ b/src/gns/gnunet-service-gns.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gnunet-service-gns.h diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 1c6c28d07f..ecf4d59f50 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gnunet-service-gns_interceptor.c diff --git a/src/gns/gnunet-service-gns_interceptor.h b/src/gns/gnunet-service-gns_interceptor.h index 96a56913f8..460665cf00 100644 --- a/src/gns/gnunet-service-gns_interceptor.h +++ b/src/gns/gnunet-service-gns_interceptor.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gnunet-service-gns_interceptor.h diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 1a38ed3178..a90cc4c0ed 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h index bdefb018c2..d4cbd08f86 100644 --- a/src/gns/gnunet-service-gns_resolver.h +++ b/src/gns/gnunet-service-gns_resolver.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/gnunet-service-gns_resolver.h diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c index 2947e80de7..094e25ed53 100644 --- a/src/gns/nss/nss_gns_query.c +++ b/src/gns/nss/nss_gns_query.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #include #include diff --git a/src/gns/nss/nss_gns_query.h b/src/gns/nss/nss_gns_query.h index b1439e8369..bb04f90049 100644 --- a/src/gns/nss/nss_gns_query.h +++ b/src/gns/nss/nss_gns_query.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #ifndef NSS_GNS_QUERY_H #define NSS_GNS_QUERY_H diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index 62804f0507..677bb7721e 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c index 90a2f2fd4a..c99f39616a 100644 --- a/src/gns/plugin_gnsrecord_gns.c +++ b/src/gns/plugin_gnsrecord_gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c index 069561a42c..2b729db543 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/gns/plugin_rest_gns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index ee4d19884f..4c915cabed 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gns/w32nsp-install.c b/src/gns/w32nsp-install.c index 3489fe674b..7a8beb7030 100644 --- a/src/gns/w32nsp-install.c +++ b/src/gns/w32nsp-install.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/w32nsp-install.c diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index 1650a7a009..c1178cb234 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/w32nsp-resolve.c diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index f8bbab860c..082319ffef 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gns/w32nsp.c diff --git a/src/gns/w32resolver.h b/src/gns/w32resolver.h index 378a00a38a..8649d82d45 100644 --- a/src/gns/w32resolver.h +++ b/src/gns/w32resolver.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c index 4dffd5338d..da34846e76 100644 --- a/src/gnsrecord/gnsrecord.c +++ b/src/gnsrecord/gnsrecord.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index 18f3723dad..0752086feb 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c index 2f03395371..5032647ef3 100644 --- a/src/gnsrecord/gnsrecord_misc.c +++ b/src/gnsrecord/gnsrecord_misc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/gnsrecord_serialization.c b/src/gnsrecord/gnsrecord_serialization.c index cde2dad2eb..adbf02755f 100644 --- a/src/gnsrecord/gnsrecord_serialization.c +++ b/src/gnsrecord/gnsrecord_serialization.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/perf_gnsrecord_crypto.c b/src/gnsrecord/perf_gnsrecord_crypto.c index 2e06fdac49..35547ebc2f 100644 --- a/src/gnsrecord/perf_gnsrecord_crypto.c +++ b/src/gnsrecord/perf_gnsrecord_crypto.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c index bd888a9fd4..188afcae78 100644 --- a/src/gnsrecord/plugin_gnsrecord_dns.c +++ b/src/gnsrecord/plugin_gnsrecord_dns.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/gnsrecord/test_gnsrecord_block_expiration.c b/src/gnsrecord/test_gnsrecord_block_expiration.c index a405c46399..5bb14cdbc7 100644 --- a/src/gnsrecord/test_gnsrecord_block_expiration.c +++ b/src/gnsrecord/test_gnsrecord_block_expiration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c index 773d2d987f..5a78f8b251 100644 --- a/src/gnsrecord/test_gnsrecord_crypto.c +++ b/src/gnsrecord/test_gnsrecord_crypto.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnsrecord/test_gnsrecord_crypto.c diff --git a/src/gnsrecord/test_gnsrecord_serialization.c b/src/gnsrecord/test_gnsrecord_serialization.c index 6cf67b2e28..03a4d8b03f 100644 --- a/src/gnsrecord/test_gnsrecord_serialization.c +++ b/src/gnsrecord/test_gnsrecord_serialization.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnsrecord/test_gnsrecord_serialization.c diff --git a/src/hello/address.c b/src/hello/address.c index c48699f99c..12e31f8ee7 100644 --- a/src/hello/address.c +++ b/src/hello/address.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hello/gnunet-hello.c b/src/hello/gnunet-hello.c index c2ac10129c..1766813a68 100644 --- a/src/hello/gnunet-hello.c +++ b/src/hello/gnunet-hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hello/gnunet-hello.c diff --git a/src/hello/hello.c b/src/hello/hello.c index 3819f16766..0f7ca7e499 100644 --- a/src/hello/hello.c +++ b/src/hello/hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hello/test_friend_hello.c b/src/hello/test_friend_hello.c index a29ebf152c..de652e4eb5 100644 --- a/src/hello/test_friend_hello.c +++ b/src/hello/test_friend_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hello/test_friend_hello.c diff --git a/src/hello/test_hello.c b/src/hello/test_hello.c index 439cfe4a70..04fb1f5d8f 100644 --- a/src/hello/test_hello.c +++ b/src/hello/test_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hello/test_hello.c diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index a194a8a868..31259b8295 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist.h b/src/hostlist/gnunet-daemon-hostlist.h index 1064c8c4dd..e94c9da264 100644 --- a/src/hostlist/gnunet-daemon-hostlist.h +++ b/src/hostlist/gnunet-daemon-hostlist.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c index fccbb6f268..43b4e45931 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.c +++ b/src/hostlist/gnunet-daemon-hostlist_client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hostlist/gnunet-daemon-hostlist_client.c diff --git a/src/hostlist/gnunet-daemon-hostlist_client.h b/src/hostlist/gnunet-daemon-hostlist_client.h index 8f60c01705..c7ee072a95 100644 --- a/src/hostlist/gnunet-daemon-hostlist_client.h +++ b/src/hostlist/gnunet-daemon-hostlist_client.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hostlist/gnunet-daemon-hostlist_client.h diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 4f9fd2233c..8687d6e952 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hostlist/gnunet-daemon-hostlist_server.h b/src/hostlist/gnunet-daemon-hostlist_server.h index c5b872cdc2..d30c68131a 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.h +++ b/src/hostlist/gnunet-daemon-hostlist_server.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c index 49c24809e3..c3292939fc 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist.c +++ b/src/hostlist/test_gnunet_daemon_hostlist.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hostlist/test_gnunet_daemon_hostlist.c diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index 14096d427d..e420a50220 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hostlist/test_gnunet_daemon_hostlist_learning.c diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 2b7b2e6c7d..dad55f3d3f 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file hostlist/test_gnunet_daemon_hostlist_reconnect.c diff --git a/src/identity-attribute/identity_attribute.c b/src/identity-attribute/identity_attribute.c index e9d91b2252..7d47c46a74 100644 --- a/src/identity-attribute/identity_attribute.c +++ b/src/identity-attribute/identity_attribute.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-attribute/identity_attribute.h b/src/identity-attribute/identity_attribute.h index 5de2cd8438..2346dcde1e 100644 --- a/src/identity-attribute/identity_attribute.h +++ b/src/identity-attribute/identity_attribute.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity-attribute/plugin_identity_attribute_gnuid.c b/src/identity-attribute/plugin_identity_attribute_gnuid.c index 2b814345d7..c09b167f52 100644 --- a/src/identity-attribute/plugin_identity_attribute_gnuid.c +++ b/src/identity-attribute/plugin_identity_attribute_gnuid.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-provider/gnunet-idp.c b/src/identity-provider/gnunet-idp.c index 8409b1a8d5..79e4f8d276 100644 --- a/src/identity-provider/gnunet-idp.c +++ b/src/identity-provider/gnunet-idp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index b054141f28..c53e724770 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/identity_provider.h b/src/identity-provider/identity_provider.h index 43d8c0e54a..6a4b7769fc 100644 --- a/src/identity-provider/identity_provider.h +++ b/src/identity-provider/identity_provider.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index f4e12f54d8..772b4a2444 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-provider/jwt.c b/src/identity-provider/jwt.c index 8404c25486..1a984f7b53 100644 --- a/src/identity-provider/jwt.c +++ b/src/identity-provider/jwt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/identity-provider/plugin_gnsrecord_identity_provider.c index 281a2209fe..f0dc563dcf 100644 --- a/src/identity-provider/plugin_gnsrecord_identity_provider.c +++ b/src/identity-provider/plugin_gnsrecord_identity_provider.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity-provider/plugin_identity_provider_sqlite.c b/src/identity-provider/plugin_identity_provider_sqlite.c index 735d32fa81..f2a8b7b541 100644 --- a/src/identity-provider/plugin_identity_provider_sqlite.c +++ b/src/identity-provider/plugin_identity_provider_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/identity-provider/plugin_rest_identity_provider.c index edb2de55df..a83163db29 100644 --- a/src/identity-provider/plugin_rest_identity_provider.c +++ b/src/identity-provider/plugin_rest_identity_provider.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity-provider/plugin_rest_openid_connect.c b/src/identity-provider/plugin_rest_openid_connect.c index 8e14383e27..d87a345cfa 100644 --- a/src/identity-provider/plugin_rest_openid_connect.c +++ b/src/identity-provider/plugin_rest_openid_connect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c index 1a020863fb..0c3f9fead2 100644 --- a/src/identity/gnunet-identity.c +++ b/src/identity/gnunet-identity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file identity/gnunet-identity.c diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index 844f80f0bd..6b8e218069 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity/identity.h b/src/identity/identity.h index d1f3898ff4..45b23066df 100644 --- a/src/identity/identity.h +++ b/src/identity/identity.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 46cad51f38..30a6fb23d9 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity/identity_api_lookup.c b/src/identity/identity_api_lookup.c index 6458934118..593a5dbb06 100644 --- a/src/identity/identity_api_lookup.c +++ b/src/identity/identity_api_lookup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c index e7a7cabd84..52685c52e2 100644 --- a/src/identity/plugin_rest_identity.c +++ b/src/identity/plugin_rest_identity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c index 8635f5c965..a1cb1dc6dd 100644 --- a/src/identity/test_identity.c +++ b/src/identity/test_identity.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/identity/test_identity_defaults.c b/src/identity/test_identity_defaults.c index 065f9ee430..1e91f139e4 100644 --- a/src/identity/test_identity_defaults.c +++ b/src/identity/test_identity_defaults.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/block_dns.h b/src/include/block_dns.h index 059f6fd599..f54a512327 100644 --- a/src/include/block_dns.h +++ b/src/include/block_dns.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/block_fs.h b/src/include/block_fs.h index 990889f7a5..f0034d7693 100644 --- a/src/include/block_fs.h +++ b/src/include/block_fs.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/block_regex.h b/src/include/block_regex.h index ddbfa5e09c..e0346c5c55 100644 --- a/src/include/block_regex.h +++ b/src/include/block_regex.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_abe_lib.h b/src/include/gnunet_abe_lib.h index 11e825967c..d380c9b03d 100644 --- a/src/include/gnunet_abe_lib.h +++ b/src/include/gnunet_abe_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h index 071d4c19f2..b9c5961786 100644 --- a/src/include/gnunet_applications.h +++ b/src/include/gnunet_applications.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index c82fd4ac20..c68a118b57 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_ats_plugin.h b/src/include/gnunet_ats_plugin.h index 46b169e4f8..d414d5f4cc 100644 --- a/src/include/gnunet_ats_plugin.h +++ b/src/include/gnunet_ats_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index 49a95ea932..a9fd519d4f 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file diff --git a/src/include/gnunet_bandwidth_lib.h b/src/include/gnunet_bandwidth_lib.h index 28e22e8f04..78610c48b5 100644 --- a/src/include/gnunet_bandwidth_lib.h +++ b/src/include/gnunet_bandwidth_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h index eb91f6fc09..1dd17b8890 100644 --- a/src/include/gnunet_bio_lib.h +++ b/src/include/gnunet_bio_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_block_group_lib.h b/src/include/gnunet_block_group_lib.h index f9fdbbcf0e..efeb1fe0f3 100644 --- a/src/include/gnunet_block_group_lib.h +++ b/src/include/gnunet_block_group_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 16f7cc42a3..c2b1e9e48c 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h index f9eed3caa0..4bdaec8411 100644 --- a/src/include/gnunet_block_plugin.h +++ b/src/include/gnunet_block_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_cadet_service.h b/src/include/gnunet_cadet_service.h index acd2058cef..4f35a3f1fa 100644 --- a/src/include/gnunet_cadet_service.h +++ b/src/include/gnunet_cadet_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index 14f9892505..ea52736d56 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 55eb1e8960..d30b85bfca 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index 59c640c155..e3eefa18d3 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index 41c41220eb..eee9fc23b8 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h index c8e0d50635..f35b218d91 100644 --- a/src/include/gnunet_constants.h +++ b/src/include/gnunet_constants.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index f67f4c98fe..2de65b2f1d 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index 22479ed6ec..68b92959c3 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 83304fe271..e25043d17a 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_credential_service.h b/src/include/gnunet_credential_service.h index d5d6ec1b40..bac9f408aa 100644 --- a/src/include/gnunet_credential_service.h +++ b/src/include/gnunet_credential_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 0787fdf639..0bffef2121 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h index 8c595ee34b..17e9aeea4b 100644 --- a/src/include/gnunet_curl_lib.h +++ b/src/include/gnunet_curl_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/include/gnunet_curl_lib.h diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 74e7eeee96..3e0c97254a 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index b2db15c8d3..d423c039b6 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index fd3b0fb57f..9c35a15775 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index 0dc6d843e0..0138421153 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_db_lib.h b/src/include/gnunet_db_lib.h index 87ef84dbaa..1f6a4ebfa2 100644 --- a/src/include/gnunet_db_lib.h +++ b/src/include/gnunet_db_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file include/gnunet_db_lib.h diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index 6a6a31b6bd..89e436ffbf 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index 19d4a094ac..b7376b99b0 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h index 466809eca3..ac50624f20 100644 --- a/src/include/gnunet_dns_service.h +++ b/src/include/gnunet_dns_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h index 440bd5b14b..fa4915be73 100644 --- a/src/include/gnunet_dnsparser_lib.h +++ b/src/include/gnunet_dnsparser_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h index 89895ba3b8..8f1b90425a 100644 --- a/src/include/gnunet_dnsstub_lib.h +++ b/src/include/gnunet_dnsstub_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_dv_service.h b/src/include/gnunet_dv_service.h index 49e07edbd1..aa8d6af613 100644 --- a/src/include/gnunet_dv_service.h +++ b/src/include/gnunet_dv_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_fragmentation_lib.h b/src/include/gnunet_fragmentation_lib.h index ecb2a53913..544af904b7 100644 --- a/src/include/gnunet_fragmentation_lib.h +++ b/src/include/gnunet_fragmentation_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_friends_lib.h b/src/include/gnunet_friends_lib.h index 52bc1aa4d8..038c4b4800 100644 --- a/src/include/gnunet_friends_lib.h +++ b/src/include/gnunet_friends_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 83c08220bf..2030c942ca 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h index dcf58e287d..5372170d9c 100644 --- a/src/include/gnunet_getopt_lib.h +++ b/src/include/gnunet_getopt_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h index e5d8d3a93b..13f920937f 100644 --- a/src/include/gnunet_gns_service.h +++ b/src/include/gnunet_gns_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index 40ea8d227c..b3f1eb632d 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_gnsrecord_plugin.h b/src/include/gnunet_gnsrecord_plugin.h index 191f30c3bf..6b2fd8b45a 100644 --- a/src/include/gnunet_gnsrecord_plugin.h +++ b/src/include/gnunet_gnsrecord_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h index cc8bf6a253..2a961e5242 100644 --- a/src/include/gnunet_hello_lib.h +++ b/src/include/gnunet_hello_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h index f2f451fe75..3f17706e4d 100644 --- a/src/include/gnunet_helper_lib.h +++ b/src/include/gnunet_helper_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_identity_attribute_lib.h index 0db7383443..eb01f7ac21 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_identity_attribute_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_identity_attribute_plugin.h index 370e5602dd..7c399c616d 100644 --- a/src/include/gnunet_identity_attribute_plugin.h +++ b/src/include/gnunet_identity_attribute_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_identity_provider_plugin.h index 22d1be81f1..2330066ddb 100644 --- a/src/include/gnunet_identity_provider_plugin.h +++ b/src/include/gnunet_identity_provider_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_identity_provider_service.h index 5f85d664ed..0c72556e82 100644 --- a/src/include/gnunet_identity_provider_service.h +++ b/src/include/gnunet_identity_provider_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index 4ccbf25838..ec2a7ff8e6 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h index d9875d5c22..06749590c5 100644 --- a/src/include/gnunet_json_lib.h +++ b/src/include/gnunet_json_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet_json_lib.h diff --git a/src/include/gnunet_jsonapi_lib.h b/src/include/gnunet_jsonapi_lib.h index a26eb0aad3..1dc89621bb 100644 --- a/src/include/gnunet_jsonapi_lib.h +++ b/src/include/gnunet_jsonapi_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet_jsonapi_lib.h diff --git a/src/include/gnunet_jsonapi_util.h b/src/include/gnunet_jsonapi_util.h index c1c0fcb8aa..02c82e844b 100644 --- a/src/include/gnunet_jsonapi_util.h +++ b/src/include/gnunet_jsonapi_util.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet_jsonapi_util.h diff --git a/src/include/gnunet_load_lib.h b/src/include/gnunet_load_lib.h index 8b61a75bcb..3e7c1e487d 100644 --- a/src/include/gnunet_load_lib.h +++ b/src/include/gnunet_load_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h index 5e552271ed..dfad5f56a5 100644 --- a/src/include/gnunet_microphone_lib.h +++ b/src/include/gnunet_microphone_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index 3a9987964a..226b3389f4 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_mst_lib.h b/src/include/gnunet_mst_lib.h index 79fe600833..2716f4dce5 100644 --- a/src/include/gnunet_mst_lib.h +++ b/src/include/gnunet_mst_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h index eaf2a746fb..541bdd90de 100644 --- a/src/include/gnunet_multicast_service.h +++ b/src/include/gnunet_multicast_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h index e04fd2ca1e..655885c692 100644 --- a/src/include/gnunet_my_lib.h +++ b/src/include/gnunet_my_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index 4d751c6eb8..baa5a3ee10 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_namecache_plugin.h b/src/include/gnunet_namecache_plugin.h index d7268be260..5ef41bf4d6 100644 --- a/src/include/gnunet_namecache_plugin.h +++ b/src/include/gnunet_namecache_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_namecache_service.h b/src/include/gnunet_namecache_service.h index 82d1e0760e..ab9461f455 100644 --- a/src/include/gnunet_namecache_service.h +++ b/src/include/gnunet_namecache_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index a0f23e5d20..5ab6ec7065 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 01d478646b..7ab619c512 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_nat_auto_service.h b/src/include/gnunet_nat_auto_service.h index 10c2aeca57..a588343353 100644 --- a/src/include/gnunet_nat_auto_service.h +++ b/src/include/gnunet_nat_auto_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_nat_service.h b/src/include/gnunet_nat_service.h index 80edc13d6c..eb08515a28 100644 --- a/src/include/gnunet_nat_service.h +++ b/src/include/gnunet_nat_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_nc_lib.h b/src/include/gnunet_nc_lib.h index ce91b90bed..b911d56320 100644 --- a/src/include/gnunet_nc_lib.h +++ b/src/include/gnunet_nc_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 38380b46b0..0d3599c13f 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_nse_service.h b/src/include/gnunet_nse_service.h index 41ab338939..5ca173e137 100644 --- a/src/include/gnunet_nse_service.h +++ b/src/include/gnunet_nse_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #ifndef GNUNET_NSE_SERVICE_H_ diff --git a/src/include/gnunet_op_lib.h b/src/include/gnunet_op_lib.h index b0627e0035..ad3c873b9c 100644 --- a/src/include/gnunet_op_lib.h +++ b/src/include/gnunet_op_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index 483f0ae573..86957a25cf 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_peer_lib.h b/src/include/gnunet_peer_lib.h index 9f1b8d9c48..9c1813c47d 100644 --- a/src/include/gnunet_peer_lib.h +++ b/src/include/gnunet_peer_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h index 1cdca558a5..ca30289733 100644 --- a/src/include/gnunet_peerinfo_service.h +++ b/src/include/gnunet_peerinfo_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_peerstore_plugin.h b/src/include/gnunet_peerstore_plugin.h index 55a1f4d7f9..aef1836709 100644 --- a/src/include/gnunet_peerstore_plugin.h +++ b/src/include/gnunet_peerstore_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h index 230cb9e37a..261d2d34f0 100644 --- a/src/include/gnunet_peerstore_service.h +++ b/src/include/gnunet_peerstore_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_plugin_lib.h b/src/include/gnunet_plugin_lib.h index c95728e8f2..52e0dee519 100644 --- a/src/include/gnunet_plugin_lib.h +++ b/src/include/gnunet_plugin_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_pq_lib.h b/src/include/gnunet_pq_lib.h index c90a5a50d1..ca615cffcc 100644 --- a/src/include/gnunet_pq_lib.h +++ b/src/include/gnunet_pq_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file include/gnunet_pq_lib.h diff --git a/src/include/gnunet_program_lib.h b/src/include/gnunet_program_lib.h index cbec502c6a..088ce1faea 100644 --- a/src/include/gnunet_program_lib.h +++ b/src/include/gnunet_program_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index c99b168211..36aa424b48 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psyc_env.h b/src/include/gnunet_psyc_env.h index 294d3dedd6..e031715293 100644 --- a/src/include/gnunet_psyc_env.h +++ b/src/include/gnunet_psyc_env.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psyc_message.h b/src/include/gnunet_psyc_message.h index 0e1b397da6..05cfc011eb 100644 --- a/src/include/gnunet_psyc_message.h +++ b/src/include/gnunet_psyc_message.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index 1905a4ddeb..f31de0e67b 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psyc_slicer.h b/src/include/gnunet_psyc_slicer.h index ff568ebc86..0967945594 100644 --- a/src/include/gnunet_psyc_slicer.h +++ b/src/include/gnunet_psyc_slicer.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psyc_util_lib.h b/src/include/gnunet_psyc_util_lib.h index e70bb59e8b..b70752ea2e 100644 --- a/src/include/gnunet_psyc_util_lib.h +++ b/src/include/gnunet_psyc_util_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h index e8fca20d89..276d606386 100644 --- a/src/include/gnunet_psycstore_plugin.h +++ b/src/include/gnunet_psycstore_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index 65b58ccd20..7d52259f09 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h index d149cf106d..e321bd4429 100644 --- a/src/include/gnunet_regex_service.h +++ b/src/include/gnunet_regex_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Maximilian Szengel diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h index cf5f0e3562..2d2508c173 100644 --- a/src/include/gnunet_resolver_service.h +++ b/src/include/gnunet_resolver_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_rest_lib.h b/src/include/gnunet_rest_lib.h index 27df5f5c8b..392ef68803 100644 --- a/src/include/gnunet_rest_lib.h +++ b/src/include/gnunet_rest_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_rest_plugin.h b/src/include/gnunet_rest_plugin.h index f84c93ea07..4aad825754 100644 --- a/src/include/gnunet_rest_plugin.h +++ b/src/include/gnunet_rest_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h index 4a29b3239d..f9c0237d3e 100644 --- a/src/include/gnunet_revocation_service.h +++ b/src/include/gnunet_revocation_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #ifndef GNUNET_REVOCATION_SERVICE_H_ diff --git a/src/include/gnunet_rps_service.h b/src/include/gnunet_rps_service.h index 75ff1756a9..b0c8c98675 100644 --- a/src/include/gnunet_rps_service.h +++ b/src/include/gnunet_rps_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h index 1a135078dc..729d586484 100644 --- a/src/include/gnunet_scalarproduct_service.h +++ b/src/include/gnunet_scalarproduct_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index 5f6f415483..314ede6a0a 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h index bb16a13a8e..bd11df9820 100644 --- a/src/include/gnunet_secretsharing_service.h +++ b/src/include/gnunet_secretsharing_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_sensor_service.h b/src/include/gnunet_sensor_service.h index 38c62761d3..c141def270 100644 --- a/src/include/gnunet_sensor_service.h +++ b/src/include/gnunet_sensor_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_sensor_util_lib.h b/src/include/gnunet_sensor_util_lib.h index 94be1aa12d..df7fa474b6 100644 --- a/src/include/gnunet_sensor_util_lib.h +++ b/src/include/gnunet_sensor_util_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_sensordashboard_service.h b/src/include/gnunet_sensordashboard_service.h index e9fc75c3cc..3521847cbf 100644 --- a/src/include/gnunet_sensordashboard_service.h +++ b/src/include/gnunet_sensordashboard_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h index 43a15ccedb..be52cce441 100644 --- a/src/include/gnunet_service_lib.h +++ b/src/include/gnunet_service_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 36a88e162c..2787843013 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_signal_lib.h b/src/include/gnunet_signal_lib.h index 87c1ddc692..199270b4eb 100644 --- a/src/include/gnunet_signal_lib.h +++ b/src/include/gnunet_signal_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h index 16fc68d0c4..bc9e3dc16e 100644 --- a/src/include/gnunet_signatures.h +++ b/src/include/gnunet_signatures.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index a93248846a..238166f967 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_socks.h b/src/include/gnunet_socks.h index daba84b4eb..13c0a70c75 100644 --- a/src/include/gnunet_socks.h +++ b/src/include/gnunet_socks.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h index f3348e2337..0cee7de576 100644 --- a/src/include/gnunet_speaker_lib.h +++ b/src/include/gnunet_speaker_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_sq_lib.h b/src/include/gnunet_sq_lib.h index 3437178976..d5aa839bd9 100644 --- a/src/include/gnunet_sq_lib.h +++ b/src/include/gnunet_sq_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file include/gnunet_sq_lib.h diff --git a/src/include/gnunet_statistics_service.h b/src/include/gnunet_statistics_service.h index 7ff7972463..c14d1419df 100644 --- a/src/include/gnunet_statistics_service.h +++ b/src/include/gnunet_statistics_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index a50dd47cb7..1fdab93b2d 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h index 48c3fa599e..1c267bb0cb 100644 --- a/src/include/gnunet_testbed_logger_service.h +++ b/src/include/gnunet_testbed_logger_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index 07a7cf2ac0..4b8d63ad24 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index a8ee2a9604..a2dc86fc4f 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h index 488faafbe9..2fc20d2cd9 100644 --- a/src/include/gnunet_time_lib.h +++ b/src/include/gnunet_time_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h index cd82b877b8..62822ddc37 100644 --- a/src/include/gnunet_transport_communication_service.h +++ b/src/include/gnunet_transport_communication_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_core_service.h b/src/include/gnunet_transport_core_service.h index 14255eee01..5fbfcee21e 100644 --- a/src/include/gnunet_transport_core_service.h +++ b/src/include/gnunet_transport_core_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Christian Grothoff diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h index 3a0baa146b..a21358a9cb 100644 --- a/src/include/gnunet_transport_hello_service.h +++ b/src/include/gnunet_transport_hello_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_manipulation_service.h b/src/include/gnunet_transport_manipulation_service.h index 56a426a1bf..068b41dc05 100644 --- a/src/include/gnunet_transport_manipulation_service.h +++ b/src/include/gnunet_transport_manipulation_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_monitor_service.h b/src/include/gnunet_transport_monitor_service.h index aef9bdadc8..b9d024d59d 100644 --- a/src/include/gnunet_transport_monitor_service.h +++ b/src/include/gnunet_transport_monitor_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index 29ef379218..1f7b46baa9 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 9b8eea8473..f600057e03 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h index 666ef16248..a2e75eb5ff 100644 --- a/src/include/gnunet_tun_lib.h +++ b/src/include/gnunet_tun_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h index 2cbdc29ec0..5e8eef1ad9 100644 --- a/src/include/gnunet_util_lib.h +++ b/src/include/gnunet_util_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_util_taler_wallet_lib.h b/src/include/gnunet_util_taler_wallet_lib.h index 086c7bc747..0ed68437d9 100644 --- a/src/include/gnunet_util_taler_wallet_lib.h +++ b/src/include/gnunet_util_taler_wallet_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h index a081ad5fe9..29f5aeb0fd 100644 --- a/src/include/gnunet_vpn_service.h +++ b/src/include/gnunet_vpn_service.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/platform.h b/src/include/platform.h index a5cbf718a0..4a165ded62 100644 --- a/src/include/platform.h +++ b/src/include/platform.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/include/winproc.h b/src/include/winproc.h index c1f02fc17b..d1438c5f4c 100644 --- a/src/include/winproc.h +++ b/src/include/winproc.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/integration-tests/gnunet_pyexpect.py.in b/src/integration-tests/gnunet_pyexpect.py.in index 3987bd357a..69d1495aae 100644 --- a/src/integration-tests/gnunet_pyexpect.py.in +++ b/src/integration-tests/gnunet_pyexpect.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for gnunet-peerinfo from __future__ import print_function diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 59a5aee060..fa43c68388 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Functions for integration testing import os diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index 117affd436..bb3e9cebb2 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # import signal diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index a98b95d497..c2228da419 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # # diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index 2c657a636b..52dfd21026 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # import sys diff --git a/src/integration-tests/test_integration_disconnect_nat.py.in b/src/integration-tests/test_integration_disconnect_nat.py.in index 17019302be..69d6706637 100755 --- a/src/integration-tests/test_integration_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_disconnect_nat.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # import sys diff --git a/src/integration-tests/test_integration_reconnect.py.in b/src/integration-tests/test_integration_reconnect.py.in index ae6027a37b..4783463b55 100755 --- a/src/integration-tests/test_integration_reconnect.py.in +++ b/src/integration-tests/test_integration_reconnect.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # import sys diff --git a/src/integration-tests/test_integration_reconnect_nat.py.in b/src/integration-tests/test_integration_reconnect_nat.py.in index 118842266a..f175554fbd 100755 --- a/src/integration-tests/test_integration_reconnect_nat.py.in +++ b/src/integration-tests/test_integration_reconnect_nat.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # import sys diff --git a/src/json/json.c b/src/json/json.c index cc3e84147a..bb3979b36c 100644 --- a/src/json/json.c +++ b/src/json/json.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file json/json.c diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 609c18395e..dd6df4f74c 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file json/json_generator.c diff --git a/src/json/json_helper.c b/src/json/json_helper.c index a0c4b88d9e..a553dd8e7a 100644 --- a/src/json/json_helper.c +++ b/src/json/json_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file json/json_helper.c diff --git a/src/json/json_mhd.c b/src/json/json_mhd.c index 9fef4f22e8..9823eb6766 100644 --- a/src/json/json_mhd.c +++ b/src/json/json_mhd.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file json/json_mhd.c diff --git a/src/json/test_json.c b/src/json/test_json.c index 4c9612b05b..69cc263088 100644 --- a/src/json/test_json.c +++ b/src/json/test_json.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/jsonapi/jsonapi.c b/src/jsonapi/jsonapi.c index 2ad4e693d2..f7fcd972a0 100644 --- a/src/jsonapi/jsonapi.c +++ b/src/jsonapi/jsonapi.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file jsonapi/jsonapi.c diff --git a/src/jsonapi/test_jsonapi.c b/src/jsonapi/test_jsonapi.c index ff3061abf9..59d0bed767 100644 --- a/src/jsonapi/test_jsonapi.c +++ b/src/jsonapi/test_jsonapi.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/multicast/gnunet-multicast.c b/src/multicast/gnunet-multicast.c index c56f5ed370..e0902f1124 100644 --- a/src/multicast/gnunet-multicast.c +++ b/src/multicast/gnunet-multicast.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c index 5b1c02575c..cf7dde9133 100644 --- a/src/multicast/gnunet-service-multicast.c +++ b/src/multicast/gnunet-service-multicast.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/multicast/multicast.h b/src/multicast/multicast.h index d9f5372a1b..e95299a5e4 100644 --- a/src/multicast/multicast.h +++ b/src/multicast/multicast.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c index 71dc705228..9f8d492530 100644 --- a/src/multicast/multicast_api.c +++ b/src/multicast/multicast_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c index 00d397ef97..e00f07b51d 100644 --- a/src/multicast/test_multicast.c +++ b/src/multicast/test_multicast.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c index 38787d2a92..325d814988 100644 --- a/src/multicast/test_multicast_2peers.c +++ b/src/multicast/test_multicast_2peers.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index 2eb2dee310..3a7c6d9615 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/my/my.c b/src/my/my.c index d207e0f740..b9d5c84247 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file my/my.c diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c index 13671dc655..c4516715a7 100644 --- a/src/my/my_query_helper.c +++ b/src/my/my_query_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file my/my_query_helper.c diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c index d355ad1576..df4b15e614 100644 --- a/src/my/my_result_helper.c +++ b/src/my/my_result_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file my/my_result_helper.c diff --git a/src/my/test_my.c b/src/my/test_my.c index 2db775dc68..22a61dcb68 100644 --- a/src/my/test_my.c +++ b/src/my/test_my.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file my/test_my.c diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c index b93428ed61..1d3b276901 100644 --- a/src/mysql/mysql.c +++ b/src/mysql/mysql.c @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file mysql/mysql.c diff --git a/src/namecache/gnunet-namecache.c b/src/namecache/gnunet-namecache.c index cb79ea3bb0..3af28cbb3c 100644 --- a/src/namecache/gnunet-namecache.c +++ b/src/namecache/gnunet-namecache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-namecache.c diff --git a/src/namecache/gnunet-service-namecache.c b/src/namecache/gnunet-service-namecache.c index 484a9f4b58..cda1267e88 100644 --- a/src/namecache/gnunet-service-namecache.c +++ b/src/namecache/gnunet-service-namecache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namecache/namecache.h b/src/namecache/namecache.h index f598328760..3dac9f6379 100644 --- a/src/namecache/namecache.h +++ b/src/namecache/namecache.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c index faaf1e3d6f..2bb233da19 100644 --- a/src/namecache/namecache_api.c +++ b/src/namecache/namecache_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namecache/plugin_namecache_flat.c b/src/namecache/plugin_namecache_flat.c index 7f9ade0077..fdf6544d02 100644 --- a/src/namecache/plugin_namecache_flat.c +++ b/src/namecache/plugin_namecache_flat.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namecache/plugin_namecache_postgres.c b/src/namecache/plugin_namecache_postgres.c index 4112dc65a9..99dc19f053 100644 --- a/src/namecache/plugin_namecache_postgres.c +++ b/src/namecache/plugin_namecache_postgres.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c index b66cdcef78..3f9d474dea 100644 --- a/src/namecache/plugin_namecache_sqlite.c +++ b/src/namecache/plugin_namecache_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namecache/test_namecache_api_cache_block.c b/src/namecache/test_namecache_api_cache_block.c index 85f5ddbcfe..be5f630f5c 100644 --- a/src/namecache/test_namecache_api_cache_block.c +++ b/src/namecache/test_namecache_api_cache_block.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namecache/test_namecache_api.c diff --git a/src/namecache/test_plugin_namecache.c b/src/namecache/test_plugin_namecache.c index 3dd3504276..5ccb7a7042 100644 --- a/src/namecache/test_plugin_namecache.c +++ b/src/namecache/test_plugin_namecache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file namecache/test_plugin_namecache.c diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 4687300fb4..f4cdf26b47 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-namestore-fcfsd.c diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 1ff6d5e4a0..6ffd99773c 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file gnunet-namestore.c diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index dfa2c1fb01..2d60205526 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c index fc9753b112..6c89cdb05c 100644 --- a/src/namestore/gnunet-zoneimport.c +++ b/src/namestore/gnunet-zoneimport.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/namestore/gnunet-zoneimport.c diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 2eb5cdc3b5..e6f5ae8484 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c index ed761ec3e4..55745d83d8 100644 --- a/src/namestore/namestore_api.c +++ b/src/namestore/namestore_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/namestore/namestore_api_monitor.c b/src/namestore/namestore_api_monitor.c index 80d34b9ead..6c441d786e 100644 --- a/src/namestore/namestore_api_monitor.c +++ b/src/namestore/namestore_api_monitor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/namestore_api_monitor.c diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c index b4e457f44a..03f53e63bb 100644 --- a/src/namestore/perf_namestore_api_zone_iteration.c +++ b/src/namestore/perf_namestore_api_zone_iteration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/perf_namestore_api_zone_iteration.c diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c index 1b3bfa61f2..33c48b2449 100644 --- a/src/namestore/plugin_namestore_flat.c +++ b/src/namestore/plugin_namestore_flat.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 5f40fba0a0..7c6acc91b1 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index e0e8389878..6960e5d127 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c index 94cb580ce4..ec44046e0c 100644 --- a/src/namestore/plugin_rest_namestore.c +++ b/src/namestore/plugin_rest_namestore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c index 280ea8f9b3..1a5a09e47d 100644 --- a/src/namestore/test_namestore_api_lookup_nick.c +++ b/src/namestore/test_namestore_api_lookup_nick.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_lookup_nick.c diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c index f28b7f8883..024adaa431 100644 --- a/src/namestore/test_namestore_api_lookup_private.c +++ b/src/namestore/test_namestore_api_lookup_private.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_store.c diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c index 004604a762..63cd7662e2 100644 --- a/src/namestore/test_namestore_api_lookup_public.c +++ b/src/namestore/test_namestore_api_lookup_public.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api.c diff --git a/src/namestore/test_namestore_api_lookup_shadow.c b/src/namestore/test_namestore_api_lookup_shadow.c index e67631f27f..ecfd03735a 100644 --- a/src/namestore/test_namestore_api_lookup_shadow.c +++ b/src/namestore/test_namestore_api_lookup_shadow.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_lookup_shadow.c diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c index 62c049696f..b751ff703a 100644 --- a/src/namestore/test_namestore_api_lookup_shadow_filter.c +++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_lookup_shadow_filter.c diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index f0664251b6..1051e3248d 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_monitoring.c diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index 5dea6e01fb..9c8ddf7ade 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_monitoring_existing.c diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 2bae074158..7d993d4d94 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api.c diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index 2327178da0..a5bd6c8c2e 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_remove_not_existing_record.c diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index de24bdc578..61b5347817 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_store.c diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c index 0d1e226865..bd62fdd4c0 100644 --- a/src/namestore/test_namestore_api_store_update.c +++ b/src/namestore/test_namestore_api_store_update.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_store_update.c diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index fba3bc0ddb..af263c816b 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c index 24dce20a76..efaadff559 100644 --- a/src/namestore/test_namestore_api_zone_iteration_nick.c +++ b/src/namestore/test_namestore_api_zone_iteration_nick.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 326c9ea0f6..303a7648a4 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_zone_iteration_specific_zone.c diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 17023f81f0..eb7ad4305c 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_zone_iteration.c diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 5419df14a9..e689455b0b 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file namestore/test_namestore_api_zone_to_name.c diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index fddc4f2c0d..9d21ad16a4 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file namestore/test_plugin_namestore.c diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c index aa66a28236..7d62dfbd15 100644 --- a/src/nat-auto/gnunet-nat-auto.c +++ b/src/nat-auto/gnunet-nat-auto.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c index d9deafe2ef..650a9c2680 100644 --- a/src/nat-auto/gnunet-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-nat-auto_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c index 7656af5c3e..7fd3ec3717 100644 --- a/src/nat-auto/gnunet-nat-server.c +++ b/src/nat-auto/gnunet-nat-server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/gnunet-service-nat-auto.c b/src/nat-auto/gnunet-service-nat-auto.c index d7037b8110..62577e4dd2 100644 --- a/src/nat-auto/gnunet-service-nat-auto.c +++ b/src/nat-auto/gnunet-service-nat-auto.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c index a839834e3d..3334ddd41f 100644 --- a/src/nat-auto/gnunet-service-nat-auto_legacy.c +++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/nat-auto.h b/src/nat-auto/nat-auto.h index 10624cba49..3822c64cd3 100644 --- a/src/nat-auto/nat-auto.h +++ b/src/nat-auto/nat-auto.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/nat_auto_api.c b/src/nat-auto/nat_auto_api.c index 3fc8bc8ad9..942f126e4a 100644 --- a/src/nat-auto/nat_auto_api.c +++ b/src/nat-auto/nat_auto_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c index 7410e5ce0c..1b794c7994 100644 --- a/src/nat-auto/nat_auto_api_test.c +++ b/src/nat-auto/nat_auto_api_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file nat/nat_auto_api_test.c diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c index 55c6d70073..9dbaa0d48e 100644 --- a/src/nat/gnunet-helper-nat-client-windows.c +++ b/src/nat/gnunet-helper-nat-client-windows.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-helper-nat-client.c b/src/nat/gnunet-helper-nat-client.c index ec4a1c87a1..d4fc54b247 100644 --- a/src/nat/gnunet-helper-nat-client.c +++ b/src/nat/gnunet-helper-nat-client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c index 328189e765..c266843697 100644 --- a/src/nat/gnunet-helper-nat-server-windows.c +++ b/src/nat/gnunet-helper-nat-server-windows.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-helper-nat-server.c b/src/nat/gnunet-helper-nat-server.c index 116b3255cd..44817ede79 100644 --- a/src/nat/gnunet-helper-nat-server.c +++ b/src/nat/gnunet-helper-nat-server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index 472d4b28ef..ddc678ddc7 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 74d1e5ecf6..dd0715785e 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat.h b/src/nat/gnunet-service-nat.h index ec5578c21b..d1cdd0180b 100644 --- a/src/nat/gnunet-service-nat.h +++ b/src/nat/gnunet-service-nat.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/nat/gnunet-service-nat_externalip.c index 28ea5b1264..e55f5ac1ec 100644 --- a/src/nat/gnunet-service-nat_externalip.c +++ b/src/nat/gnunet-service-nat_externalip.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * Code to figure out what our external IPv4 address(es) might diff --git a/src/nat/gnunet-service-nat_externalip.h b/src/nat/gnunet-service-nat_externalip.h index 5c0405c7b4..846bac7b92 100644 --- a/src/nat/gnunet-service-nat_externalip.h +++ b/src/nat/gnunet-service-nat_externalip.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * Code to figure out what our external IPv4 address(es) might diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c index e11c89b61f..35b3dd9999 100644 --- a/src/nat/gnunet-service-nat_helper.c +++ b/src/nat/gnunet-service-nat_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat_helper.h b/src/nat/gnunet-service-nat_helper.h index 3692faec12..52b36e057f 100644 --- a/src/nat/gnunet-service-nat_helper.h +++ b/src/nat/gnunet-service-nat_helper.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c index c27908518b..a3617e3cee 100644 --- a/src/nat/gnunet-service-nat_mini.c +++ b/src/nat/gnunet-service-nat_mini.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat_mini.h b/src/nat/gnunet-service-nat_mini.h index 7643f43d9a..86930f39f2 100644 --- a/src/nat/gnunet-service-nat_mini.h +++ b/src/nat/gnunet-service-nat_mini.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/gnunet-service-nat_stun.c b/src/nat/gnunet-service-nat_stun.c index 7f1bae5f17..17dfcadf48 100644 --- a/src/nat/gnunet-service-nat_stun.c +++ b/src/nat/gnunet-service-nat_stun.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * This code provides some support for doing STUN transactions. We diff --git a/src/nat/gnunet-service-nat_stun.h b/src/nat/gnunet-service-nat_stun.h index a5d3c50a37..f34c7f43b1 100644 --- a/src/nat/gnunet-service-nat_stun.h +++ b/src/nat/gnunet-service-nat_stun.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * This code provides some support for doing STUN transactions. We diff --git a/src/nat/nat.h b/src/nat/nat.h index 0fb32a1870..d5ec7747de 100644 --- a/src/nat/nat.h +++ b/src/nat/nat.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c index 9c8de0c2cd..017c8739d2 100644 --- a/src/nat/nat_api.c +++ b/src/nat/nat_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c index a3cb6aaa72..9332cfd987 100644 --- a/src/nat/nat_api_stun.c +++ b/src/nat/nat_api_stun.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * This code provides some support for doing STUN transactions. diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h index 707f3754dd..25e2e46daf 100644 --- a/src/nat/nat_stun.h +++ b/src/nat/nat_stun.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * Message types for STUN server resolution diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index 2d0b5d1b45..f38fa8e819 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c index 70f7803e21..cc8248cfec 100644 --- a/src/nat/test_nat_mini.c +++ b/src/nat/test_nat_mini.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c index e8e3a0ec25..a7cbaeab4d 100644 --- a/src/nat/test_nat_test.c +++ b/src/nat/test_nat_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file nat/test_nat_test.c diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c index 0d593bfe8c..630538162b 100644 --- a/src/nat/test_stun.c +++ b/src/nat/test_stun.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index 33163c6337..6686f8a6dc 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file nse/gnunet-nse-profiler.c diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c index 23c962c5bb..7104110199 100644 --- a/src/nse/gnunet-nse.c +++ b/src/nse/gnunet-nse.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 58b1525056..cce62b2315 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/nse.h b/src/nse/nse.h index 1e00f78196..b5ad6c35fc 100644 --- a/src/nse/nse.h +++ b/src/nse/nse.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index 91e92acdeb..cecda0ebe8 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/perf_kdf.c b/src/nse/perf_kdf.c index 42636d5377..4fc116c7f2 100644 --- a/src/nse/perf_kdf.c +++ b/src/nse/perf_kdf.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/nse/test_nse_api.c b/src/nse/test_nse_api.c index 35dc5902e5..f9d244014e 100644 --- a/src/nse/test_nse_api.c +++ b/src/nse/test_nse_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file nse/test_nse_api.c diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c index 02af534b7d..3b8fc969e0 100644 --- a/src/nse/test_nse_multipeer.c +++ b/src/nse/test_nse_multipeer.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file nse/test_nse_multipeer.c diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c index 7366c54417..2a7b785ee7 100644 --- a/src/peerinfo-tool/gnunet-peerinfo.c +++ b/src/peerinfo-tool/gnunet-peerinfo.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.c b/src/peerinfo-tool/gnunet-peerinfo_plugins.c index 9c6177b247..b9159a5c0d 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.c +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo-tool/gnunet-peerinfo_plugins.h b/src/peerinfo-tool/gnunet-peerinfo_plugins.h index 4ee059638a..825af0ecb6 100644 --- a/src/peerinfo-tool/gnunet-peerinfo_plugins.h +++ b/src/peerinfo-tool/gnunet-peerinfo_plugins.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index 6a0ea939c3..f54da35644 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for gnunet-peerinfo import sys diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index e00067e2ac..57da1b03e2 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h index 8c38ff47d8..0c43c107b8 100644 --- a/src/peerinfo/peerinfo.h +++ b/src/peerinfo/peerinfo.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index ded566a282..13458b11dc 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c index d607a43a2a..097f784b58 100644 --- a/src/peerinfo/peerinfo_api_notify.c +++ b/src/peerinfo/peerinfo_api_notify.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/perf_peerinfo_api.c b/src/peerinfo/perf_peerinfo_api.c index 2ae7637898..c561fdef8a 100644 --- a/src/peerinfo/perf_peerinfo_api.c +++ b/src/peerinfo/perf_peerinfo_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c index 9a1d2e681a..12abe26db7 100644 --- a/src/peerinfo/test_peerinfo_api.c +++ b/src/peerinfo/test_peerinfo_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/test_peerinfo_api_friend_only.c b/src/peerinfo/test_peerinfo_api_friend_only.c index 148ca3da9c..7ea65977c5 100644 --- a/src/peerinfo/test_peerinfo_api_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_friend_only.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/test_peerinfo_api_notify_friend_only.c b/src/peerinfo/test_peerinfo_api_notify_friend_only.c index 8f4e920b01..6b5c433b76 100644 --- a/src/peerinfo/test_peerinfo_api_notify_friend_only.c +++ b/src/peerinfo/test_peerinfo_api_notify_friend_only.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerinfo/test_peerinfo_shipped_hellos.c b/src/peerinfo/test_peerinfo_shipped_hellos.c index 989c15a024..0e4f05c245 100644 --- a/src/peerinfo/test_peerinfo_shipped_hellos.c +++ b/src/peerinfo/test_peerinfo_shipped_hellos.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerstore/gnunet-peerstore.c b/src/peerstore/gnunet-peerstore.c index 552a419f2a..f142c3f164 100644 --- a/src/peerstore/gnunet-peerstore.c +++ b/src/peerstore/gnunet-peerstore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerstore/gnunet-service-peerstore.c b/src/peerstore/gnunet-service-peerstore.c index e174af6311..3414111f61 100644 --- a/src/peerstore/gnunet-service-peerstore.c +++ b/src/peerstore/gnunet-service-peerstore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h index 6461649dec..31a11aacf6 100644 --- a/src/peerstore/peerstore.h +++ b/src/peerstore/peerstore.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/peerstore.h diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c index c40e1bf4bd..33a46a91aa 100644 --- a/src/peerstore/peerstore_api.c +++ b/src/peerstore/peerstore_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/peerstore_api.c diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c index 8c9d62d522..99e334c435 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/peerstore/peerstore_common.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/peerstore_common.c diff --git a/src/peerstore/peerstore_common.h b/src/peerstore/peerstore_common.h index 16fdfd1b7b..e6f2dbdd40 100644 --- a/src/peerstore/peerstore_common.h +++ b/src/peerstore/peerstore_common.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/peerstore/perf_peerstore_store.c b/src/peerstore/perf_peerstore_store.c index 60f4c6ecaf..b304a66793 100644 --- a/src/peerstore/perf_peerstore_store.c +++ b/src/peerstore/perf_peerstore_store.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/perf_peerstore_store.c diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c index 098aa37b08..a742ef03cc 100644 --- a/src/peerstore/plugin_peerstore_flat.c +++ b/src/peerstore/plugin_peerstore_flat.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c index e8d8423113..7ecb7bacd7 100644 --- a/src/peerstore/plugin_peerstore_sqlite.c +++ b/src/peerstore/plugin_peerstore_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/peerstore/test_peerstore_api_iterate.c b/src/peerstore/test_peerstore_api_iterate.c index 4c8d64ff1e..25b1933724 100644 --- a/src/peerstore/test_peerstore_api_iterate.c +++ b/src/peerstore/test_peerstore_api_iterate.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/test_peerstore_api_iterate.c diff --git a/src/peerstore/test_peerstore_api_store.c b/src/peerstore/test_peerstore_api_store.c index 8059dc9d98..194b96104e 100644 --- a/src/peerstore/test_peerstore_api_store.c +++ b/src/peerstore/test_peerstore_api_store.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/test_peerstore_api_store.c diff --git a/src/peerstore/test_peerstore_api_sync.c b/src/peerstore/test_peerstore_api_sync.c index 7a575efa5c..2b5361dea4 100644 --- a/src/peerstore/test_peerstore_api_sync.c +++ b/src/peerstore/test_peerstore_api_sync.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/test_peerstore_api_sync.c diff --git a/src/peerstore/test_peerstore_api_watch.c b/src/peerstore/test_peerstore_api_watch.c index 39173da2b3..d00d9dbb1f 100644 --- a/src/peerstore/test_peerstore_api_watch.c +++ b/src/peerstore/test_peerstore_api_watch.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file peerstore/test_peerstore_api_watch.c diff --git a/src/peerstore/test_plugin_peerstore.c b/src/peerstore/test_plugin_peerstore.c index 81d7d3f216..8b47ac1dc9 100644 --- a/src/peerstore/test_plugin_peerstore.c +++ b/src/peerstore/test_plugin_peerstore.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* * @file namestore/test_plugin_namestore.c diff --git a/src/pq/pq.c b/src/pq/pq.c index 05d9e13e13..66f9d983b3 100644 --- a/src/pq/pq.c +++ b/src/pq/pq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq.c diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c index e55f51cbe5..25619f8c0e 100644 --- a/src/pq/pq_connect.c +++ b/src/pq/pq_connect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_connect.c diff --git a/src/pq/pq_eval.c b/src/pq/pq_eval.c index d40e0fb612..5abb1cd9c6 100644 --- a/src/pq/pq_eval.c +++ b/src/pq/pq_eval.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_eval.c diff --git a/src/pq/pq_exec.c b/src/pq/pq_exec.c index 1d84ac7a8e..31dbc3ff78 100644 --- a/src/pq/pq_exec.c +++ b/src/pq/pq_exec.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_exec.c diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c index 2ddae67ee1..d557410736 100644 --- a/src/pq/pq_prepare.c +++ b/src/pq/pq_prepare.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_prepare.c diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c index 1d35cda07e..799f82ebe8 100644 --- a/src/pq/pq_query_helper.c +++ b/src/pq/pq_query_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_query_helper.c diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c index a011e4d084..3805b8a8d9 100644 --- a/src/pq/pq_result_helper.c +++ b/src/pq/pq_result_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/pq_result_helper.c diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c index 2c839d9ee0..437f3b4e1b 100644 --- a/src/pq/test_pq.c +++ b/src/pq/test_pq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pq/test_pq.c diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 93ad7516fc..2a335ca439 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/psyc.h b/src/psyc/psyc.h index e630ae57bb..1296cc67fe 100644 --- a/src/psyc/psyc.h +++ b/src/psyc/psyc.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/psyc_api.c b/src/psyc/psyc_api.c index 9fd588a80a..c875031190 100644 --- a/src/psyc/psyc_api.c +++ b/src/psyc/psyc_api.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/psyc_test_lib.h b/src/psyc/psyc_test_lib.h index 4f261e7388..22b638edcd 100644 --- a/src/psyc/psyc_test_lib.h +++ b/src/psyc/psyc_test_lib.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 1765666b25..f3dbbea17d 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/test_psyc2.c b/src/psyc/test_psyc2.c index 598b60a569..4cfdab82aa 100644 --- a/src/psyc/test_psyc2.c +++ b/src/psyc/test_psyc2.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psyc/test_psyc_api_join.c b/src/psyc/test_psyc_api_join.c index 2c850e9b77..896f308c07 100644 --- a/src/psyc/test_psyc_api_join.c +++ b/src/psyc/test_psyc_api_join.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index 28d301b8b0..dd27696c60 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index 5992d3aa0d..029e3f70f0 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/plugin_psycstore_postgres.c b/src/psycstore/plugin_psycstore_postgres.c index bf3f9f29e2..8a33c1ce7b 100644 --- a/src/psycstore/plugin_psycstore_postgres.c +++ b/src/psycstore/plugin_psycstore_postgres.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c index cab3b0686b..0630e7d952 100644 --- a/src/psycstore/plugin_psycstore_sqlite.c +++ b/src/psycstore/plugin_psycstore_sqlite.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h index d8d44b9911..c3d307e65e 100644 --- a/src/psycstore/psycstore.h +++ b/src/psycstore/psycstore.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c index 7e20f7fe99..f345748c69 100644 --- a/src/psycstore/psycstore_api.c +++ b/src/psycstore/psycstore_api.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c index c544a568d9..65ba38e9ee 100644 --- a/src/psycstore/test_plugin_psycstore.c +++ b/src/psycstore/test_plugin_psycstore.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 9ef430c005..160085368f 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycutil/psyc_env.c b/src/psycutil/psyc_env.c index 6f1a11df53..10cf9001e4 100644 --- a/src/psycutil/psyc_env.c +++ b/src/psycutil/psyc_env.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c index cdf87d9de7..7daa923cf3 100644 --- a/src/psycutil/psyc_message.c +++ b/src/psycutil/psyc_message.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycutil/psyc_slicer.c b/src/psycutil/psyc_slicer.c index 471d83b4b9..d546f79468 100644 --- a/src/psycutil/psyc_slicer.c +++ b/src/psycutil/psyc_slicer.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/psycutil/test_psyc_env.c b/src/psycutil/test_psyc_env.c index afbcf26af1..825ff12ecf 100644 --- a/src/psycutil/test_psyc_env.c +++ b/src/psycutil/test_psyc_env.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c index f3073c0261..6a8c2e7f4a 100644 --- a/src/pt/gnunet-daemon-pt.c +++ b/src/pt/gnunet-daemon-pt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file pt/gnunet-daemon-pt.c diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index 4b471710cf..72b4bdc233 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c index 1144ab68e4..43bed0a14f 100644 --- a/src/pt/test_gnunet_vpn.c +++ b/src/pt/test_gnunet_vpn.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c index d6e26bd1b8..11c2f513aa 100644 --- a/src/regex/gnunet-daemon-regexprofiler.c +++ b/src/regex/gnunet-daemon-regexprofiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index 2fe3a08734..f65ba3db11 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c index 40ae9befb7..b7e256f483 100644 --- a/src/regex/gnunet-regex-simulation-profiler.c +++ b/src/regex/gnunet-regex-simulation-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c index 3e474e2fa3..eb10e7c078 100644 --- a/src/regex/gnunet-service-regex.c +++ b/src/regex/gnunet-service-regex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c index 35b680993c..b507e75b04 100644 --- a/src/regex/perf-regex.c +++ b/src/regex/perf-regex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c index fc12495dd7..76045efcd3 100644 --- a/src/regex/plugin_block_regex.c +++ b/src/regex/plugin_block_regex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/regex_api_announce.c b/src/regex/regex_api_announce.c index 73be729409..e3ad70c6ab 100644 --- a/src/regex/regex_api_announce.c +++ b/src/regex/regex_api_announce.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/regex_api_announce.c diff --git a/src/regex/regex_api_search.c b/src/regex/regex_api_search.c index 4c41adc21f..2e2536a02c 100644 --- a/src/regex/regex_api_search.c +++ b/src/regex/regex_api_search.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/regex_api_search.c diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c index fa847493ac..33eaf466f6 100644 --- a/src/regex/regex_block_lib.c +++ b/src/regex/regex_block_lib.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Bartlomiej Polot diff --git a/src/regex/regex_block_lib.h b/src/regex/regex_block_lib.h index 81e6da1d3f..c5f5f31c06 100644 --- a/src/regex/regex_block_lib.h +++ b/src/regex/regex_block_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c index ea5bca9a9c..944ca9bb91 100644 --- a/src/regex/regex_internal.c +++ b/src/regex/regex_internal.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/regex/regex_internal.c diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h index 28a999da62..d52479ffe8 100644 --- a/src/regex/regex_internal.h +++ b/src/regex/regex_internal.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/regex/regex_internal.h diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c index 50bc3ceae7..2555ef1df6 100644 --- a/src/regex/regex_internal_dht.c +++ b/src/regex/regex_internal_dht.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/regex/regex_internal_dht.c diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h index aca97cd3e6..dc194546d7 100644 --- a/src/regex/regex_internal_lib.h +++ b/src/regex/regex_internal_lib.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/regex_internal_lib.h diff --git a/src/regex/regex_ipc.h b/src/regex/regex_ipc.h index 769a2e4b14..71ac273cdf 100644 --- a/src/regex/regex_ipc.h +++ b/src/regex/regex_ipc.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/regex_ipc.h diff --git a/src/regex/regex_test_graph.c b/src/regex/regex_test_graph.c index 4d8c32f292..d8f16e894c 100644 --- a/src/regex/regex_test_graph.c +++ b/src/regex/regex_test_graph.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/regex/regex_test_graph.c diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c index 84eebcb1c7..d25799ea42 100644 --- a/src/regex/regex_test_lib.c +++ b/src/regex/regex_test_lib.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** * @file src/regex/regex_test_lib.c diff --git a/src/regex/regex_test_lib.h b/src/regex/regex_test_lib.h index 7d7867f385..533ba3efb3 100644 --- a/src/regex/regex_test_lib.h +++ b/src/regex/regex_test_lib.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** * @file src/regex/regex_test_lib.h diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c index d9d72b2501..6e51885ee5 100644 --- a/src/regex/regex_test_random.c +++ b/src/regex/regex_test_random.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/regex/regex_test_random.c diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c index 7865ed7a53..a08e2ed6d5 100644 --- a/src/regex/test_regex_api.c +++ b/src/regex/test_regex_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_api.c diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c index d421e26f3e..8a0c0d0249 100644 --- a/src/regex/test_regex_eval_api.c +++ b/src/regex/test_regex_eval_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_eval_api.c diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c index ced4c53460..46eacc1d78 100644 --- a/src/regex/test_regex_graph_api.c +++ b/src/regex/test_regex_graph_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_graph_api.c diff --git a/src/regex/test_regex_integration.c b/src/regex/test_regex_integration.c index cfcf72fa00..99287243ef 100644 --- a/src/regex/test_regex_integration.c +++ b/src/regex/test_regex_integration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_integration.c diff --git a/src/regex/test_regex_iterate_api.c b/src/regex/test_regex_iterate_api.c index 129dd83cb4..f4cc725e02 100644 --- a/src/regex/test_regex_iterate_api.c +++ b/src/regex/test_regex_iterate_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_iterate_api.c diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c index 92bdb37924..72e02fa07e 100644 --- a/src/regex/test_regex_proofs.c +++ b/src/regex/test_regex_proofs.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file regex/test_regex_proofs.c diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index f71ba1deae..5c5a2daa95 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Martin Schanzenbach diff --git a/src/rest/rest.c b/src/rest/rest.c index 1a7a1868f2..d6f5de8952 100644 --- a/src/rest/rest.c +++ b/src/rest/rest.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/revocation/gnunet-revocation.c b/src/revocation/gnunet-revocation.c index e7c256f2c4..7ec4c0d14a 100644 --- a/src/revocation/gnunet-revocation.c +++ b/src/revocation/gnunet-revocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 8a7ca61305..ce1fefd346 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/revocation/plugin_block_revocation.c b/src/revocation/plugin_block_revocation.c index c6ea1d040c..3ed7432885 100644 --- a/src/revocation/plugin_block_revocation.c +++ b/src/revocation/plugin_block_revocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/revocation/revocation.h b/src/revocation/revocation.h index eff4ea66c9..28168c8a53 100644 --- a/src/revocation/revocation.h +++ b/src/revocation/revocation.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c index e435086385..bc97008178 100644 --- a/src/revocation/revocation_api.c +++ b/src/revocation/revocation_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file revocation/revocation_api.c diff --git a/src/revocation/test_local_revocation.py.in b/src/revocation/test_local_revocation.py.in index d8c15a0e4a..f31ed3cfe7 100644 --- a/src/revocation/test_local_revocation.py.in +++ b/src/revocation/test_local_revocation.py.in @@ -11,6 +11,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # # Testcase for ego revocation from __future__ import print_function diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c index 95a457590c..145726e143 100644 --- a/src/revocation/test_revocation.c +++ b/src/revocation/test_revocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file revocation/test_revocation.c diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index 429f645bee..8450ee65d7 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_rps.c diff --git a/src/rps/gnunet-rps.c b/src/rps/gnunet-rps.c index 0162b64516..e09277589c 100644 --- a/src/rps/gnunet-rps.c +++ b/src/rps/gnunet-rps.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 187770e167..9e81330bd2 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c index 2fff30de7a..90177cb942 100644 --- a/src/rps/gnunet-service-rps_custommap.c +++ b/src/rps/gnunet-service-rps_custommap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_custommap.h b/src/rps/gnunet-service-rps_custommap.h index 87cf3f1c4f..b42ae9efa3 100644 --- a/src/rps/gnunet-service-rps_custommap.h +++ b/src/rps/gnunet-service-rps_custommap.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_sampler.c b/src/rps/gnunet-service-rps_sampler.c index 5debcfe670..711d5be63d 100644 --- a/src/rps/gnunet-service-rps_sampler.c +++ b/src/rps/gnunet-service-rps_sampler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/rps/gnunet-service-rps_sampler.h index fa6e111832..c44844f968 100644 --- a/src/rps/gnunet-service-rps_sampler.h +++ b/src/rps/gnunet-service-rps_sampler.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_sampler_elem.c b/src/rps/gnunet-service-rps_sampler_elem.c index 9d595ebef2..7569801a65 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.c +++ b/src/rps/gnunet-service-rps_sampler_elem.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_sampler_elem.h b/src/rps/gnunet-service-rps_sampler_elem.h index 70063263ea..1dbdcbadd7 100644 --- a/src/rps/gnunet-service-rps_sampler_elem.h +++ b/src/rps/gnunet-service-rps_sampler_elem.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_view.c b/src/rps/gnunet-service-rps_view.c index 968c5515b4..1fa75fc53d 100644 --- a/src/rps/gnunet-service-rps_view.c +++ b/src/rps/gnunet-service-rps_view.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/gnunet-service-rps_view.h b/src/rps/gnunet-service-rps_view.h index 3ff3f2ba01..127b49faf5 100644 --- a/src/rps/gnunet-service-rps_view.h +++ b/src/rps/gnunet-service-rps_view.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 64b9581ac2..0c81cc2b42 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index 0741051c07..2213e50d83 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/rps.h b/src/rps/rps.h index 6682613c7e..6bf2273b49 100644 --- a/src/rps/rps.h +++ b/src/rps/rps.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/rps.h diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c index 083e1e0471..ca80e25e8e 100644 --- a/src/rps/rps_api.c +++ b/src/rps/rps_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c index 84a3da42d0..3ef1e66117 100644 --- a/src/rps/test_rps.c +++ b/src/rps/test_rps.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_rps.c diff --git a/src/rps/test_rps_api.c b/src/rps/test_rps_api.c index 32258135c3..85a0ccdd05 100644 --- a/src/rps/test_rps_api.c +++ b/src/rps/test_rps_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_rps_api.c diff --git a/src/rps/test_service_rps_custommap.c b/src/rps/test_service_rps_custommap.c index 263bdb3f53..8ce03070e8 100644 --- a/src/rps/test_service_rps_custommap.c +++ b/src/rps/test_service_rps_custommap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_service_rps_custommap.c diff --git a/src/rps/test_service_rps_sampler_elem.c b/src/rps/test_service_rps_sampler_elem.c index 3d6dbef44d..43efc86913 100644 --- a/src/rps/test_service_rps_sampler_elem.c +++ b/src/rps/test_service_rps_sampler_elem.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_service_rps_sampler_elem.c diff --git a/src/rps/test_service_rps_view.c b/src/rps/test_service_rps_view.c index f5a59cb0d7..16cf4b8320 100644 --- a/src/rps/test_service_rps_view.c +++ b/src/rps/test_service_rps_view.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file rps/test_service_rps_view.c diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c index 6c8a947a92..4bb0e0d50b 100644 --- a/src/scalarproduct/gnunet-scalarproduct.c +++ b/src/scalarproduct/gnunet-scalarproduct.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h index f33ad2a90a..29161a8fc6 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc.h +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc.h diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c index a0f71c5114..a71e0d1c8f 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc_alice.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index f6382cb54b..c6424ffcb8 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct-ecc_bob.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h b/src/scalarproduct/gnunet-service-scalarproduct.h index 91652bcf01..e0551ca3d2 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct.h +++ b/src/scalarproduct/gnunet-service-scalarproduct.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct.h diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c index 1a76a3ffb9..c7550ca85f 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct_alice.c diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index a4b394537a..84223cc8ef 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/gnunet-service-scalarproduct_bob.c diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h index c9ea3aeb00..d4b0d5b887 100644 --- a/src/scalarproduct/scalarproduct.h +++ b/src/scalarproduct/scalarproduct.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct.h diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c index 1b72c55f1d..529d45fbe3 100644 --- a/src/scalarproduct/scalarproduct_api.c +++ b/src/scalarproduct/scalarproduct_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file scalarproduct/scalarproduct_api.c diff --git a/src/scalarproduct/test_ecc_scalarproduct.c b/src/scalarproduct/test_ecc_scalarproduct.c index 8fbc126df0..0fcb111395 100644 --- a/src/scalarproduct/test_ecc_scalarproduct.c +++ b/src/scalarproduct/test_ecc_scalarproduct.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index 774e727212..12c97e2ba7 100644 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index 5c81080d3d..505af0fbae 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/secretsharing/secretsharing.h b/src/secretsharing/secretsharing.h index 61e280797e..cc485fd8a3 100644 --- a/src/secretsharing/secretsharing.h +++ b/src/secretsharing/secretsharing.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c index 744a3443b0..cfb13f5201 100644 --- a/src/secretsharing/secretsharing_api.c +++ b/src/secretsharing/secretsharing_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/secretsharing/secretsharing_common.c b/src/secretsharing/secretsharing_common.c index 7f8f050a6c..d5699d76e3 100644 --- a/src/secretsharing/secretsharing_common.c +++ b/src/secretsharing/secretsharing_common.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #include "secretsharing.h" diff --git a/src/secretsharing/secretsharing_protocol.h b/src/secretsharing/secretsharing_protocol.h index be47053467..7627deb301 100644 --- a/src/secretsharing/secretsharing_protocol.h +++ b/src/secretsharing/secretsharing_protocol.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/secretsharing/test_secretsharing_api.c b/src/secretsharing/test_secretsharing_api.c index 375daa2422..f5814132f7 100644 --- a/src/secretsharing/test_secretsharing_api.c +++ b/src/secretsharing/test_secretsharing_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 698ec65a4d..217b89d6d6 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set.c diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h index 9fa585d0f3..c9e59b441e 100644 --- a/src/set/gnunet-service-set.h +++ b/src/set/gnunet-service-set.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set.h diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index bdd2714601..0561df4060 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set_intersection.c diff --git a/src/set/gnunet-service-set_intersection.h b/src/set/gnunet-service-set_intersection.h index cce97f60ff..a3a3172f6b 100644 --- a/src/set/gnunet-service-set_intersection.h +++ b/src/set/gnunet-service-set_intersection.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set_intersection.h diff --git a/src/set/gnunet-service-set_protocol.h b/src/set/gnunet-service-set_protocol.h index d1c60f48b9..6ec08ce220 100644 --- a/src/set/gnunet-service-set_protocol.h +++ b/src/set/gnunet-service-set_protocol.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @author Florian Dold diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 440d0d1b0d..7af2203749 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set_union.c diff --git a/src/set/gnunet-service-set_union.h b/src/set/gnunet-service-set_union.h index ba02ad20d3..a4dff48855 100644 --- a/src/set/gnunet-service-set_union.h +++ b/src/set/gnunet-service-set_union.h @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set_union.h diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c index ebdf030a65..16b7fd234e 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.c +++ b/src/set/gnunet-service-set_union_strata_estimator.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/gnunet-service-set_union_strata_estimator.c diff --git a/src/set/gnunet-service-set_union_strata_estimator.h b/src/set/gnunet-service-set_union_strata_estimator.h index 0abe162da8..3e4dfa93b2 100644 --- a/src/set/gnunet-service-set_union_strata_estimator.h +++ b/src/set/gnunet-service-set_union_strata_estimator.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/gnunet-set-ibf-profiler.c b/src/set/gnunet-set-ibf-profiler.c index e66b384233..e1a2f4aa83 100644 --- a/src/set/gnunet-set-ibf-profiler.c +++ b/src/set/gnunet-set-ibf-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index 6d6d3e247c..2a7d5174c9 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/ibf.c b/src/set/ibf.c index 5427847591..0cfd151095 100644 --- a/src/set/ibf.c +++ b/src/set/ibf.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/ibf.h b/src/set/ibf.h index 8da6cb11b5..07c3236359 100644 --- a/src/set/ibf.h +++ b/src/set/ibf.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/ibf_sim.c b/src/set/ibf_sim.c index 65c852af5f..1ec90e87b3 100644 --- a/src/set/ibf_sim.c +++ b/src/set/ibf_sim.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/plugin_block_set_test.c b/src/set/plugin_block_set_test.c index 789f787d86..d8021886d6 100644 --- a/src/set/plugin_block_set_test.c +++ b/src/set/plugin_block_set_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/set.h b/src/set/set.h index 0af9536888..06d8382f9f 100644 --- a/src/set/set.h +++ b/src/set/set.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/set.h diff --git a/src/set/set_api.c b/src/set/set_api.c index 7ca6116798..ec06af5202 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file set/set_api.c diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c index c694365e10..736abf025e 100644 --- a/src/set/test_set_api.c +++ b/src/set/test_set_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c index 0ac21846b7..63f8c2360b 100644 --- a/src/set/test_set_intersection_result_full.c +++ b/src/set/test_set_intersection_result_full.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/test_set_union_copy.c b/src/set/test_set_union_copy.c index 63171c1414..d63bcd3d2b 100644 --- a/src/set/test_set_union_copy.c +++ b/src/set/test_set_union_copy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/set/test_set_union_result_symmetric.c b/src/set/test_set_union_result_symmetric.c index 6b38ff500d..10d031cc41 100644 --- a/src/set/test_set_union_result_symmetric.c +++ b/src/set/test_set_union_result_symmetric.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 62c822547e..7e2c6efefe 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index 9bc85ad165..9cff2da126 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/social/social.h b/src/social/social.h index 6334935aa6..9464db19de 100644 --- a/src/social/social.h +++ b/src/social/social.h @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/social/social_api.c b/src/social/social_api.c index 7fb21371d9..189d1256fb 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** diff --git a/src/social/test_social.c b/src/social/test_social.c index 926a49fba4..ffc790052c 100644 --- a/src/social/test_social.c +++ b/src/social/test_social.c @@ -11,6 +11,9 @@ * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . */ /** * @file social/test_social.c diff --git a/src/sq/sq.c b/src/sq/sq.c index 43539fbc04..1281da82e3 100644 --- a/src/sq/sq.c +++ b/src/sq/sq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/sq.c diff --git a/src/sq/sq_exec.c b/src/sq/sq_exec.c index 27173c096b..34a54dcca4 100644 --- a/src/sq/sq_exec.c +++ b/src/sq/sq_exec.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/sq_exec.c diff --git a/src/sq/sq_prepare.c b/src/sq/sq_prepare.c index 838451fcb6..8c46302f25 100644 --- a/src/sq/sq_prepare.c +++ b/src/sq/sq_prepare.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/sq_prepare.c diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c index 7572ba0f00..5f15fcec17 100644 --- a/src/sq/sq_query_helper.c +++ b/src/sq/sq_query_helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/sq_query_helper.c diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c index 93ce848565..ebbd4f814e 100644 --- a/src/sq/sq_result_helper.c +++ b/src/sq/sq_result_helper.c @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/sq_result_helper.c diff --git a/src/sq/test_sq.c b/src/sq/test_sq.c index 9b5d805f2e..3d7685c6ec 100644 --- a/src/sq/test_sq.c +++ b/src/sq/test_sq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file sq/test_sq.c diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c index 256c6c9f13..f9877301b3 100644 --- a/src/statistics/gnunet-service-statistics.c +++ b/src/statistics/gnunet-service-statistics.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c index af84455f65..648fc89bb1 100644 --- a/src/statistics/gnunet-statistics.c +++ b/src/statistics/gnunet-statistics.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/statistics/statistics.h b/src/statistics/statistics.h index d3293448f8..c05b5e2229 100644 --- a/src/statistics/statistics.h +++ b/src/statistics/statistics.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c index f5a1b30076..35390ffca6 100644 --- a/src/statistics/statistics_api.c +++ b/src/statistics/statistics_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c index 0e980a8e0b..6831f1e5b0 100644 --- a/src/statistics/test_statistics_api.c +++ b/src/statistics/test_statistics_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file statistics/test_statistics_api.c diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c index aada36de07..87cfaff594 100644 --- a/src/statistics/test_statistics_api_loop.c +++ b/src/statistics/test_statistics_api_loop.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file statistics/test_statistics_api_loop.c diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c index 122b5a29bf..ced14e6b5f 100644 --- a/src/statistics/test_statistics_api_watch.c +++ b/src/statistics/test_statistics_api_watch.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file statistics/test_statistics_api_watch.c diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c index 8d433e08a3..f36cc83924 100644 --- a/src/statistics/test_statistics_api_watch_zero_value.c +++ b/src/statistics/test_statistics_api_watch_zero_value.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file statistics/test_statistics_api_watch_zero_value.c diff --git a/src/template/gnunet-service-template.c b/src/template/gnunet-service-template.c index c6d149c6bd..45209f6fed 100644 --- a/src/template/gnunet-service-template.c +++ b/src/template/gnunet-service-template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/template/gnunet-template.c b/src/template/gnunet-template.c index 42215ff230..87053f4033 100644 --- a/src/template/gnunet-template.c +++ b/src/template/gnunet-template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/template/test_template_api.c b/src/template/test_template_api.c index 1aee521524..2ec3092531 100644 --- a/src/template/test_template_api.c +++ b/src/template/test_template_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file template/test_template_api.c diff --git a/src/testbed-logger/gnunet-service-testbed-logger.c b/src/testbed-logger/gnunet-service-testbed-logger.c index 4c9fced7e2..39c3393497 100644 --- a/src/testbed-logger/gnunet-service-testbed-logger.c +++ b/src/testbed-logger/gnunet-service-testbed-logger.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed-logger/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c index 4dca572fa3..594711e43f 100644 --- a/src/testbed-logger/test_testbed_logger_api.c +++ b/src/testbed-logger/test_testbed_logger_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file testbed-logger/test_testbed_logger_api.c diff --git a/src/testbed-logger/testbed_logger_api.c b/src/testbed-logger/testbed_logger_api.c index fbd4c494f4..345199c8ef 100644 --- a/src/testbed-logger/testbed_logger_api.c +++ b/src/testbed-logger/testbed_logger_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in index 19d6f51c32..01a3eb6df7 100644 --- a/src/testbed/buildvars.py.in +++ b/src/testbed/buildvars.py.in @@ -10,6 +10,9 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # file: testbed/buildvars.py diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c index 1518b0004b..9d527d27fd 100644 --- a/src/testbed/generate-underlay-topology.c +++ b/src/testbed/generate-underlay-topology.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c index 5f269966b6..015b9cc694 100644 --- a/src/testbed/gnunet-daemon-latency-logger.c +++ b/src/testbed/gnunet-daemon-latency-logger.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index 1d725ebac3..e813539182 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c index 0fadfe85be..f282e8e5fa 100644 --- a/src/testbed/gnunet-daemon-testbed-underlay.c +++ b/src/testbed/gnunet-daemon-testbed-underlay.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index b4d20f9b08..1ac1b9e7ec 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c index 634d0baf44..3fc2695a39 100644 --- a/src/testbed/gnunet-service-test-barriers.c +++ b/src/testbed/gnunet-service-test-barriers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index b810448869..a668b3ff07 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h index 52f5442310..c1c5b9e875 100644 --- a/src/testbed/gnunet-service-testbed.h +++ b/src/testbed/gnunet-service-testbed.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c index 0d73a33ff2..0e4b37586e 100644 --- a/src/testbed/gnunet-service-testbed_barriers.c +++ b/src/testbed/gnunet-service-testbed_barriers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_barriers.h b/src/testbed/gnunet-service-testbed_barriers.h index a713f545d5..d2b8b0da3c 100644 --- a/src/testbed/gnunet-service-testbed_barriers.h +++ b/src/testbed/gnunet-service-testbed_barriers.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index d9ee707fa6..6b714b5e60 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index 40ddc8b65c..a907dcf03b 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_connectionpool.h b/src/testbed/gnunet-service-testbed_connectionpool.h index 8957921ba8..3a28d930ed 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.h +++ b/src/testbed/gnunet-service-testbed_connectionpool.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c index 89f5a1cc9a..f193b98cd5 100644 --- a/src/testbed/gnunet-service-testbed_cpustatus.c +++ b/src/testbed/gnunet-service-testbed_cpustatus.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c index 1b3a5d17b4..984e6c1a65 100644 --- a/src/testbed/gnunet-service-testbed_links.c +++ b/src/testbed/gnunet-service-testbed_links.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_links.h b/src/testbed/gnunet-service-testbed_links.h index e380a58ff9..36e6401806 100644 --- a/src/testbed/gnunet-service-testbed_links.h +++ b/src/testbed/gnunet-service-testbed_links.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_meminfo.c b/src/testbed/gnunet-service-testbed_meminfo.c index 38f38f0b16..803fabc0a4 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.c +++ b/src/testbed/gnunet-service-testbed_meminfo.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #include "platform.h" diff --git a/src/testbed/gnunet-service-testbed_meminfo.h b/src/testbed/gnunet-service-testbed_meminfo.h index c54a661996..d5e89bc61b 100644 --- a/src/testbed/gnunet-service-testbed_meminfo.h +++ b/src/testbed/gnunet-service-testbed_meminfo.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /* obsolete */ diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index f6003ba111..a20cafac29 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index e29192c142..ff8ca02e07 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 5ab66358a9..ac20378b6e 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c index 3bd6f19f98..f4804c352b 100644 --- a/src/testbed/test_gnunet_helper_testbed.c +++ b/src/testbed/test_gnunet_helper_testbed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index bd2b221ed1..56ff4bf914 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index c8b98cc39a..0bbc184d0b 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index 3e2a094d92..4e67ef152c 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c index 33e69c204e..08e3d4089c 100644 --- a/src/testbed/test_testbed_api_barriers.c +++ b/src/testbed/test_testbed_api_barriers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index aa37c4f221..cd7eb950a0 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_hosts.c b/src/testbed/test_testbed_api_hosts.c index caad7fc05c..55933950a6 100644 --- a/src/testbed/test_testbed_api_hosts.c +++ b/src/testbed/test_testbed_api_hosts.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index 38548a87a8..abdfa18903 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c index 58a92fb943..e9b748c82c 100644 --- a/src/testbed/test_testbed_api_peer_reconfiguration.c +++ b/src/testbed/test_testbed_api_peer_reconfiguration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c index 63ecc8fb5c..0c4cf578cd 100644 --- a/src/testbed/test_testbed_api_peers_manage_services.c +++ b/src/testbed/test_testbed_api_peers_manage_services.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_sd.c b/src/testbed/test_testbed_api_sd.c index 8d83acca13..a8f1c155e5 100644 --- a/src/testbed/test_testbed_api_sd.c +++ b/src/testbed/test_testbed_api_sd.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index e3c9719ea2..5b5c30e5c2 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c index 6d5b1b3afa..a639c9bd35 100644 --- a/src/testbed/test_testbed_api_test.c +++ b/src/testbed/test_testbed_api_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c index cd7fbda38f..da30d78076 100644 --- a/src/testbed/test_testbed_api_test_timeout.c +++ b/src/testbed/test_testbed_api_test_timeout.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index fe4e501494..bbf29244e9 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 9d267b5a9c..b3b16b55fb 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 775325c7fc..69315f95c4 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c index 7b73860f97..3b4742b47c 100644 --- a/src/testbed/test_testbed_underlay.c +++ b/src/testbed/test_testbed_underlay.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index a433594af2..b6ce7fb093 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 69d86ea305..a643aacdd4 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index 981a6311b3..c8a381685c 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index ddf80a359b..efac01c0cc 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 0ccc534c23..2c25eabcf8 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_hosts.h b/src/testbed/testbed_api_hosts.h index 1b19a4cab9..1dcfc06b2e 100644 --- a/src/testbed/testbed_api_hosts.h +++ b/src/testbed/testbed_api_hosts.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index d0c7092ce6..4bb581c7a6 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index 235631a0f4..c40141fc61 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index 0ca798feae..f5efa6a731 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_peers.h b/src/testbed/testbed_api_peers.h index e361fe3963..0a38c005bc 100644 --- a/src/testbed/testbed_api_peers.h +++ b/src/testbed/testbed_api_peers.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_sd.c b/src/testbed/testbed_api_sd.c index 88647bf843..3daad15135 100644 --- a/src/testbed/testbed_api_sd.c +++ b/src/testbed/testbed_api_sd.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_sd.h b/src/testbed/testbed_api_sd.h index ff3c930e9b..4852e7f538 100644 --- a/src/testbed/testbed_api_sd.h +++ b/src/testbed/testbed_api_sd.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c index 8450b0aa0c..6483ae514b 100644 --- a/src/testbed/testbed_api_services.c +++ b/src/testbed/testbed_api_services.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c index 2b32c6e843..c0d72ffdc7 100644 --- a/src/testbed/testbed_api_statistics.c +++ b/src/testbed/testbed_api_statistics.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c index 715d0977ac..ccf341d60f 100644 --- a/src/testbed/testbed_api_test.c +++ b/src/testbed/testbed_api_test.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c index f22c838732..ab02487d9b 100644 --- a/src/testbed/testbed_api_testbed.c +++ b/src/testbed/testbed_api_testbed.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index 39d695d4c0..51a8b979a5 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_topology.h b/src/testbed/testbed_api_topology.h index 6cf8e5b7ae..43ffda4fb6 100644 --- a/src/testbed/testbed_api_topology.h +++ b/src/testbed/testbed_api_topology.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_api_underlay.c b/src/testbed/testbed_api_underlay.c index e09c7ec7af..5b0aa8c896 100644 --- a/src/testbed/testbed_api_underlay.c +++ b/src/testbed/testbed_api_underlay.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h index 3d34538af7..5f781478ab 100644 --- a/src/testbed/testbed_helper.h +++ b/src/testbed/testbed_helper.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c index 4f77d26c1f..f0a9bc66ae 100644 --- a/src/testing/gnunet-testing.c +++ b/src/testing/gnunet-testing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c index 7c3337d217..5ffdb950ad 100644 --- a/src/testing/test_testing_peerstartup.c +++ b/src/testing/test_testing_peerstartup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c index 4341845534..9dfa9717a8 100644 --- a/src/testing/test_testing_peerstartup2.c +++ b/src/testing/test_testing_peerstartup2.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/test_testing_portreservation.c b/src/testing/test_testing_portreservation.c index 282df6ee2b..2e2f4373eb 100644 --- a/src/testing/test_testing_portreservation.c +++ b/src/testing/test_testing_portreservation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/test_testing_servicestartup.c b/src/testing/test_testing_servicestartup.c index 8dec786a08..f36305228b 100644 --- a/src/testing/test_testing_servicestartup.c +++ b/src/testing/test_testing_servicestartup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/test_testing_sharedservices.c b/src/testing/test_testing_sharedservices.c index 98110aa293..45fac15903 100644 --- a/src/testing/test_testing_sharedservices.c +++ b/src/testing/test_testing_sharedservices.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/testing/testing.c b/src/testing/testing.c index 51fab0027e..8205da91f3 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/topology/friends.c b/src/topology/friends.c index c97e815642..ba081a3a27 100644 --- a/src/topology/friends.c +++ b/src/topology/friends.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 44446270cd..829fb53528 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/topology/test_gnunet_daemon_topology.c b/src/topology/test_gnunet_daemon_topology.c index d8dc6937d2..7c75d1137f 100644 --- a/src/topology/test_gnunet_daemon_topology.c +++ b/src/topology/test_gnunet_daemon_topology.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file topology/test_gnunet_daemon_topology.c diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 7fa8c71e7f..27d862f229 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c @@ -13,6 +13,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ #include "gnunet_config.h" diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c index 2f93d488df..7b24caf4e9 100644 --- a/src/transport/gnunet-helper-transport-wlan-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/gnunet-helper-transport-wlan-dummy.c diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index 2912fca32a..59a2d8b567 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c @@ -13,6 +13,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/transport/gnunet-helper-transport-wlan.c diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 5a486e2946..6ebc6da8c4 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/gnunet-service-transport.c diff --git a/src/transport/gnunet-service-transport.h b/src/transport/gnunet-service-transport.h index 153c28f0dd..fd852f0279 100644 --- a/src/transport/gnunet-service-transport.h +++ b/src/transport/gnunet-service-transport.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c index 719b3ad785..8b3b998c89 100644 --- a/src/transport/gnunet-service-transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/gnunet-service-transport_ats.c diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h index 4d3dc6c6f4..139c04c3bc 100644 --- a/src/transport/gnunet-service-transport_ats.h +++ b/src/transport/gnunet-service-transport_ats.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/gnunet-service-transport_ats.h diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c index 8bc1fdb928..cfd8c0f663 100644 --- a/src/transport/gnunet-service-transport_hello.c +++ b/src/transport/gnunet-service-transport_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h index 86c961232b..e4e35167f5 100644 --- a/src/transport/gnunet-service-transport_hello.h +++ b/src/transport/gnunet-service-transport_hello.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/gnunet-service-transport_hello.h diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index f981913282..013b14cce6 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_manipulation.h b/src/transport/gnunet-service-transport_manipulation.h index 8c86b5cdc1..ee72478b60 100644 --- a/src/transport/gnunet-service-transport_manipulation.h +++ b/src/transport/gnunet-service-transport_manipulation.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index a673ff3ee1..b1f3965ad2 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 1d534a2fee..c8da984230 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c index 09a8f633a2..9c30444508 100644 --- a/src/transport/gnunet-service-transport_plugins.c +++ b/src/transport/gnunet-service-transport_plugins.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h index 49c046ebac..3cc3bb9014 100644 --- a/src/transport/gnunet-service-transport_plugins.h +++ b/src/transport/gnunet-service-transport_plugins.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index bfb4f15430..eecc54efa8 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-service-transport_validation.h b/src/transport/gnunet-service-transport_validation.h index c4e939b685..8d11413db7 100644 --- a/src/transport/gnunet-service-transport_validation.h +++ b/src/transport/gnunet-service-transport_validation.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-transport-certificate-creation.c b/src/transport/gnunet-transport-certificate-creation.c index 4377f3aeb4..8b536ba499 100644 --- a/src/transport/gnunet-transport-certificate-creation.c +++ b/src/transport/gnunet-transport-certificate-creation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c index f7574f4442..951975f03d 100644 --- a/src/transport/gnunet-transport-profiler.c +++ b/src/transport/gnunet-transport-profiler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-transport-wlan-receiver.c b/src/transport/gnunet-transport-wlan-receiver.c index a895acb819..930d29e9e0 100644 --- a/src/transport/gnunet-transport-wlan-receiver.c +++ b/src/transport/gnunet-transport-wlan-receiver.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c index 58b35423e2..0c0326b8fa 100644 --- a/src/transport/gnunet-transport-wlan-sender.c +++ b/src/transport/gnunet-transport-wlan-sender.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index a852e97824..fed509fe11 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_http.h b/src/transport/plugin_transport_http.h index de82ecc909..a21904edd9 100644 --- a/src/transport/plugin_transport_http.h +++ b/src/transport/plugin_transport_http.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index b1a92f1081..0afb549431 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index 02f7144066..e9576d72bb 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index 2cb48e3a2d..ac62f6ee48 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/plugin_transport_http_common.c diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 1ce918ce3b..abf60280ad 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c index 97fba52cb8..8898bd827f 100644 --- a/src/transport/plugin_transport_smtp.c +++ b/src/transport/plugin_transport_smtp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 5c17a5a08e..75a8855354 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/plugin_transport_tcp.c diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c index d6d3f0d5e8..679d83daa4 100644 --- a/src/transport/plugin_transport_template.c +++ b/src/transport/plugin_transport_template.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index b3bed2dbb7..abbcca2aee 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_udp.h b/src/transport/plugin_transport_udp.h index 6e37e2ab7c..5a2fa6f05c 100644 --- a/src/transport/plugin_transport_udp.h +++ b/src/transport/plugin_transport_udp.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_udp_broadcasting.c b/src/transport/plugin_transport_udp_broadcasting.c index 443fcf1ce2..bcb622a46a 100644 --- a/src/transport/plugin_transport_udp_broadcasting.c +++ b/src/transport/plugin_transport_udp_broadcasting.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c index d4af540c8a..3d177e7030 100644 --- a/src/transport/plugin_transport_unix.c +++ b/src/transport/plugin_transport_unix.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 9070a1c71e..13d2ca466c 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h index dcccfd9b47..ad16a267e2 100644 --- a/src/transport/plugin_transport_wlan.h +++ b/src/transport/plugin_transport_wlan.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_xt.c b/src/transport/plugin_transport_xt.c index 66190f9f25..0f517dd0ca 100644 --- a/src/transport/plugin_transport_xt.c +++ b/src/transport/plugin_transport_xt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/plugin_transport_xt.c diff --git a/src/transport/plugin_transport_xu.c b/src/transport/plugin_transport_xu.c index fd0757c075..59e00f80eb 100644 --- a/src/transport/plugin_transport_xu.c +++ b/src/transport/plugin_transport_xu.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/plugin_transport_xu.h b/src/transport/plugin_transport_xu.h index f178fdbff8..cbf9706b61 100644 --- a/src/transport/plugin_transport_xu.h +++ b/src/transport/plugin_transport_xu.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c index 97208688da..66902c6a00 100644 --- a/src/transport/tcp_connection_legacy.c +++ b/src/transport/tcp_connection_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c index 7b67986a2a..4744e20d81 100644 --- a/src/transport/tcp_server_legacy.c +++ b/src/transport/tcp_server_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c index 9db62bef7d..5bd9ba35e6 100644 --- a/src/transport/tcp_server_mst_legacy.c +++ b/src/transport/tcp_server_mst_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c index ad9ede6f5c..b7ea9b20a8 100644 --- a/src/transport/tcp_service_legacy.c +++ b/src/transport/tcp_service_legacy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c index 926e735d18..bad06b89d0 100644 --- a/src/transport/test_http_common.c +++ b/src/transport/test_http_common.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_http_common.c diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c index 6745299457..85ab9659d1 100644 --- a/src/transport/test_plugin_transport.c +++ b/src/transport/test_plugin_transport.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_plugin_transport.c diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c index d2384b89ed..0ef3c864a0 100644 --- a/src/transport/test_quota_compliance.c +++ b/src/transport/test_quota_compliance.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_quota_compliance.c diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c index d9037fe98d..0414673f42 100644 --- a/src/transport/test_transport_address_switch.c +++ b/src/transport/test_transport_address_switch.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_address_switch.c diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c index 2ac4b5255c..847b9f56ab 100644 --- a/src/transport/test_transport_api.c +++ b/src/transport/test_transport_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api.c diff --git a/src/transport/test_transport_api_blacklisting.c b/src/transport/test_transport_api_blacklisting.c index 4816754f2e..427240b29d 100644 --- a/src/transport/test_transport_api_blacklisting.c +++ b/src/transport/test_transport_api_blacklisting.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index db3f159acc..85bfb73683 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_disconnect.c diff --git a/src/transport/test_transport_api_limited_sockets.c b/src/transport/test_transport_api_limited_sockets.c index d9c6e9500b..bba695bb5a 100644 --- a/src/transport/test_transport_api_limited_sockets.c +++ b/src/transport/test_transport_api_limited_sockets.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_limited_sockets.c diff --git a/src/transport/test_transport_api_manipulation_cfg.c b/src/transport/test_transport_api_manipulation_cfg.c index dd6888fa9c..4cab840665 100644 --- a/src/transport/test_transport_api_manipulation_cfg.c +++ b/src/transport/test_transport_api_manipulation_cfg.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_manipulation_cfg.c diff --git a/src/transport/test_transport_api_manipulation_recv_tcp.c b/src/transport/test_transport_api_manipulation_recv_tcp.c index 102bb1d968..40e0b6a4db 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp.c +++ b/src/transport/test_transport_api_manipulation_recv_tcp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_manipulation_recv_tcp.c diff --git a/src/transport/test_transport_api_manipulation_send_tcp.c b/src/transport/test_transport_api_manipulation_send_tcp.c index d24d69c90f..278ec45c54 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp.c +++ b/src/transport/test_transport_api_manipulation_send_tcp.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_manipulation_send_tcp.c diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c index 55c8ec70a3..8a01b15a3d 100644 --- a/src/transport/test_transport_api_monitor_peers.c +++ b/src/transport/test_transport_api_monitor_peers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_monitor_peers.c diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index 898b3845aa..86e2a7e9d4 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_reliability.c diff --git a/src/transport/test_transport_api_restart_reconnect.c b/src/transport/test_transport_api_restart_reconnect.c index 75654cc837..fc0c202337 100644 --- a/src/transport/test_transport_api_restart_reconnect.c +++ b/src/transport/test_transport_api_restart_reconnect.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_restart_reconnect.c diff --git a/src/transport/test_transport_api_timeout.c b/src/transport/test_transport_api_timeout.c index eae5c9c6d3..0185b690b1 100644 --- a/src/transport/test_transport_api_timeout.c +++ b/src/transport/test_transport_api_timeout.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_api_timeout.c diff --git a/src/transport/test_transport_blacklisting.c b/src/transport/test_transport_blacklisting.c index cc14f32894..6871d01b1f 100644 --- a/src/transport/test_transport_blacklisting.c +++ b/src/transport/test_transport_blacklisting.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/test_transport_testing_restart.c b/src/transport/test_transport_testing_restart.c index 1a4997edd2..0afa08fd02 100644 --- a/src/transport/test_transport_testing_restart.c +++ b/src/transport/test_transport_testing_restart.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_testing_restart.c diff --git a/src/transport/test_transport_testing_startstop.c b/src/transport/test_transport_testing_startstop.c index dc2a780ab6..d307f87228 100644 --- a/src/transport/test_transport_testing_startstop.c +++ b/src/transport/test_transport_testing_startstop.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/test_transport_testing_startstop.c diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c index 0307531c34..ac42388fbf 100644 --- a/src/transport/transport-testing-filenames.c +++ b/src/transport/transport-testing-filenames.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport-testing-filenames.c diff --git a/src/transport/transport-testing-loggers.c b/src/transport/transport-testing-loggers.c index 69b5627dbb..4feba1d428 100644 --- a/src/transport/transport-testing-loggers.c +++ b/src/transport/transport-testing-loggers.c @@ -12,6 +12,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport-testing-loggers.c diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c index 7477c4f788..1fa4b27316 100644 --- a/src/transport/transport-testing-main.c +++ b/src/transport/transport-testing-main.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport-testing-main.c diff --git a/src/transport/transport-testing-send.c b/src/transport/transport-testing-send.c index 177adc0313..8dac9453e8 100644 --- a/src/transport/transport-testing-send.c +++ b/src/transport/transport-testing-send.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport-testing-send.c diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index 7690bdeb09..e3d4b7a9bd 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport-testing.c diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h index c2d2126236..a4cfd89f62 100644 --- a/src/transport/transport-testing.h +++ b/src/transport/transport-testing.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport.h b/src/transport/transport.h index 0ad7927329..75726e4622 100644 --- a/src/transport/transport.h +++ b/src/transport/transport.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index 6a6c25750a..258bf19c9f 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file transport/transport_api_address_to_string.c diff --git a/src/transport/transport_api_blacklist.c b/src/transport/transport_api_blacklist.c index 946b2c99f5..87fdce7249 100644 --- a/src/transport/transport_api_blacklist.c +++ b/src/transport/transport_api_blacklist.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c index 239e64f528..b7edc3cc1a 100644 --- a/src/transport/transport_api_core.c +++ b/src/transport/transport_api_core.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_hello_get.c b/src/transport/transport_api_hello_get.c index a951034b46..1831354585 100644 --- a/src/transport/transport_api_hello_get.c +++ b/src/transport/transport_api_hello_get.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_manipulation.c b/src/transport/transport_api_manipulation.c index fbf153b744..e7ecd2e428 100644 --- a/src/transport/transport_api_manipulation.c +++ b/src/transport/transport_api_manipulation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c index af67ecec75..c48a0e4bb5 100644 --- a/src/transport/transport_api_monitor_peers.c +++ b/src/transport/transport_api_monitor_peers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c index 95007b48b9..c349144aa9 100644 --- a/src/transport/transport_api_monitor_plugins.c +++ b/src/transport/transport_api_monitor_plugins.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c index 4b4b41b796..b976a0272e 100644 --- a/src/transport/transport_api_offer_hello.c +++ b/src/transport/transport_api_offer_hello.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/tun/regex.c b/src/tun/regex.c index 1c6bb8448a..7565a9eacd 100644 --- a/src/tun/regex.c +++ b/src/tun/regex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file src/tun/regex.c diff --git a/src/tun/test_regex.c b/src/tun/test_regex.c index c2ed35ea42..2e7d528280 100644 --- a/src/tun/test_regex.c +++ b/src/tun/test_regex.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file tun/test_regex.c diff --git a/src/tun/test_tun.c b/src/tun/test_tun.c index 6923486f40..edbd4c05d6 100644 --- a/src/tun/test_tun.c +++ b/src/tun/test_tun.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/tun/tun.c b/src/tun/tun.c index 167d963202..f85f72209c 100644 --- a/src/tun/tun.c +++ b/src/tun/tun.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index 3d5ffb8a8e..5e0bae539a 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/bio.c b/src/util/bio.c index 2c2f4980fa..a31e5448f3 100644 --- a/src/util/bio.c +++ b/src/util/bio.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/bio.c diff --git a/src/util/client.c b/src/util/client.c index 18b4cbbc9f..44e326eab3 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index dc428871ad..53e1a67076 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/common_endian.c b/src/util/common_endian.c index 6adef8b4ef..502e1e3a3c 100644 --- a/src/util/common_endian.c +++ b/src/util/common_endian.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/common_logging.c b/src/util/common_logging.c index 11f71ebadb..85e17248bd 100644 --- a/src/util/common_logging.c +++ b/src/util/common_logging.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/configuration.c b/src/util/configuration.c index a0196f4ca4..9a583dfdba 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c index d65f5f9971..45711e0fd1 100644 --- a/src/util/configuration_loader.c +++ b/src/util/configuration_loader.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c index c864f5a146..5f2fdd3ad3 100644 --- a/src/util/container_bloomfilter.c +++ b/src/util/container_bloomfilter.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/container_bloomfilter.c diff --git a/src/util/container_heap.c b/src/util/container_heap.c index 70c1e03925..5a0ae0002f 100644 --- a/src/util/container_heap.c +++ b/src/util/container_heap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c index a7672be734..3859d8e64b 100644 --- a/src/util/container_meta_data.c +++ b/src/util/container_meta_data.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/container_multihashmap.c b/src/util/container_multihashmap.c index f9ae4b366e..1811f861f8 100644 --- a/src/util/container_multihashmap.c +++ b/src/util/container_multihashmap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/container_multihashmap.c diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c index 142d03f4c7..daf5059b65 100644 --- a/src/util/container_multihashmap32.c +++ b/src/util/container_multihashmap32.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/container_multihashmap32.c diff --git a/src/util/container_multipeermap.c b/src/util/container_multipeermap.c index 3c65e7e29d..ede2fd8b79 100644 --- a/src/util/container_multipeermap.c +++ b/src/util/container_multipeermap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/container_multipeermap.c diff --git a/src/util/container_multishortmap.c b/src/util/container_multishortmap.c index 45c3949531..f815b62387 100644 --- a/src/util/container_multishortmap.c +++ b/src/util/container_multishortmap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/container_multishortmap.c diff --git a/src/util/crypto_abe.c b/src/util/crypto_abe.c index d3c3a19940..581e637646 100644 --- a/src/util/crypto_abe.c +++ b/src/util/crypto_abe.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/util/crypto_bug.c b/src/util/crypto_bug.c index 255f4ec24d..aea801d408 100644 --- a/src/util/crypto_bug.c +++ b/src/util/crypto_bug.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c index 12cb169e87..b8fd8059d5 100644 --- a/src/util/crypto_crc.c +++ b/src/util/crypto_crc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . For the actual CRC-32 code: Copyright abandoned; this code is in the public domain. diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c index 4c838d4495..789d350ff6 100644 --- a/src/util/crypto_ecc.c +++ b/src/util/crypto_ecc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_ecc_dlog.c b/src/util/crypto_ecc_dlog.c index 1a2c670bdb..9d36743193 100644 --- a/src/util/crypto_ecc_dlog.c +++ b/src/util/crypto_ecc_dlog.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c index feb34653cb..1316a900c7 100644 --- a/src/util/crypto_ecc_setup.c +++ b/src/util/crypto_ecc_setup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c index dbc4c07a3e..8410b7835f 100644 --- a/src/util/crypto_hash.c +++ b/src/util/crypto_hash.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_hash_file.c b/src/util/crypto_hash_file.c index 4da09ce081..4d9824d223 100644 --- a/src/util/crypto_hash_file.c +++ b/src/util/crypto_hash_file.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c index fdc1348f1a..0fc6996eb4 100644 --- a/src/util/crypto_kdf.c +++ b/src/util/crypto_kdf.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c index 793c7aea71..0cb49d62f9 100644 --- a/src/util/crypto_mpi.c +++ b/src/util/crypto_mpi.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_paillier.c b/src/util/crypto_paillier.c index c9e777b374..416240ea49 100644 --- a/src/util/crypto_paillier.c +++ b/src/util/crypto_paillier.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c index 1ed82170ef..2163a9731a 100644 --- a/src/util/crypto_random.c +++ b/src/util/crypto_random.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c index 67dfec57b9..1225aba73b 100644 --- a/src/util/crypto_rsa.c +++ b/src/util/crypto_rsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c index 0862c3af7a..f7d7b4a7ab 100644 --- a/src/util/crypto_symmetric.c +++ b/src/util/crypto_symmetric.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/disk.c b/src/util/disk.c index 151f65662d..31e8f12c6a 100644 --- a/src/util/disk.c +++ b/src/util/disk.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/disk.c diff --git a/src/util/disk.h b/src/util/disk.h index a6f563e24f..629971d81a 100644 --- a/src/util/disk.h +++ b/src/util/disk.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c index f3b7d0b020..c55b22fb62 100644 --- a/src/util/getopt_helpers.c +++ b/src/util/getopt_helpers.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c index c01528a450..16b826ee2f 100644 --- a/src/util/gnunet-config.c +++ b/src/util/gnunet-config.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c index 8c5a72742a..4389994025 100644 --- a/src/util/gnunet-ecc.c +++ b/src/util/gnunet-ecc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-helper-w32-console.c b/src/util/gnunet-helper-w32-console.c index 360c6ac676..3540cae8ae 100644 --- a/src/util/gnunet-helper-w32-console.c +++ b/src/util/gnunet-helper-w32-console.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-helper-w32-console.h b/src/util/gnunet-helper-w32-console.h index c854ec059a..d70b0e32a6 100644 --- a/src/util/gnunet-helper-w32-console.h +++ b/src/util/gnunet-helper-w32-console.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-resolver.c b/src/util/gnunet-resolver.c index 873a181469..e841afca97 100644 --- a/src/util/gnunet-resolver.c +++ b/src/util/gnunet-resolver.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index 12899a8bba..fb66a757d8 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/gnunet-scrypt.c diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index cd40728362..d26ec659f6 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c index e5c17b0226..33cd3543dc 100644 --- a/src/util/gnunet-uri.c +++ b/src/util/gnunet-uri.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/helper.c b/src/util/helper.c index 7b32c1b063..5cdfb904a1 100644 --- a/src/util/helper.c +++ b/src/util/helper.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/load.c b/src/util/load.c index 1891b8971f..41ee7a91a0 100644 --- a/src/util/load.c +++ b/src/util/load.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/mq.c b/src/util/mq.c index ad9437708b..eaac85575c 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/mst.c b/src/util/mst.c index 48434f3eaf..a5c6f3c3ea 100644 --- a/src/util/mst.c +++ b/src/util/mst.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/nc.c b/src/util/nc.c index 2866a09fb1..42a0114a7b 100644 --- a/src/util/nc.c +++ b/src/util/nc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/network.c b/src/util/network.c index b4e5a11396..fe98270831 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/op.c b/src/util/op.c index 33283a21a5..19f6ce4f0c 100644 --- a/src/util/op.c +++ b/src/util/op.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/os_installation.c b/src/util/os_installation.c index 537b46f187..2977a833bc 100644 --- a/src/util/os_installation.c +++ b/src/util/os_installation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/os_network.c b/src/util/os_network.c index 753836832d..3e9ea47b4b 100644 --- a/src/util/os_network.c +++ b/src/util/os_network.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/os_priority.c b/src/util/os_priority.c index 5e34d3b262..d139913349 100644 --- a/src/util/os_priority.c +++ b/src/util/os_priority.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/peer.c b/src/util/peer.c index 168811cd7f..f9e1b4cbee 100644 --- a/src/util/peer.c +++ b/src/util/peer.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_asymmetric.c b/src/util/perf_crypto_asymmetric.c index 6c3db48fc3..acfdba5413 100644 --- a/src/util/perf_crypto_asymmetric.c +++ b/src/util/perf_crypto_asymmetric.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c index 3772bc6e2b..4be928d42e 100644 --- a/src/util/perf_crypto_ecc_dlog.c +++ b/src/util/perf_crypto_ecc_dlog.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_hash.c b/src/util/perf_crypto_hash.c index 7dd4cf5441..f1c69e96aa 100644 --- a/src/util/perf_crypto_hash.c +++ b/src/util/perf_crypto_hash.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_paillier.c b/src/util/perf_crypto_paillier.c index 5167ee93c6..b1430d7131 100644 --- a/src/util/perf_crypto_paillier.c +++ b/src/util/perf_crypto_paillier.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_rsa.c b/src/util/perf_crypto_rsa.c index 03676dfd2f..4ad348d5bc 100644 --- a/src/util/perf_crypto_rsa.c +++ b/src/util/perf_crypto_rsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_crypto_symmetric.c b/src/util/perf_crypto_symmetric.c index af88fc27b8..2382010e1d 100644 --- a/src/util/perf_crypto_symmetric.c +++ b/src/util/perf_crypto_symmetric.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c index 1f1744f504..01694d7667 100644 --- a/src/util/perf_malloc.c +++ b/src/util/perf_malloc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/plugin.c b/src/util/plugin.c index 1a05b02869..b88dc40128 100644 --- a/src/util/plugin.c +++ b/src/util/plugin.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/program.c b/src/util/program.c index 23e43b91e2..2a9b4fac9c 100644 --- a/src/util/program.c +++ b/src/util/program.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPROSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/resolver.h b/src/util/resolver.h index bb1ad35321..0b137f085f 100644 --- a/src/util/resolver.h +++ b/src/util/resolver.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c index 26939a8326..b2e6a4986e 100644 --- a/src/util/resolver_api.c +++ b/src/util/resolver_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/scheduler.c b/src/util/scheduler.c index f83c52dec5..93d133d1be 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/scheduler.c diff --git a/src/util/service.c b/src/util/service.c index f355beb79d..20cc1036da 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/signal.c b/src/util/signal.c index acaca08f29..ecb792106b 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/socks.c b/src/util/socks.c index ad44996281..1459fd2f06 100644 --- a/src/util/socks.c +++ b/src/util/socks.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/speedup.c b/src/util/speedup.c index 95187f378a..d323644803 100644 --- a/src/util/speedup.c +++ b/src/util/speedup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/speedup.h b/src/util/speedup.h index cf27a9d0e5..a9ea1cbaec 100644 --- a/src/util/speedup.h +++ b/src/util/speedup.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/strings.c b/src/util/strings.c index a7cbeddb08..5ed195933e 100644 --- a/src/util/strings.c +++ b/src/util/strings.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/strings.c diff --git a/src/util/test_bio.c b/src/util/test_bio.c index 65d10b6abc..acdd0bc06d 100644 --- a/src/util/test_bio.c +++ b/src/util/test_bio.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_client.c b/src/util/test_client.c index d1951ebedf..a425f7ec40 100644 --- a/src/util/test_client.c +++ b/src/util/test_client.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_client.c diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c index 40eab4181d..dd2bb23c3e 100644 --- a/src/util/test_common_allocation.c +++ b/src/util/test_common_allocation.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_common_endian.c b/src/util/test_common_endian.c index 658e199aac..f7bf00b408 100644 --- a/src/util/test_common_endian.c +++ b/src/util/test_common_endian.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_common_endian.c diff --git a/src/util/test_common_logging.c b/src/util/test_common_logging.c index cd35dab4ee..5832e75f46 100644 --- a/src/util/test_common_logging.c +++ b/src/util/test_common_logging.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c index 6445faf839..afa78aad06 100644 --- a/src/util/test_common_logging_dummy.c +++ b/src/util/test_common_logging_dummy.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index 459d996e41..863cb2a556 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c index a6cf852d32..067c15bf24 100644 --- a/src/util/test_configuration.c +++ b/src/util/test_configuration.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_configuration.c diff --git a/src/util/test_container_bloomfilter.c b/src/util/test_container_bloomfilter.c index e7b4499a5b..c144f48a13 100644 --- a/src/util/test_container_bloomfilter.c +++ b/src/util/test_container_bloomfilter.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_container_bloomfilter.c diff --git a/src/util/test_container_dll.c b/src/util/test_container_dll.c index ef33d9f58d..47d4c3d613 100644 --- a/src/util/test_container_dll.c +++ b/src/util/test_container_dll.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_container_heap.c b/src/util/test_container_heap.c index 5734ff5dcb..4be235573c 100644 --- a/src/util/test_container_heap.c +++ b/src/util/test_container_heap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c index cc8e9c4fe7..5a658cc75d 100644 --- a/src/util/test_container_meta_data.c +++ b/src/util/test_container_meta_data.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c index 34480a4339..188eb29688 100644 --- a/src/util/test_container_multihashmap.c +++ b/src/util/test_container_multihashmap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_container_multihashmap32.c b/src/util/test_container_multihashmap32.c index e68d8e0867..15a74d4ac9 100644 --- a/src/util/test_container_multihashmap32.c +++ b/src/util/test_container_multihashmap32.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c index 976df657a4..3f7b44da5e 100644 --- a/src/util/test_container_multipeermap.c +++ b/src/util/test_container_multipeermap.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_crc.c b/src/util/test_crypto_crc.c index 79fa3b24fd..3695603cde 100644 --- a/src/util/test_crypto_crc.c +++ b/src/util/test_crypto_crc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . For the actual CRC code: Copyright abandoned; this code is in the public domain. diff --git a/src/util/test_crypto_ecc_dlog.c b/src/util/test_crypto_ecc_dlog.c index ef19fba660..eabe3ed086 100644 --- a/src/util/test_crypto_ecc_dlog.c +++ b/src/util/test_crypto_ecc_dlog.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c index 9f6d868d43..b7b1634e41 100644 --- a/src/util/test_crypto_ecdh_eddsa.c +++ b/src/util/test_crypto_ecdh_eddsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_ecdhe.c b/src/util/test_crypto_ecdhe.c index d6af98a997..6f887e9f30 100644 --- a/src/util/test_crypto_ecdhe.c +++ b/src/util/test_crypto_ecdhe.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_ecdsa.c b/src/util/test_crypto_ecdsa.c index 147123646d..b3df275136 100644 --- a/src/util/test_crypto_ecdsa.c +++ b/src/util/test_crypto_ecdsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_eddsa.c b/src/util/test_crypto_eddsa.c index 1b420d7914..8539be2774 100644 --- a/src/util/test_crypto_eddsa.c +++ b/src/util/test_crypto_eddsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_hash.c b/src/util/test_crypto_hash.c index a2bf987002..609be8a727 100644 --- a/src/util/test_crypto_hash.c +++ b/src/util/test_crypto_hash.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_hash_context.c b/src/util/test_crypto_hash_context.c index 2b27065e2c..26487fd39c 100644 --- a/src/util/test_crypto_hash_context.c +++ b/src/util/test_crypto_hash_context.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_crypto_hash_context.c diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c index c6d595ff4a..d600a28065 100644 --- a/src/util/test_crypto_paillier.c +++ b/src/util/test_crypto_paillier.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_random.c b/src/util/test_crypto_random.c index 7b3bb28d23..f5e0a27315 100644 --- a/src/util/test_crypto_random.c +++ b/src/util/test_crypto_random.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c index f79aba17bd..320dfce547 100644 --- a/src/util/test_crypto_rsa.c +++ b/src/util/test_crypto_rsa.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c index 8157895a37..d6d177ed09 100644 --- a/src/util/test_crypto_symmetric.c +++ b/src/util/test_crypto_symmetric.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_disk.c b/src/util/test_disk.c index ea85fcc6cb..352e3ee3ee 100644 --- a/src/util/test_disk.c +++ b/src/util/test_disk.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_getopt.c b/src/util/test_getopt.c index eafbf38d21..e5b8546581 100644 --- a/src/util/test_getopt.c +++ b/src/util/test_getopt.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_getopt.c diff --git a/src/util/test_mq.c b/src/util/test_mq.c index 669268d518..c02ee677ea 100644 --- a/src/util/test_mq.c +++ b/src/util/test_mq.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/test_os_network.c b/src/util/test_os_network.c index bd5371e60c..1809a8eb63 100644 --- a/src/util/test_os_network.c +++ b/src/util/test_os_network.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_os_network.c diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c index ee18fadc32..cfc39e1e08 100644 --- a/src/util/test_os_start_process.c +++ b/src/util/test_os_start_process.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_os_start_process.c diff --git a/src/util/test_peer.c b/src/util/test_peer.c index 630adfb5b5..ddb2427381 100644 --- a/src/util/test_peer.c +++ b/src/util/test_peer.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_peer.c diff --git a/src/util/test_plugin.c b/src/util/test_plugin.c index 3df5863f34..a736a077a1 100644 --- a/src/util/test_plugin.c +++ b/src/util/test_plugin.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_plugin.c diff --git a/src/util/test_plugin_plug.c b/src/util/test_plugin_plug.c index 8ec39ba30d..683b45d3c3 100644 --- a/src/util/test_plugin_plug.c +++ b/src/util/test_plugin_plug.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_plugin_plug.c diff --git a/src/util/test_program.c b/src/util/test_program.c index 5aeacc76ea..001f3aea19 100644 --- a/src/util/test_program.c +++ b/src/util/test_program.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_program.c diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index b6c9703be8..c89fad8654 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file resolver/test_resolver_api.c diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c index 8f7771b5b2..9044614652 100644 --- a/src/util/test_scheduler.c +++ b/src/util/test_scheduler.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_scheduler.c diff --git a/src/util/test_scheduler_delay.c b/src/util/test_scheduler_delay.c index ac0d708e1c..f8c4ef8da2 100644 --- a/src/util/test_scheduler_delay.c +++ b/src/util/test_scheduler_delay.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_scheduler_delay.c diff --git a/src/util/test_service.c b/src/util/test_service.c index ef0fa7561a..6858f956eb 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_service.c diff --git a/src/util/test_socks.c b/src/util/test_socks.c index 977b0e2620..9df7b66bc9 100644 --- a/src/util/test_socks.c +++ b/src/util/test_socks.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_socks.c diff --git a/src/util/test_speedup.c b/src/util/test_speedup.c index bf49fb9ce5..8a385ae479 100644 --- a/src/util/test_speedup.c +++ b/src/util/test_speedup.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_speedup.c diff --git a/src/util/test_strings.c b/src/util/test_strings.c index f263159f91..3750986e69 100644 --- a/src/util/test_strings.c +++ b/src/util/test_strings.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_strings.c diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c index 5fbc538028..1c58d91ec3 100644 --- a/src/util/test_strings_to_data.c +++ b/src/util/test_strings_to_data.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_strings_to_data.c diff --git a/src/util/test_time.c b/src/util/test_time.c index b030e9c431..2ac93e01dc 100644 --- a/src/util/test_time.c +++ b/src/util/test_time.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file util/test_time.c diff --git a/src/util/time.c b/src/util/time.c index 037e31f51e..ee90eb8ae5 100644 --- a/src/util/time.c +++ b/src/util/time.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/win.c b/src/util/win.c index 2340e4db60..511e5d5157 100644 --- a/src/util/win.c +++ b/src/util/win.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/util/winproc.c b/src/util/winproc.c index 1f63dcbafe..887df2412f 100644 --- a/src/util/winproc.c +++ b/src/util/winproc.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/vpn/gnunet-helper-vpn-windows.c b/src/vpn/gnunet-helper-vpn-windows.c index ca2e8141d3..71a54466ec 100644 --- a/src/vpn/gnunet-helper-vpn-windows.c +++ b/src/vpn/gnunet-helper-vpn-windows.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** * @file vpn/gnunet-helper-vpn-windows.c diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index ab27f7afbf..a9fd7f0217 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 646429b251..706a1294d4 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c index d3eafdcb20..dc47421d73 100644 --- a/src/vpn/gnunet-vpn.c +++ b/src/vpn/gnunet-vpn.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index 622e99d7e0..1945e8559f 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c index 3303c7b2cf..190ed0f992 100644 --- a/src/vpn/vpn_api.c +++ b/src/vpn/vpn_api.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c index 56f7a958be..9a6fa678e8 100644 --- a/src/zonemaster/gnunet-service-zonemaster-monitor.c +++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c index 12c15eb55f..fcc6b42265 100644 --- a/src/zonemaster/gnunet-service-zonemaster.c +++ b/src/zonemaster/gnunet-service-zonemaster.c @@ -11,6 +11,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . */ /** -- cgit v1.2.3-18-g5258 From 365e3bcae1e79c4f71f68e0d1d41172d86c51e76 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Fri, 8 Jun 2018 01:23:45 +0200 Subject: rps profiler: add correct make rule, util --- src/rps/Makefile.am | 7 ++++++- src/rps/rps-test_util.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/rps/rps-test_util.h | 3 +++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index 33e03af761..d477ade929 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am @@ -141,7 +141,12 @@ test_rps_seed_big_LDADD = $(ld_rps_test_lib) test_rps_churn_SOURCES = $(rps_test_src) test_rps_churn_LDADD = $(ld_rps_test_lib) -gnunet_rps_profiler_SOURCES = $(rps_test_src) +gnunet_rps_profiler_SOURCES = \ + gnunet-service-rps_sampler_elem.h gnunet-service-rps_sampler_elem.c \ + rps-test_util.h rps-test_util.c \ + gnunet-rps-profiler.c + + gnunet_rps_profiler_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ libgnunetrps.la \ diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 0c81cc2b42..ea55deac55 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -107,6 +107,53 @@ to_file_ (const char *file_name, char *line) "Unable to close file\n"); } +void +to_file_raw (const char *file_name, void *buf, size_t size_buf) +{ + struct GNUNET_DISK_FileHandle *f; + size_t size2; + + + if (NULL == (f = GNUNET_DISK_file_open (file_name, + GNUNET_DISK_OPEN_APPEND | + GNUNET_DISK_OPEN_WRITE | + GNUNET_DISK_OPEN_CREATE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ))) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "Not able to open file %s\n", + file_name); + return; + } + + size2 = GNUNET_DISK_file_write (f, buf, size_buf); + if (size_buf != size2) + { + LOG (GNUNET_ERROR_TYPE_WARNING, + "Unable to write to file! (Size: %u, size2: %u)\n", + size_buf, + size2); + + if (GNUNET_YES != GNUNET_DISK_file_close (f)) + LOG (GNUNET_ERROR_TYPE_WARNING, + "Unable to close file\n"); + + return; + } + + //if (512 < size_buf) + //{ + // GNUNET_free (output_buffer_p); + //} + + //if (GNUNET_YES != GNUNET_DISK_file_close (f)) + // LOG (GNUNET_ERROR_TYPE_WARNING, + // "Unable to close file\n"); +} + char * auth_key_to_string (struct GNUNET_CRYPTO_AuthKey auth_key) { diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index 2213e50d83..d424227506 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h @@ -74,5 +74,8 @@ const char * store_prefix_file_name (const struct GNUNET_PeerIdentity *peer, const char *prefix); +void +to_file_raw (const char *file_name, void *buf, size_t size_buf); + #endif /* RPS_TEST_UTIL_H */ /* end of gnunet-service-rps.c */ -- cgit v1.2.3-18-g5258 From 8900fb0e0101cd722e392ffb9aa36245c22ea770 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Fri, 8 Jun 2018 10:11:32 +0200 Subject: rps profiler: rewrite statistics handling --- src/rps/gnunet-rps-profiler.c | 519 ++++++++++++++++++++---------------------- 1 file changed, 241 insertions(+), 278 deletions(-) diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index 8450ee65d7..5ef42187f2 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -34,6 +34,8 @@ #include +#define BIT(n) (1 << (n)) + /** * How many peers do we start? */ @@ -67,6 +69,163 @@ static unsigned int mal_type = 0; */ static struct GNUNET_TESTBED_Peer **testbed_peers; +enum STAT_TYPE +{ + STAT_TYPE_ROUNDS, /* 0 */ + STAT_TYPE_BLOCKS, /* 1 */ + STAT_TYPE_BLOCKS_MANY_PUSH, /* 2 */ + STAT_TYPE_BLOCKS_NO_PUSH, /* 3 */ + STAT_TYPE_BLOCKS_NO_PULL, /* 4 */ + STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL, /* 5 */ + STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL, /* 6 */ + STAT_TYPE_ISSUED_PUSH_SEND, /* 7 */ + STAT_TYPE_ISSUED_PULL_REQ, /* 8 */ + STAT_TYPE_ISSUED_PULL_REP, /* 9 */ + STAT_TYPE_SENT_PUSH_SEND, /* 10 */ + STAT_TYPE_SENT_PULL_REQ, /* 11 */ + STAT_TYPE_SENT_PULL_REP, /* 12 */ + STAT_TYPE_RECV_PUSH_SEND, /* 13 */ + STAT_TYPE_RECV_PULL_REQ, /* 14 */ + STAT_TYPE_RECV_PULL_REP, /* 15 */ + STAT_TYPE_MAX, /* 16 */ +}; + +struct STATcls +{ + struct RPSPeer *rps_peer; + enum STAT_TYPE stat_type; +}; + + +/** + * @brief Converts string representation to the corresponding #STAT_TYPE enum. + * + * @param stat_str string representation of statistics specifier + * + * @return corresponding enum + */ +enum STAT_TYPE stat_str_2_type (const char *stat_str) +{ + if (0 == strncmp ("# rounds blocked - no pull replies", stat_str, strlen ("# rounds blocked - no pull replies"))) + { + return STAT_TYPE_BLOCKS_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - too many pushes, no pull replies", stat_str, strlen ("# rounds blocked - too many pushes, no pull replies"))) + { + return STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - too many pushes", stat_str, strlen ("# rounds blocked - too many pushes"))) + { + return STAT_TYPE_BLOCKS_MANY_PUSH; + } + else if (0 == strncmp ("# rounds blocked - no pushes, no pull replies", stat_str, strlen ("# rounds blocked - no pushes, no pull replies"))) + { + return STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL; + } + else if (0 == strncmp ("# rounds blocked - no pushes", stat_str, strlen ("# rounds blocked - no pushes"))) + { + return STAT_TYPE_BLOCKS_NO_PUSH; + } + else if (0 == strncmp ("# rounds blocked", stat_str, strlen ("# rounds blocked"))) + { + return STAT_TYPE_BLOCKS; + } + else if (0 == strncmp ("# rounds", stat_str, strlen ("# rounds"))) + { + return STAT_TYPE_ROUNDS; + } + else if (0 == strncmp ("# push send issued", stat_str, strlen ("# push send issued"))) + { + return STAT_TYPE_ISSUED_PUSH_SEND; + } + else if (0 == strncmp ("# pull request send issued", stat_str, strlen ("# pull request send issued"))) + { + return STAT_TYPE_ISSUED_PULL_REQ; + } + else if (0 == strncmp ("# pull reply send issued", stat_str, strlen ("# pull reply send issued"))) + { + return STAT_TYPE_ISSUED_PULL_REP; + } + else if (0 == strncmp ("# pushes sent", stat_str, strlen ("# pushes sent"))) + { + return STAT_TYPE_SENT_PUSH_SEND; + } + else if (0 == strncmp ("# pull requests sent", stat_str, strlen ("# pull requests sent"))) + { + return STAT_TYPE_SENT_PULL_REQ; + } + else if (0 == strncmp ("# pull replys sent", stat_str, strlen ("# pull replys sent"))) + { + return STAT_TYPE_SENT_PULL_REP; + } + else if (0 == strncmp ("# push message received", stat_str, strlen ("# push message received"))) + { + return STAT_TYPE_RECV_PUSH_SEND; + } + else if (0 == strncmp ("# pull request message received", stat_str, strlen ("# pull request message received"))) + { + return STAT_TYPE_RECV_PULL_REQ; + } + else if (0 == strncmp ("# pull reply messages received", stat_str, strlen ("# pull reply messages received"))) + { + return STAT_TYPE_RECV_PULL_REP; + } + return STAT_TYPE_MAX; +} + + +/** + * @brief Converts #STAT_TYPE enum to the equivalent string representation that + * is stored with the statistics service. + * + * @param stat_type #STAT_TYPE enum + * + * @return string representation that matches statistics value + */ +char* stat_type_2_str (enum STAT_TYPE stat_type) +{ + switch (stat_type) + { + case STAT_TYPE_ROUNDS: + return "# rounds"; + case STAT_TYPE_BLOCKS: + return "# rounds blocked"; + case STAT_TYPE_BLOCKS_MANY_PUSH: + return "# rounds blocked - too many pushes"; + case STAT_TYPE_BLOCKS_NO_PUSH: + return "# rounds blocked - no pushes"; + case STAT_TYPE_BLOCKS_NO_PULL: + return "# rounds blocked - no pull replies"; + case STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL: + return "# rounds blocked - too many pushes, no pull replies"; + case STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL: + return "# rounds blocked - no pushes, no pull replies"; + case STAT_TYPE_ISSUED_PUSH_SEND: + return "# push send issued"; + case STAT_TYPE_ISSUED_PULL_REQ: + return "# pull request send issued"; + case STAT_TYPE_ISSUED_PULL_REP: + return "# pull reply send issued"; + case STAT_TYPE_SENT_PUSH_SEND: + return "# pushes sent"; + case STAT_TYPE_SENT_PULL_REQ: + return "# pull requests sent"; + case STAT_TYPE_SENT_PULL_REP: + return "# pull replys sent"; + case STAT_TYPE_RECV_PUSH_SEND: + return "# push message received"; + case STAT_TYPE_RECV_PULL_REQ: + return "# pull request message received"; + case STAT_TYPE_RECV_PULL_REP: + return "# pull reply messages received"; + case STAT_TYPE_MAX: + default: + return "ERROR"; + ; + } +} + + /** * @brief Indicates whether peer should go off- or online */ @@ -287,52 +446,9 @@ struct RPSPeer /** * @brief statistics values */ - uint64_t num_rounds; - uint64_t num_blocks; - uint64_t num_blocks_many_push; - uint64_t num_blocks_no_push; - uint64_t num_blocks_no_pull; - uint64_t num_blocks_many_push_no_pull; - uint64_t num_blocks_no_push_no_pull; - uint64_t num_issued_push; - uint64_t num_issued_pull_req; - uint64_t num_issued_pull_rep; - uint64_t num_sent_push; - uint64_t num_sent_pull_req; - uint64_t num_sent_pull_rep; - uint64_t num_recv_push; - uint64_t num_recv_pull_req; - uint64_t num_recv_pull_rep; + uint64_t stats[STAT_TYPE_MAX]; }; -enum STAT_TYPE -{ - STAT_TYPE_ROUNDS = 0x1, /* 1 */ - STAT_TYPE_BLOCKS = 0x2, /* 2 */ - STAT_TYPE_BLOCKS_MANY_PUSH = 0x4, /* 3 */ - STAT_TYPE_BLOCKS_NO_PUSH = 0x8, /* 4 */ - STAT_TYPE_BLOCKS_NO_PULL = 0x10, /* 5 */ - STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL = 0x20, /* 6 */ - STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL = 0x40, /* 7 */ - STAT_TYPE_ISSUED_PUSH_SEND = 0x80, /* 8 */ - STAT_TYPE_ISSUED_PULL_REQ = 0x100, /* 9 */ - STAT_TYPE_ISSUED_PULL_REP = 0x200, /* 10 */ - STAT_TYPE_SENT_PUSH_SEND = 0x400, /* 11 */ - STAT_TYPE_SENT_PULL_REQ = 0x800, /* 12 */ - STAT_TYPE_SENT_PULL_REP = 0x1000, /* 13 */ - STAT_TYPE_RECV_PUSH_SEND = 0x2000, /* 14 */ - STAT_TYPE_RECV_PULL_REQ = 0x4000, /* 15 */ - STAT_TYPE_RECV_PULL_REP = 0x8000, /* 16 */ - STAT_TYPE_MAX = 0x80000000, /* 32 */ -}; - -struct STATcls -{ - struct RPSPeer *rps_peer; - enum STAT_TYPE stat_type; -}; - - /** * Information for all the peers. */ @@ -2100,25 +2216,9 @@ pre_profiler (struct RPSPeer *rps_peer, struct GNUNET_RPS_Handle *h) } void write_final_stats (void){ - uint32_t i; - uint64_t sum_rounds = 0; - uint64_t sum_blocks = 0; - uint64_t sum_b_mpush = 0; - uint64_t sum_b_npush = 0; - uint64_t sum_b_npull = 0; - uint64_t sum_b_mpush_npull = 0; - uint64_t sum_b_npush_npull = 0; - uint64_t sum_iss_push = 0; - uint64_t sum_iss_pull_req = 0; - uint64_t sum_iss_pull_rep = 0; - uint64_t sum_sent_push = 0; - uint64_t sum_sent_pull_req = 0; - uint64_t sum_sent_pull_rep = 0; - uint64_t sum_recv_push = 0; - uint64_t sum_recv_pull_req = 0; - uint64_t sum_recv_pull_rep = 0; + uint64_t sums[STAT_TYPE_MAX] = { 0 }; - for (i = 0; i < num_peers; i++) + for (uint32_t i = 0; i < num_peers; i++) { to_file ("/tmp/rps/final_stats.dat", "%" PRIu32 " " /* index */ @@ -2130,38 +2230,34 @@ void write_final_stats (void){ PRIu64 " %" PRIu64 " %" PRIu64 /* recv */, i, GNUNET_i2s (rps_peers[i].peer_id), - rps_peers[i].num_rounds, - rps_peers[i].num_blocks, - rps_peers[i].num_blocks_many_push, - rps_peers[i].num_blocks_no_push, - rps_peers[i].num_blocks_no_pull, - rps_peers[i].num_blocks_many_push_no_pull, - rps_peers[i].num_blocks_no_push_no_pull, - rps_peers[i].num_issued_push, - rps_peers[i].num_issued_pull_req, - rps_peers[i].num_issued_pull_rep, - rps_peers[i].num_sent_push, - rps_peers[i].num_sent_pull_req, - rps_peers[i].num_sent_pull_rep, - rps_peers[i].num_recv_push, - rps_peers[i].num_recv_pull_req, - rps_peers[i].num_recv_pull_rep); - sum_rounds += rps_peers[i].num_rounds; - sum_blocks += rps_peers[i].num_blocks; - sum_b_mpush += rps_peers[i].num_blocks_many_push; - sum_b_npush += rps_peers[i].num_blocks_no_push; - sum_b_npull += rps_peers[i].num_blocks_no_pull; - sum_b_mpush_npull += rps_peers[i].num_blocks_many_push_no_pull; - sum_b_npush_npull += rps_peers[i].num_blocks_no_push_no_pull; - sum_iss_push += rps_peers[i].num_issued_push; - sum_iss_pull_req += rps_peers[i].num_issued_pull_req; - sum_iss_pull_rep += rps_peers[i].num_issued_pull_rep; - sum_sent_push += rps_peers[i].num_sent_push; - sum_sent_pull_req += rps_peers[i].num_sent_pull_req; - sum_sent_pull_rep += rps_peers[i].num_sent_pull_rep; - sum_recv_push += rps_peers[i].num_recv_push; - sum_recv_pull_req += rps_peers[i].num_recv_pull_req; - sum_recv_pull_rep += rps_peers[i].num_recv_pull_rep; + rps_peers[i].stats[STAT_TYPE_ROUNDS], + rps_peers[i].stats[STAT_TYPE_BLOCKS], + rps_peers[i].stats[STAT_TYPE_BLOCKS_MANY_PUSH], + rps_peers[i].stats[STAT_TYPE_BLOCKS_NO_PUSH], + rps_peers[i].stats[STAT_TYPE_BLOCKS_NO_PULL], + rps_peers[i].stats[STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL], + rps_peers[i].stats[STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL], + rps_peers[i].stats[STAT_TYPE_ISSUED_PUSH_SEND], + rps_peers[i].stats[STAT_TYPE_ISSUED_PULL_REQ], + rps_peers[i].stats[STAT_TYPE_ISSUED_PULL_REP], + rps_peers[i].stats[STAT_TYPE_SENT_PUSH_SEND], + rps_peers[i].stats[STAT_TYPE_SENT_PULL_REQ], + rps_peers[i].stats[STAT_TYPE_SENT_PULL_REP], + rps_peers[i].stats[STAT_TYPE_RECV_PUSH_SEND], + rps_peers[i].stats[STAT_TYPE_RECV_PULL_REQ], + rps_peers[i].stats[STAT_TYPE_RECV_PULL_REP]); + for (uint32_t stat_type = STAT_TYPE_ROUNDS; + stat_type < STAT_TYPE_MAX; + stat_type++) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Add to sum (%" PRIu64 ") %" PRIu64 " of stat type %u - %s\n", + sums[stat_type], + rps_peers[i].stats[stat_type], + stat_type, + stat_type_2_str (stat_type)); + sums[stat_type] += rps_peers[i].stats[stat_type]; + } } to_file ("/tmp/rps/final_stats.dat", "SUM %" @@ -2170,22 +2266,22 @@ void write_final_stats (void){ PRIu64 " %" PRIu64 " %" PRIu64 " %" /* issued */ PRIu64 " %" PRIu64 " %" PRIu64 " %" /* sent */ PRIu64 " %" PRIu64 " %" PRIu64 /* recv */, - sum_rounds, - sum_blocks, - sum_b_mpush, - sum_b_npush, - sum_b_npull, - sum_b_mpush_npull, - sum_b_npush_npull, - sum_iss_push, - sum_iss_pull_req, - sum_iss_pull_rep, - sum_sent_push, - sum_sent_pull_req, - sum_sent_pull_rep, - sum_recv_push, - sum_recv_pull_req, - sum_recv_pull_rep); + sums[STAT_TYPE_ROUNDS], + sums[STAT_TYPE_BLOCKS], + sums[STAT_TYPE_BLOCKS_MANY_PUSH], + sums[STAT_TYPE_BLOCKS_NO_PUSH], + sums[STAT_TYPE_BLOCKS_NO_PULL], + sums[STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL], + sums[STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL], + sums[STAT_TYPE_ISSUED_PUSH_SEND], + sums[STAT_TYPE_ISSUED_PULL_REQ], + sums[STAT_TYPE_ISSUED_PULL_REP], + sums[STAT_TYPE_SENT_PUSH_SEND], + sums[STAT_TYPE_SENT_PULL_REQ], + sums[STAT_TYPE_SENT_PULL_REP], + sums[STAT_TYPE_RECV_PUSH_SEND], + sums[STAT_TYPE_RECV_PULL_REQ], + sums[STAT_TYPE_RECV_PULL_REP]); } /** @@ -2208,7 +2304,7 @@ post_test_shutdown_ready_cb (void *cls, if (GNUNET_OK == success) { /* set flag that we we got the value */ - rps_peer->stat_collected_flags |= stat_cls->stat_type; + rps_peer->stat_collected_flags |= BIT(stat_cls->stat_type); } else { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer %u did not receive statistics value\n", @@ -2236,134 +2332,6 @@ post_test_shutdown_ready_cb (void *cls, } } -/** - * @brief Converts string representation to the corresponding #STAT_TYPE enum. - * - * @param stat_str string representation of statistics specifier - * - * @return corresponding enum - */ -enum STAT_TYPE stat_str_2_type (const char *stat_str) -{ - if (0 == strncmp ("# rounds blocked - no pull replies", stat_str, strlen ("# rounds blocked - no pull replies"))) - { - return STAT_TYPE_BLOCKS_NO_PULL; - } - else if (0 == strncmp ("# rounds blocked - too many pushes, no pull replies", stat_str, strlen ("# rounds blocked - too many pushes, no pull replies"))) - { - return STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL; - } - else if (0 == strncmp ("# rounds blocked - too many pushes", stat_str, strlen ("# rounds blocked - too many pushes"))) - { - return STAT_TYPE_BLOCKS_MANY_PUSH; - } - else if (0 == strncmp ("# rounds blocked - no pushes, no pull replies", stat_str, strlen ("# rounds blocked - no pushes, no pull replies"))) - { - return STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL; - } - else if (0 == strncmp ("# rounds blocked - no pushes", stat_str, strlen ("# rounds blocked - no pushes"))) - { - return STAT_TYPE_BLOCKS_NO_PUSH; - } - else if (0 == strncmp ("# rounds blocked", stat_str, strlen ("# rounds blocked"))) - { - return STAT_TYPE_BLOCKS; - } - else if (0 == strncmp ("# rounds", stat_str, strlen ("# rounds"))) - { - return STAT_TYPE_ROUNDS; - } - else if (0 == strncmp ("# push send issued", stat_str, strlen ("# push send issued"))) - { - return STAT_TYPE_ISSUED_PUSH_SEND; - } - else if (0 == strncmp ("# pull request send issued", stat_str, strlen ("# pull request send issued"))) - { - return STAT_TYPE_ISSUED_PULL_REQ; - } - else if (0 == strncmp ("# pull reply send issued", stat_str, strlen ("# pull reply send issued"))) - { - return STAT_TYPE_ISSUED_PULL_REP; - } - else if (0 == strncmp ("# pushes sent", stat_str, strlen ("# pushes sent"))) - { - return STAT_TYPE_SENT_PUSH_SEND; - } - else if (0 == strncmp ("# pull requests sent", stat_str, strlen ("# pull requests sent"))) - { - return STAT_TYPE_SENT_PULL_REQ; - } - else if (0 == strncmp ("# pull replys sent", stat_str, strlen ("# pull replys sent"))) - { - return STAT_TYPE_SENT_PULL_REP; - } - else if (0 == strncmp ("# push message received", stat_str, strlen ("# push message received"))) - { - return STAT_TYPE_RECV_PUSH_SEND; - } - else if (0 == strncmp ("# pull request message received", stat_str, strlen ("# pull request message received"))) - { - return STAT_TYPE_RECV_PULL_REQ; - } - else if (0 == strncmp ("# pull reply messages received", stat_str, strlen ("# pull reply messages received"))) - { - return STAT_TYPE_RECV_PULL_REP; - } - return STAT_TYPE_MAX; -} - - -/** - * @brief Converts #STAT_TYPE enum to the equivalent string representation that - * is stored with the statistics service. - * - * @param stat_type #STAT_TYPE enum - * - * @return string representation that matches statistics value - */ -char* stat_type_2_str (enum STAT_TYPE stat_type) -{ - switch (stat_type) - { - case STAT_TYPE_ROUNDS: - return "# rounds"; - case STAT_TYPE_BLOCKS: - return "# rounds blocked"; - case STAT_TYPE_BLOCKS_MANY_PUSH: - return "# rounds blocked - too many pushes"; - case STAT_TYPE_BLOCKS_NO_PUSH: - return "# rounds blocked - no pushes"; - case STAT_TYPE_BLOCKS_NO_PULL: - return "# rounds blocked - no pull replies"; - case STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL: - return "# rounds blocked - too many pushes, no pull replies"; - case STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL: - return "# rounds blocked - no pushes, no pull replies"; - case STAT_TYPE_ISSUED_PUSH_SEND: - return "# push send issued"; - case STAT_TYPE_ISSUED_PULL_REQ: - return "# pull request send issued"; - case STAT_TYPE_ISSUED_PULL_REP: - return "# pull reply send issued"; - case STAT_TYPE_SENT_PUSH_SEND: - return "# pushes sent"; - case STAT_TYPE_SENT_PULL_REQ: - return "# pull requests sent"; - case STAT_TYPE_SENT_PULL_REP: - return "# pull replys sent"; - case STAT_TYPE_RECV_PUSH_SEND: - return "# push message received"; - case STAT_TYPE_RECV_PULL_REQ: - return "# pull request message received"; - case STAT_TYPE_RECV_PULL_REP: - return "# pull reply messages received"; - case STAT_TYPE_MAX: - default: - return "ERROR"; - ; - } -} - /** * Callback function to process statistic values. * @@ -2394,52 +2362,52 @@ stat_iterator (void *cls, switch (stat_str_2_type (name)) { case STAT_TYPE_ROUNDS: - rps_peer->num_rounds = value; + rps_peer->stats[STAT_TYPE_ROUNDS] = value; break; case STAT_TYPE_BLOCKS: - rps_peer->num_blocks = value; + rps_peer->stats[STAT_TYPE_BLOCKS] = value; break; case STAT_TYPE_BLOCKS_MANY_PUSH: - rps_peer->num_blocks_many_push = value; + rps_peer->stats[STAT_TYPE_BLOCKS_MANY_PUSH] = value; break; case STAT_TYPE_BLOCKS_NO_PUSH: - rps_peer->num_blocks_no_push = value; + rps_peer->stats[STAT_TYPE_BLOCKS_NO_PUSH] = value; break; case STAT_TYPE_BLOCKS_NO_PULL: - rps_peer->num_blocks_no_pull = value; + rps_peer->stats[STAT_TYPE_BLOCKS_NO_PULL] = value; break; case STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL: - rps_peer->num_blocks_many_push_no_pull = value; + rps_peer->stats[STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL] = value; break; case STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL: - rps_peer->num_blocks_no_push_no_pull = value; + rps_peer->stats[STAT_TYPE_BLOCKS] = value; break; case STAT_TYPE_ISSUED_PUSH_SEND: - rps_peer->num_issued_push = value; + rps_peer->stats[STAT_TYPE_ISSUED_PUSH_SEND] = value; break; case STAT_TYPE_ISSUED_PULL_REQ: - rps_peer->num_issued_pull_req = value; + rps_peer->stats[STAT_TYPE_ISSUED_PULL_REQ] = value; break; case STAT_TYPE_ISSUED_PULL_REP: - rps_peer->num_issued_pull_rep = value; + rps_peer->stats[STAT_TYPE_ISSUED_PULL_REP] = value; break; case STAT_TYPE_SENT_PUSH_SEND: - rps_peer->num_sent_push = value; + rps_peer->stats[STAT_TYPE_SENT_PUSH_SEND] = value; break; case STAT_TYPE_SENT_PULL_REQ: - rps_peer->num_sent_pull_req = value; + rps_peer->stats[STAT_TYPE_SENT_PULL_REQ] = value; break; case STAT_TYPE_SENT_PULL_REP: - rps_peer->num_sent_pull_rep = value; + rps_peer->stats[STAT_TYPE_SENT_PULL_REP] = value; break; case STAT_TYPE_RECV_PUSH_SEND: - rps_peer->num_recv_push = value; + rps_peer->stats[STAT_TYPE_RECV_PUSH_SEND] = value; break; case STAT_TYPE_RECV_PULL_REQ: - rps_peer->num_recv_pull_req = value; + rps_peer->stats[STAT_TYPE_RECV_PULL_REQ] = value; break; case STAT_TYPE_RECV_PULL_REP: - rps_peer->num_recv_pull_rep = value; + rps_peer->stats[STAT_TYPE_RECV_PULL_REP] = value; break; case STAT_TYPE_MAX: default: @@ -2466,9 +2434,9 @@ void post_profiler (struct RPSPeer *rps_peer) uint32_t stat_type; for (stat_type = STAT_TYPE_ROUNDS; stat_type < STAT_TYPE_MAX; - stat_type = stat_type <<1) + stat_type++) { - if (stat_type & cur_test_run.stat_collect_flags) + if (BIT(stat_type) & cur_test_run.stat_collect_flags) { stat_cls = GNUNET_malloc (sizeof (struct STATcls)); stat_cls->rps_peer = rps_peer; @@ -2634,22 +2602,22 @@ run (void *cls, cur_test_run.have_churn = HAVE_NO_CHURN; cur_test_run.have_quick_quit = HAVE_NO_QUICK_QUIT; cur_test_run.have_collect_statistics = COLLECT_STATISTICS; - cur_test_run.stat_collect_flags = STAT_TYPE_ROUNDS | - STAT_TYPE_BLOCKS | - STAT_TYPE_BLOCKS_MANY_PUSH | - STAT_TYPE_BLOCKS_NO_PUSH | - STAT_TYPE_BLOCKS_NO_PULL | - STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL | - STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL | - STAT_TYPE_ISSUED_PUSH_SEND | - STAT_TYPE_ISSUED_PULL_REQ | - STAT_TYPE_ISSUED_PULL_REP | - STAT_TYPE_SENT_PUSH_SEND | - STAT_TYPE_SENT_PULL_REQ | - STAT_TYPE_SENT_PULL_REP | - STAT_TYPE_RECV_PUSH_SEND | - STAT_TYPE_RECV_PULL_REQ | - STAT_TYPE_RECV_PULL_REP; + cur_test_run.stat_collect_flags = BIT(STAT_TYPE_ROUNDS) | + BIT(STAT_TYPE_BLOCKS) | + BIT(STAT_TYPE_BLOCKS_MANY_PUSH) | + BIT(STAT_TYPE_BLOCKS_NO_PUSH) | + BIT(STAT_TYPE_BLOCKS_NO_PULL) | + BIT(STAT_TYPE_BLOCKS_MANY_PUSH_NO_PULL) | + BIT(STAT_TYPE_BLOCKS_NO_PUSH_NO_PULL) | + BIT(STAT_TYPE_ISSUED_PUSH_SEND) | + BIT(STAT_TYPE_ISSUED_PULL_REQ) | + BIT(STAT_TYPE_ISSUED_PULL_REP) | + BIT(STAT_TYPE_SENT_PUSH_SEND) | + BIT(STAT_TYPE_SENT_PULL_REQ) | + BIT(STAT_TYPE_SENT_PULL_REP) | + BIT(STAT_TYPE_RECV_PUSH_SEND) | + BIT(STAT_TYPE_RECV_PULL_REQ) | + BIT(STAT_TYPE_RECV_PULL_REP); cur_test_run.have_collect_view = COLLECT_VIEW; timeout_s = 300; @@ -2672,11 +2640,6 @@ run (void *cls, ok = 1; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "before _run()\n"); - //ret_value = GNUNET_TESTBED_test_run (cur_test_run.name, - // "test_rps.conf", - // num_peers, - // 0, NULL, NULL, - // &test_run, NULL); GNUNET_TESTBED_run (NULL, cfg, num_peers, -- cgit v1.2.3-18-g5258 From bb581dc55bfb90fc7f34797111b55d16e69b7af0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 9 Jun 2018 17:42:02 +0200 Subject: remove crypto_bug.c --- src/util/Makefile.am | 3 +- src/util/crypto_bug.c | 77 --------------------------------------------- src/util/crypto_ecc.c | 3 -- src/util/crypto_ecc_setup.c | 3 -- 4 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 src/util/crypto_bug.c diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 407f482df8..208cab07b0 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -598,5 +598,4 @@ EXTRA_DIST = \ test_resolver_api_data.conf \ test_service_data.conf \ test_speedup_data.conf \ - gnunet-qr.py.in \ - crypto_bug.c + gnunet-qr.py.in diff --git a/src/util/crypto_bug.c b/src/util/crypto_bug.c deleted file mode 100644 index aea801d408..0000000000 --- a/src/util/crypto_bug.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - This file is part of GNUnet. - Copyright (C) 2018 GNUnet e.V. - - GNUnet is free software: you can redistribute it and/or modify it - under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, - or (at your option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -/** - * @file util/crypto_bug.c - * @brief work around unidentified public key cryptography bug - * @author Christian Grothoff - */ - -/** - * Enable work-around. Will cause code to call #check_eddsa_key() to - * see if we have a bad key, and if so, create a new one. - */ -#define CRYPTO_BUG 0 - - -#if CRYPTO_BUG -/** - * Check if ECDH works with @a priv_dsa and this version - * of libgcrypt. - * - * @param priv_dsa key to check - * @return #GNUNET_OK if key passes - */ -static int -check_eddsa_key (const struct GNUNET_CRYPTO_EddsaPrivateKey *priv_dsa) -{ - struct GNUNET_CRYPTO_EcdhePrivateKey *priv_ecdh; - struct GNUNET_CRYPTO_EddsaPublicKey id1; - struct GNUNET_CRYPTO_EcdhePublicKey id2; - struct GNUNET_HashCode dh[2]; - - GNUNET_CRYPTO_eddsa_key_get_public (priv_dsa, - &id1); - for (unsigned int j=0;j<4;j++) - { - priv_ecdh = GNUNET_CRYPTO_ecdhe_key_create (); - /* Extract public keys */ - GNUNET_CRYPTO_ecdhe_key_get_public (priv_ecdh, - &id2); - /* Do ECDH */ - GNUNET_assert (GNUNET_OK == - GNUNET_CRYPTO_eddsa_ecdh (priv_dsa, - &id2, - &dh[0])); - GNUNET_assert (GNUNET_OK == - GNUNET_CRYPTO_ecdh_eddsa (priv_ecdh, - &id1, - &dh[1])); - /* Check that both DH results are equal. */ - if (0 != memcmp (&dh[0], - &dh[1], - sizeof (struct GNUNET_HashCode))) - { - GNUNET_break (0); /* bad EdDSA key! */ - return GNUNET_SYSERR; - } - GNUNET_free (priv_ecdh); - } - return GNUNET_OK; -} -#endif diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c index 789d350ff6..07782b1815 100644 --- a/src/util/crypto_ecc.c +++ b/src/util/crypto_ecc.c @@ -50,9 +50,6 @@ #define LOG_GCRY(level, cmd, rc) do { LOG(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0) -#include "crypto_bug.c" - - /** * Extract values from an S-expression. * diff --git a/src/util/crypto_ecc_setup.c b/src/util/crypto_ecc_setup.c index 1316a900c7..507cbba113 100644 --- a/src/util/crypto_ecc_setup.c +++ b/src/util/crypto_ecc_setup.c @@ -39,9 +39,6 @@ #define LOG_GCRY(level, cmd, rc) do { LOG(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0) -#include "crypto_bug.c" - - /** * Wait for a short time (we're trying to lock a file or want * to give another process a shot at finishing a disk write, etc.). -- cgit v1.2.3-18-g5258 From ae8b5cb2eac770be0d18b7d46c238bf865e34023 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 12 Jun 2018 11:09:50 +0200 Subject: complain if datacache returns expired values --- src/dht/gnunet-service-dht_datacache.c | 5 +++++ src/gns/gnunet-service-gns_resolver.c | 16 +++++++++++++++- src/gnsrecord/gnsrecord_crypto.c | 12 ++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/dht/gnunet-service-dht_datacache.c b/src/dht/gnunet-service-dht_datacache.c index 1f01387ff8..7ad9aa7280 100644 --- a/src/dht/gnunet-service-dht_datacache.c +++ b/src/dht/gnunet-service-dht_datacache.c @@ -171,6 +171,11 @@ datacache_get_iterator (void *cls, struct GetRequestContext *ctx = cls; enum GNUNET_BLOCK_EvaluationResult eval; + if (0 == GNUNET_TIME_absolute_get_remaining (exp).rel_value_us) + { + GNUNET_break (0); /* why does datacache return expired values? */ + return GNUNET_OK; /* skip expired record */ + } if ( (NULL == data) && (0 == data_size) ) data = &non_null; /* point anywhere, but not to NULL */ diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index a90cc4c0ed..54c3cba23c 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -1377,6 +1377,10 @@ vpn_allocation_cb (void *cls, } } GNUNET_assert (i < vpn_ctx->rd_count); + if (0 == vpn_ctx->rd_count) + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("VPN returned empty result for `%s'\n"), + rh->name); handle_gns_resolution_result (rh, vpn_ctx->rd_count, rd); @@ -1859,7 +1863,8 @@ handle_gns_resolution_result (void *cls, if (0 == rd_count) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("GNS lookup failed (zero records found)\n")); + _("GNS lookup failed (zero records found for `%s')\n"), + rh->name); fail_resolution (rh); return; } @@ -2370,6 +2375,11 @@ handle_dht_response (void *cls, fail_resolution (rh); return; } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Decrypting DHT block of size %u for `%s', expires %s\n", + ntohl (block->purpose.size), + rh->name, + GNUNET_STRINGS_absolute_time_to_string (exp)); if (GNUNET_OK != GNUNET_GNSRECORD_block_decrypt (block, &ac->authority_info.gns_authority, @@ -2450,6 +2460,10 @@ handle_gns_namecache_resolution_result (void *cls, { struct GNS_ResolverHandle *rh = cls; + if (0 == rd_count) + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("GNS namecache returned empty result for `%s'\n"), + rh->name); handle_gns_resolution_result (rh, rd_count, rd); diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c index 0752086feb..295d311007 100644 --- a/src/gnsrecord/gnsrecord_crypto.c +++ b/src/gnsrecord/gnsrecord_crypto.c @@ -377,6 +377,8 @@ GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block, (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ) { include_record = GNUNET_NO; /* We have a non-expired, non-shadow record of the same type */ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Ignoring shadow record\n"); break; } } @@ -395,6 +397,16 @@ GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block, rd[j] = rd[i]; j++; } + else + { + struct GNUNET_TIME_Absolute at; + + at.abs_value_us = rd[i].expiration_time; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Excluding record that expired %s (%llu ago)\n", + GNUNET_STRINGS_absolute_time_to_string (at), + (unsigned long long) rd[i].expiration_time - now.abs_value_us); + } } rd_count = j; if (NULL != proc) -- cgit v1.2.3-18-g5258 From f6a87ee66310529edf76c0fab76cdc7cd2aac216 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 12 Jun 2018 14:48:00 +0200 Subject: ensure datacache does not return expired records, fixig pq behavior with respect to FOREVER absolute time --- src/datacache/plugin_datacache_heap.c | 3 ++ src/datacache/plugin_datacache_postgres.c | 33 +++++++----- src/datacache/test_datacache.c | 73 +++++++++++++++++++------- src/datacache/test_datacache_quota.c | 31 ++++++++--- src/pq/pq_query_helper.c | 58 ++++++++++++++++++++- src/pq/pq_result_helper.c | 85 ++++++++++++++++++++++++++++++- 6 files changed, 242 insertions(+), 41 deletions(-) diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c index 2a08fc81b2..494d1ae17c 100644 --- a/src/datacache/plugin_datacache_heap.c +++ b/src/datacache/plugin_datacache_heap.c @@ -314,6 +314,9 @@ get_cb (void *cls, if ( (get_ctx->type != val->type) && (GNUNET_BLOCK_TYPE_ANY != get_ctx->type) ) return GNUNET_OK; + if (0 == + GNUNET_TIME_absolute_get_remaining (val->discard_time).rel_value_us) + return GNUNET_OK; if (NULL != get_ctx->iter) ret = get_ctx->iter (get_ctx->iter_cls, key, diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index 6eeeb5873d..ea87acc1f0 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c @@ -82,12 +82,12 @@ init_connection (struct Plugin *plugin) struct GNUNET_PQ_PreparedStatement ps[] = { GNUNET_PQ_make_prepare ("getkt", "SELECT discard_time,type,value,path FROM gn011dc " - "WHERE key=$1 AND type=$2", - 2), + "WHERE key=$1 AND type=$2 AND discard_time >= $3", + 3), GNUNET_PQ_make_prepare ("getk", "SELECT discard_time,type,value,path FROM gn011dc " - "WHERE key=$1", - 1), + "WHERE key=$1 AND discard_time >= $2", + 2), GNUNET_PQ_make_prepare ("getex", "SELECT length(value) AS len,oid,key FROM gn011dc" " WHERE discard_time < $1" @@ -97,18 +97,15 @@ init_connection (struct Plugin *plugin) "SELECT length(value) AS len,oid,key FROM gn011dc" " ORDER BY prox ASC, discard_time ASC LIMIT 1", 0), - GNUNET_PQ_make_prepare ("getp", - "SELECT length(value) AS len,oid,key FROM gn011dc " - "ORDER BY discard_time ASC LIMIT 1", - 0), GNUNET_PQ_make_prepare ("get_random", - "SELECT discard_time,type,value,path,key FROM gn011dc " - "ORDER BY key ASC LIMIT 1 OFFSET $1", - 1), + "SELECT discard_time,type,value,path,key FROM gn011dc" + " WHERE discard_time >= $1" + " ORDER BY key ASC LIMIT 1 OFFSET $2", + 2), GNUNET_PQ_make_prepare ("get_closest", "SELECT discard_time,type,value,path,key FROM gn011dc " - "WHERE key>=$1 ORDER BY key ASC LIMIT $2", - 1), + "WHERE key>=$1 AND discard_time >= $2 ORDER BY key ASC LIMIT $3", + 3), GNUNET_PQ_make_prepare ("delrow", "DELETE FROM gn011dc WHERE oid=$1", 1), @@ -313,18 +310,22 @@ postgres_plugin_get (void *cls, { struct Plugin *plugin = cls; uint32_t type32 = (uint32_t) type; + struct GNUNET_TIME_Absolute now; struct GNUNET_PQ_QueryParam paramk[] = { GNUNET_PQ_query_param_auto_from_type (key), + GNUNET_PQ_query_param_absolute_time (&now), GNUNET_PQ_query_param_end }; struct GNUNET_PQ_QueryParam paramkt[] = { GNUNET_PQ_query_param_auto_from_type (key), GNUNET_PQ_query_param_uint32 (&type32), + GNUNET_PQ_query_param_absolute_time (&now), GNUNET_PQ_query_param_end }; enum GNUNET_DB_QueryStatus res; struct HandleResultContext hr_ctx; + now = GNUNET_TIME_absolute_get (); hr_ctx.iter = iter; hr_ctx.iter_cls = iter_cls; hr_ctx.key = key; @@ -427,6 +428,7 @@ postgres_plugin_get_random (void *cls, { struct Plugin *plugin = cls; uint32_t off; + struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Absolute expiration_time; size_t data_size; void *data; @@ -436,6 +438,7 @@ postgres_plugin_get_random (void *cls, uint32_t type; enum GNUNET_DB_QueryStatus res; struct GNUNET_PQ_QueryParam params[] = { + GNUNET_PQ_query_param_absolute_time (&now), GNUNET_PQ_query_param_uint32 (&off), GNUNET_PQ_query_param_end }; @@ -459,6 +462,7 @@ postgres_plugin_get_random (void *cls, return 0; if (NULL == iter) return 1; + now = GNUNET_TIME_absolute_get (); off = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, plugin->num_items); res = GNUNET_PQ_eval_prepared_singleton_select (plugin->dbh, @@ -620,8 +624,10 @@ postgres_plugin_get_closest (void *cls, { struct Plugin *plugin = cls; uint32_t num_results32 = (uint32_t) num_results; + struct GNUNET_TIME_Absolute now; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_auto_from_type (key), + GNUNET_PQ_query_param_absolute_time (&now), GNUNET_PQ_query_param_uint32 (&num_results32), GNUNET_PQ_query_param_end }; @@ -630,6 +636,7 @@ postgres_plugin_get_closest (void *cls, erc.iter = iter; erc.iter_cls = iter_cls; + now = GNUNET_TIME_absolute_get (); res = GNUNET_PQ_eval_prepared_multi_select (plugin->dbh, "get_closest", params, diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index 12edb62f80..50e45012df 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c @@ -44,6 +44,11 @@ checkIt (void *cls, unsigned int path_len, const struct GNUNET_PeerIdentity *path) { + (void) key; + (void) type; + (void) exp; + (void) path_len; + (void) path; if (size != sizeof (struct GNUNET_HashCode)) { GNUNET_break (0); @@ -59,17 +64,22 @@ checkIt (void *cls, static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_DATACACHE_Handle *h; struct GNUNET_HashCode k; struct GNUNET_HashCode n; struct GNUNET_TIME_Absolute exp; - unsigned int i; + (void) cls; + (void) args; + (void) cfgfile; ok = 0; - h = GNUNET_DATACACHE_create (cfg, "testcache"); + h = GNUNET_DATACACHE_create (cfg, + "testcache"); if (h == NULL) { FPRINTF (stderr, @@ -81,7 +91,7 @@ run (void *cls, char *const *args, const char *cfgfile, exp = GNUNET_TIME_absolute_get (); exp.abs_value_us += 5 * 60 * 1000 * 1000LL; memset (&k, 0, sizeof (struct GNUNET_HashCode)); - for (i = 0; i < 100; i++) + for (unsigned int i = 0; i < 100; i++) { GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); ASSERT (GNUNET_OK == @@ -93,26 +103,43 @@ run (void *cls, char *const *args, const char *cfgfile, 0, NULL)); k = n; } - memset (&k, 0, sizeof (struct GNUNET_HashCode)); - for (i = 0; i < 100; i++) + memset (&k, + 0, + sizeof (struct GNUNET_HashCode)); + for (unsigned int i = 0; i < 100; i++) { - GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); - ASSERT (1 == GNUNET_DATACACHE_get (h, &k, 1 + i % 16, &checkIt, &n)); + GNUNET_CRYPTO_hash (&k, + sizeof (struct GNUNET_HashCode), + &n); + ASSERT (1 == GNUNET_DATACACHE_get (h, + &k, + 1 + i % 16, + &checkIt, + &n)); k = n; } - memset (&k, 42, sizeof (struct GNUNET_HashCode)); - GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n); + memset (&k, + 42, + sizeof (struct GNUNET_HashCode)); + GNUNET_CRYPTO_hash (&k, + sizeof (struct GNUNET_HashCode), + &n); ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h, &k, GNUNET_YES, sizeof (struct GNUNET_HashCode), - (const char *) &n, 792, + (const char *) &n, + 792, GNUNET_TIME_UNIT_FOREVER_ABS, - 0, NULL)); - ASSERT (0 != GNUNET_DATACACHE_get (h, &k, 792, &checkIt, &n)); - + 0, + NULL)); + ASSERT (0 != GNUNET_DATACACHE_get (h, + &k, + 792, + &checkIt, + &n)); GNUNET_DATACACHE_destroy (h); ASSERT (ok == 0); return; @@ -137,16 +164,26 @@ main (int argc, char *argv[]) GNUNET_GETOPT_OPTION_END }; + (void) argc; GNUNET_log_setup ("test-datacache", "WARNING", NULL); plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); - GNUNET_snprintf (cfg_name, sizeof (cfg_name), "test_datacache_data_%s.conf", + GNUNET_snprintf (cfg_name, + sizeof (cfg_name), + "test_datacache_data_%s.conf", plugin_name); - GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, - "test-datacache", "nohelp", options, &run, NULL); + GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, + xargv, + "test-datacache", + "nohelp", + options, + &run, + NULL); if ( (0 != ok) && (77 != ok) ) - FPRINTF (stderr, "Missed some testcases: %d\n", ok); + FPRINTF (stderr, + "Missed some testcases: %d\n", + ok); return ok; } diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c index 3d02a7244b..21e3736086 100644 --- a/src/datacache/test_datacache_quota.c +++ b/src/datacache/test_datacache_quota.c @@ -41,7 +41,9 @@ static const char *plugin_name; * some of the data from the last iteration is still there. */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct GNUNET_DATACACHE_Handle *h; @@ -50,8 +52,12 @@ run (void *cls, char *const *args, const char *cfgfile, char buf[3200]; struct GNUNET_TIME_Absolute exp; + (void) cls; + (void) args; + (void) cfgfile; ok = 0; - h = GNUNET_DATACACHE_create (cfg, "testcache"); + h = GNUNET_DATACACHE_create (cfg, + "testcache"); if (h == NULL) { @@ -112,7 +118,8 @@ FAILURE: int -main (int argc, char *argv[]) +main (int argc, + char *argv[]) { char cfg_name[128]; char *const xargv[] = { @@ -125,17 +132,27 @@ main (int argc, char *argv[]) GNUNET_GETOPT_OPTION_END }; + (void) argc; GNUNET_log_setup ("test-datacache-quota", "WARNING", NULL); plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]); - GNUNET_snprintf (cfg_name, sizeof (cfg_name), "test_datacache_data_%s.conf", + GNUNET_snprintf (cfg_name, + sizeof (cfg_name), + "test_datacache_data_%s.conf", plugin_name); - GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, - "test-datacache-quota", "nohelp", options, &run, NULL); + GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, + xargv, + "test-datacache-quota", + "nohelp", + options, + &run, + NULL); if (0 != ok) - FPRINTF (stderr, "Missed some testcases: %d\n", ok); + FPRINTF (stderr, + "Missed some testcases: %d\n", + ok); return ok; } diff --git a/src/pq/pq_query_helper.c b/src/pq/pq_query_helper.c index 799f82ebe8..98f697b5d6 100644 --- a/src/pq/pq_query_helper.c +++ b/src/pq/pq_query_helper.c @@ -50,6 +50,8 @@ qconv_fixed (void *cls, void *scratch[], unsigned int scratch_length) { + (void) scratch; + (void) scratch_length; GNUNET_break (NULL == cls); if (1 != param_length) return -1; @@ -117,6 +119,8 @@ qconv_uint16 (void *cls, const uint16_t *u_hbo = data; uint16_t *u_nbo; + (void) scratch; + (void) scratch_length; GNUNET_break (NULL == cls); if (1 != param_length) return -1; @@ -172,6 +176,8 @@ qconv_uint32 (void *cls, const uint32_t *u_hbo = data; uint32_t *u_nbo; + (void) scratch; + (void) scratch_length; GNUNET_break (NULL == cls); if (1 != param_length) return -1; @@ -227,6 +233,8 @@ qconv_uint64 (void *cls, const uint64_t *u_hbo = data; uint64_t *u_nbo; + (void) scratch; + (void) scratch_length; GNUNET_break (NULL == cls); if (1 != param_length) return -1; @@ -370,6 +378,51 @@ GNUNET_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x) } +/** + * Function called to convert input argument into SQL parameters. + * + * @param cls closure + * @param data pointer to input argument + * @param data_len number of bytes in @a data (if applicable) + * @param[out] param_values SQL data to set + * @param[out] param_lengths SQL length data to set + * @param[out] param_formats SQL format data to set + * @param param_length number of entries available in the @a param_values, @a param_lengths and @a param_formats arrays + * @param[out] scratch buffer for dynamic allocations (to be done via #GNUNET_malloc() + * @param scratch_length number of entries left in @a scratch + * @return -1 on error, number of offsets used in @a scratch otherwise + */ +static int +qconv_abs_time (void *cls, + const void *data, + size_t data_len, + void *param_values[], + int param_lengths[], + int param_formats[], + unsigned int param_length, + void *scratch[], + unsigned int scratch_length) +{ + const struct GNUNET_TIME_Absolute *u = data; + struct GNUNET_TIME_Absolute abs; + uint64_t *u_nbo; + + GNUNET_break (NULL == cls); + if (1 != param_length) + return -1; + abs = *u; + if (abs.abs_value_us > INT64_MAX) + abs.abs_value_us = INT64_MAX; + u_nbo = GNUNET_new (uint64_t); + scratch[0] = u_nbo; + *u_nbo = GNUNET_htonll (abs.abs_value_us); + param_values[0] = (void *) u_nbo; + param_lengths[0] = sizeof (uint64_t); + param_formats[0] = 1; + return 1; +} + + /** * Generate query parameter for an absolute time value. * The database must store a 64-bit integer. @@ -380,7 +433,10 @@ GNUNET_PQ_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x) struct GNUNET_PQ_QueryParam GNUNET_PQ_query_param_absolute_time (const struct GNUNET_TIME_Absolute *x) { - return GNUNET_PQ_query_param_uint64 (&x->abs_value_us); + struct GNUNET_PQ_QueryParam res = + { &qconv_abs_time, NULL, x, sizeof (*x), 1 }; + + return res; } diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c index 3805b8a8d9..dc1a1554f3 100644 --- a/src/pq/pq_result_helper.c +++ b/src/pq/pq_result_helper.c @@ -38,6 +38,7 @@ clean_varsize_blob (void *cls, { void **dst = rd; + (void) cls; if (NULL != *dst) { GNUNET_free (*dst); @@ -72,6 +73,7 @@ extract_varsize_blob (void *cls, void *idst; int fnum; + (void) cls; *dst_size = 0; *((void **) dst) = NULL; @@ -154,6 +156,7 @@ extract_fixed_blob (void *cls, const char *res; int fnum; + (void) cls; fnum = PQfnumber (result, fname); if (fnum < 0) @@ -237,6 +240,7 @@ extract_rsa_public_key (void *cls, const char *res; int fnum; + (void) cls; *pk = NULL; fnum = PQfnumber (result, fname); @@ -284,6 +288,7 @@ clean_rsa_public_key (void *cls, { struct GNUNET_CRYPTO_RsaPublicKey **pk = rd; + (void) cls; if (NULL != *pk) { GNUNET_CRYPTO_rsa_public_key_free (*pk); @@ -338,6 +343,7 @@ extract_rsa_signature (void *cls, const char *res; int fnum; + (void) cls; *sig = NULL; fnum = PQfnumber (result, fname); @@ -385,6 +391,7 @@ clean_rsa_signature (void *cls, { struct GNUNET_CRYPTO_RsaSignature **sig = rd; + (void) cls; if (NULL != *sig) { GNUNET_CRYPTO_rsa_signature_free (*sig); @@ -439,6 +446,7 @@ extract_string (void *cls, const char *res; int fnum; + (void) cls; *str = NULL; fnum = PQfnumber (result, fname); @@ -486,6 +494,7 @@ clean_string (void *cls, { char **str = rd; + (void) cls; if (NULL != *str) { GNUNET_free (*str); @@ -514,6 +523,71 @@ GNUNET_PQ_result_spec_string (const char *name, } +/** + * Extract data from a Postgres database @a result at row @a row. + * + * @param cls closure + * @param result where to extract data from + * @param int row to extract data from + * @param fname name (or prefix) of the fields to extract from + * @param[in,out] dst_size where to store size of result, may be NULL + * @param[out] dst where to store the result + * @return + * #GNUNET_YES if all results could be extracted + * #GNUNET_SYSERR if a result was invalid (non-existing field or NULL) + */ +static int +extract_abs_time (void *cls, + PGresult *result, + int row, + const char *fname, + size_t *dst_size, + void *dst) +{ + struct GNUNET_TIME_Absolute *udst = dst; + const int64_t *res; + int fnum; + + (void) cls; + fnum = PQfnumber (result, + fname); + if (fnum < 0) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + if (PQgetisnull (result, + row, + fnum)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + GNUNET_assert (NULL != dst); + if (sizeof (struct GNUNET_TIME_Absolute) != *dst_size) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + if (sizeof (int64_t) != + PQgetlength (result, + row, + fnum)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + res = (int64_t *) PQgetvalue (result, + row, + fnum); + if (INT64_MAX == *res) + *udst = GNUNET_TIME_UNIT_FOREVER_ABS; + else + udst->abs_value_us = GNUNET_ntohll ((uint64_t) *res); + return GNUNET_OK; +} + + /** * Absolute time expected. * @@ -525,8 +599,12 @@ struct GNUNET_PQ_ResultSpec GNUNET_PQ_result_spec_absolute_time (const char *name, struct GNUNET_TIME_Absolute *at) { - return GNUNET_PQ_result_spec_uint64 (name, - &at->abs_value_us); + struct GNUNET_PQ_ResultSpec res = + { &extract_abs_time, + NULL, + NULL, + (void *) at, sizeof (*at), (name), NULL }; + return res; } @@ -572,6 +650,7 @@ extract_uint16 (void *cls, const uint16_t *res; int fnum; + (void) cls; fnum = PQfnumber (result, fname); if (fnum < 0) @@ -653,6 +732,7 @@ extract_uint32 (void *cls, const uint32_t *res; int fnum; + (void) cls; fnum = PQfnumber (result, fname); if (fnum < 0) @@ -734,6 +814,7 @@ extract_uint64 (void *cls, const uint64_t *res; int fnum; + (void) cls; fnum = PQfnumber (result, fname); if (fnum < 0) -- cgit v1.2.3-18-g5258 From 3e5842e44aac604c505edd60a4f3dd8a360ff45b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 12 Jun 2018 14:57:51 +0200 Subject: tell mysql that our integers are unsigned --- src/my/my.c | 26 +++++++++++--------------- src/my/my_query_helper.c | 22 +++++++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/my/my.c b/src/my/my.c index b9d5c84247..2f4cd3ba38 100644 --- a/src/my/my.c +++ b/src/my/my.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - Copyright (C) 2016 Inria & GNUnet e.V. + Copyright (C) 2016, 2018 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published @@ -43,19 +43,20 @@ GNUNET_MY_exec_prepared (struct GNUNET_MYSQL_Context *mc, { const struct GNUNET_MY_QueryParam *p; unsigned int num; - unsigned int i; MYSQL_STMT *stmt; num = 0; - for (i=0;NULL != params[i].conv;i++) + for (unsigned int i=0;NULL != params[i].conv;i++) num += params[i].num_params; { MYSQL_BIND qbind[num]; unsigned int off; - memset (qbind, 0, sizeof(qbind)); + memset (qbind, + 0, + sizeof(qbind)); off = 0; - for (i=0;NULL != (p = ¶ms[i])->conv;i++) + for (unsigned int i=0;NULL != (p = ¶ms[i])->conv;i++) { if (GNUNET_OK != p->conv (p->conv_cls, @@ -111,9 +112,7 @@ void GNUNET_MY_cleanup_query (struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { - unsigned int i; - - for (i=0; NULL != qp[i].conv ;i++) + for (unsigned int i=0; NULL != qp[i].conv ;i++) if (NULL != qp[i].cleaner) qp[i].cleaner (qp[i].conv_cls, &qbind[i]); @@ -136,7 +135,6 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, struct GNUNET_MY_ResultSpec *rs) { unsigned int num_fields; - unsigned int i; int ret; MYSQL_STMT *stmt; @@ -153,7 +151,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, } num_fields = 0; - for (i=0;NULL != rs[i].pre_conv;i++) + for (unsigned int i=0;NULL != rs[i].pre_conv;i++) num_fields += rs[i].num_fields; if (mysql_stmt_field_count (stmt) != num_fields) @@ -169,7 +167,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, memset (result, 0, sizeof (MYSQL_BIND) * num_fields); field_off = 0; - for (i=0;NULL != rs[i].pre_conv;i++) + for (unsigned int i=0;NULL != rs[i].pre_conv;i++) { struct GNUNET_MY_ResultSpec *rp = &rs[i]; @@ -221,7 +219,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, return GNUNET_SYSERR; } field_off = 0; - for (i=0;NULL != rs[i].post_conv;i++) + for (unsigned int i=0;NULL != rs[i].post_conv;i++) { struct GNUNET_MY_ResultSpec *rp = &rs[i]; @@ -256,9 +254,7 @@ GNUNET_MY_extract_result (struct GNUNET_MYSQL_StatementHandle *sh, void GNUNET_MY_cleanup_result (struct GNUNET_MY_ResultSpec *rs) { - unsigned int i; - - for (i=0;NULL != rs[i].post_conv;i++) + for (unsigned int i=0;NULL != rs[i].post_conv;i++) if (NULL != rs[i].cleaner) rs[i].cleaner (rs[i].conv_cls, &rs[i]); diff --git a/src/my/my_query_helper.c b/src/my/my_query_helper.c index c4516715a7..b2a893a44c 100644 --- a/src/my/my_query_helper.c +++ b/src/my/my_query_helper.c @@ -37,6 +37,7 @@ static void my_clean_query (void *cls, MYSQL_BIND *qbind) { + (void) cls; GNUNET_free (qbind[0].buffer); } @@ -54,6 +55,7 @@ my_conv_fixed_size (void *cls, const struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { + (void) cls; GNUNET_assert (1 == qp->num_params); qbind->buffer = (void *) qp->data; qbind->buffer_length = qp->data_len; @@ -99,12 +101,11 @@ my_conv_string (void *cls, const struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { + (void) cls; GNUNET_assert (1 == qp->num_params); - qbind->buffer = (void *) qp->data; qbind->buffer_length = qp->data_len; qbind->buffer_type = MYSQL_TYPE_STRING; - return 1; } @@ -142,10 +143,12 @@ my_conv_uint16 (void *cls, const struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { + (void) cls; GNUNET_assert (1 == qp->num_params); qbind->buffer = (void *) qp->data; qbind->buffer_length = sizeof (uint16_t); qbind->buffer_type = MYSQL_TYPE_SHORT; + qbind->is_unsigned = 1; return 1; } @@ -184,11 +187,12 @@ my_conv_uint32 (void *cls, const struct GNUNET_MY_QueryParam *qp, MYSQL_BIND *qbind) { + (void) cls; GNUNET_assert (1 == qp->num_params); qbind->buffer = (void *) qp->data; qbind->buffer_length = sizeof(uint32_t); qbind->buffer_type = MYSQL_TYPE_LONG; - + qbind->is_unsigned = 1; return 1; } @@ -227,10 +231,12 @@ my_conv_uint64 (void *cls, const struct GNUNET_MY_QueryParam *qp, MYSQL_BIND * qbind) { + (void) cls; GNUNET_assert (1 == qp->num_params); qbind->buffer = (void *) qp->data; qbind->buffer_length = sizeof (uint64_t); qbind->buffer_type = MYSQL_TYPE_LONGLONG; + qbind->is_unsigned = 1; return 1; } @@ -273,14 +279,13 @@ my_conv_rsa_public_key (void *cls, char *buf; size_t buf_size; + (void) cls; GNUNET_assert(1 == qp->num_params); - - buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, &buf); - + buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, + &buf); qbind->buffer = (void *) buf; qbind->buffer_length = buf_size; qbind->buffer_type = MYSQL_TYPE_BLOB; - return 1; } @@ -325,14 +330,13 @@ my_conv_rsa_signature (void *cls, char *buf; size_t buf_size; + (void) cls; GNUNET_assert(1 == qp->num_params); - buf_size = GNUNET_CRYPTO_rsa_signature_encode (sig, &buf); qbind->buffer = (void *) buf; qbind->buffer_length = buf_size; qbind->buffer_type = MYSQL_TYPE_BLOB; - return 1; } -- cgit v1.2.3-18-g5258 From c4ea87522edf51a18538715bec7f4baa87c13cd4 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 12 Jun 2018 15:10:52 +0200 Subject: ensure DHT never accepts or passes along expired blocks --- src/dht/gnunet-service-dht_neighbours.c | 76 +++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 22 deletions(-) diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 9c13957826..56639448f5 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c @@ -468,6 +468,7 @@ free_connect_info (void *cls, { struct ConnectInfo *ci = value; + (void) cls; GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multipeermap_remove (all_desired_peers, peer, @@ -579,7 +580,10 @@ update_desire_strength (void *cls, const struct GNUNET_PeerIdentity *pid, void *value) { - try_connect (pid, NULL); + (void) cls; + (void) value; + try_connect (pid, + NULL); return GNUNET_YES; } @@ -616,6 +620,8 @@ add_known_to_bloom (void *cls, struct GNUNET_BLOCK_Group *bg = cls; struct GNUNET_HashCode key_hash; + (void) cls; + (void) value; GNUNET_CRYPTO_hash (key, sizeof (struct GNUNET_PeerIdentity), &key_hash); @@ -643,7 +649,8 @@ send_find_peer_message (void *cls) struct GNUNET_BLOCK_Group *bg; struct GNUNET_CONTAINER_BloomFilter *peer_bf; - find_peer_task = NULL; + (void) cls; + find_peer_task = NULL; if (newly_found_peers > bucket_size) { /* If we are finding many peers already, no need to send out our request right now! */ @@ -716,7 +723,8 @@ handle_core_connect (void *cls, { struct PeerInfo *pi; - /* Check for connect to self message */ + (void) cls; + /* Check for connect to self message */ if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity))) @@ -739,13 +747,13 @@ handle_core_connect (void *cls, &pi->phash); pi->peer_bucket = find_bucket (&pi->phash); GNUNET_assert ( (pi->peer_bucket >= 0) && - (pi->peer_bucket < MAX_BUCKETS) ); + ((unsigned int) pi->peer_bucket < MAX_BUCKETS) ); GNUNET_CONTAINER_DLL_insert_tail (k_buckets[pi->peer_bucket].head, k_buckets[pi->peer_bucket].tail, pi); k_buckets[pi->peer_bucket].peers_size++; closest_bucket = GNUNET_MAX (closest_bucket, - pi->peer_bucket); + (unsigned int) pi->peer_bucket); GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (all_connected_peers, pi->id, @@ -783,6 +791,7 @@ handle_core_disconnect (void *cls, { struct PeerInfo *to_remove = internal_cls; + (void) cls; /* Check for disconnect from self message */ if (NULL == to_remove) return; @@ -946,23 +955,23 @@ GDS_am_closest_peer (const struct GNUNET_HashCode *key, int bits; int other_bits; int bucket_num; - int count; struct PeerInfo *pos; - if (0 == memcmp (&my_identity_hash, key, sizeof (struct GNUNET_HashCode))) + if (0 == memcmp (&my_identity_hash, + key, + sizeof (struct GNUNET_HashCode))) return GNUNET_YES; bucket_num = find_bucket (key); GNUNET_assert (bucket_num >= 0); bits = GNUNET_CRYPTO_hash_matching_bits (&my_identity_hash, key); pos = k_buckets[bucket_num].head; - count = 0; - while ((NULL != pos) && (count < bucket_size)) + while (NULL != pos) { - if ((NULL != bloom) && - (GNUNET_YES == - GNUNET_CONTAINER_bloomfilter_test (bloom, - &pos->phash))) + if ( (NULL != bloom) && + (GNUNET_YES == + GNUNET_CONTAINER_bloomfilter_test (bloom, + &pos->phash)) ) { pos = pos->next; continue; /* Skip already checked entries */ @@ -1594,6 +1603,7 @@ static void core_init (void *cls, const struct GNUNET_PeerIdentity *identity) { + (void) cls; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "CORE called, I am %s\n", GNUNET_i2s (identity)); @@ -1619,6 +1629,7 @@ check_dht_p2p_put (void *cls, uint32_t putlen; uint16_t msize; + (void) cls; msize = ntohs (put->header.size); putlen = ntohl (put->put_path_length); if ((msize < @@ -1654,7 +1665,17 @@ handle_dht_p2p_put (void *cls, struct GNUNET_CONTAINER_BloomFilter *bf; struct GNUNET_HashCode test_key; int forwarded; + struct GNUNET_TIME_Absolute exp_time; + exp_time = GNUNET_TIME_absolute_ntoh (put->expiration_time); + if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us) + { + GNUNET_STATISTICS_update (GDS_stats, + gettext_noop ("# Expired PUTs discarded"), + 1, + GNUNET_NO); + return; + } msize = ntohs (put->header.size); putlen = ntohl (put->put_path_length); GNUNET_STATISTICS_update (GDS_stats, @@ -1790,7 +1811,7 @@ handle_dht_p2p_put (void *cls, putlen = 0; /* give to local clients */ - GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (put->expiration_time), + GDS_CLIENTS_handle_reply (exp_time, &put->key, 0, NULL, @@ -1802,7 +1823,7 @@ handle_dht_p2p_put (void *cls, /* store locally */ if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) || (GDS_am_closest_peer (&put->key, bf))) - GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time), + GDS_DATACACHE_handle_put (exp_time, &put->key, putlen, pp, @@ -1813,7 +1834,7 @@ handle_dht_p2p_put (void *cls, forwarded = GDS_NEIGHBOURS_handle_put (ntohl (put->type), options, ntohl (put->desired_replication_level), - GNUNET_TIME_absolute_ntoh (put->expiration_time), + exp_time, ntohl (put->hop_count), bf, &put->key, @@ -1830,7 +1851,7 @@ handle_dht_p2p_put (void *cls, ntohl (put->hop_count), ntohl (put->desired_replication_level), putlen, pp, - GNUNET_TIME_absolute_ntoh (put->expiration_time), + exp_time, &put->key, payload, payload_size); @@ -1907,9 +1928,9 @@ handle_find_peer (const struct GNUNET_PeerIdentity *sender, sizeof (struct GNUNET_HashCode))) bucket_idx = closest_bucket; else - bucket_idx = GNUNET_MIN (closest_bucket, + bucket_idx = GNUNET_MIN ((int) closest_bucket, find_bucket (key)); - if (bucket_idx == GNUNET_SYSERR) + if (bucket_idx < 0) return; bucket = &k_buckets[bucket_idx]; if (bucket->peers_size == 0) @@ -2016,6 +2037,7 @@ check_dht_p2p_get (void *cls, uint32_t xquery_size; uint16_t msize; + (void) cls; msize = ntohs (get->header.size); xquery_size = ntohl (get->xquery_size); if (msize < sizeof (struct PeerGetMessage) + xquery_size) @@ -2203,6 +2225,7 @@ check_dht_p2p_result (void *cls, uint32_t put_path_length; uint16_t msize; + (void) cls; msize = ntohs (prm->header.size); put_path_length = ntohl (prm->put_path_length); get_path_length = ntohl (prm->get_path_length); @@ -2316,8 +2339,18 @@ handle_dht_p2p_result (void *cls, uint16_t msize; size_t data_size; enum GNUNET_BLOCK_Type type; + struct GNUNET_TIME_Absolute exp_time; /* parse and validate message */ + exp_time = GNUNET_TIME_absolute_ntoh (prm->expiration_time); + if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us) + { + GNUNET_STATISTICS_update (GDS_stats, + gettext_noop ("# Expired results discarded"), + 1, + GNUNET_NO); + return; + } msize = ntohs (prm->header.size); put_path_length = ntohl (prm->put_path_length); get_path_length = ntohl (prm->get_path_length); @@ -2391,7 +2424,6 @@ handle_dht_p2p_result (void *cls, h); } - /* First, check if 'peer' is already on the path, and if so, truncate it instead of expanding. */ for (unsigned int i=0;i<=get_path_length;i++) @@ -2399,7 +2431,7 @@ handle_dht_p2p_result (void *cls, peer->id, sizeof (struct GNUNET_PeerIdentity))) { - process_reply_with_path (GNUNET_TIME_absolute_ntoh (prm->expiration_time), + process_reply_with_path (exp_time, &prm->key, i, get_path, @@ -2420,7 +2452,7 @@ handle_dht_p2p_result (void *cls, get_path_length * sizeof (struct GNUNET_PeerIdentity)); xget_path[get_path_length] = *peer->id; - process_reply_with_path (GNUNET_TIME_absolute_ntoh (prm->expiration_time), + process_reply_with_path (exp_time, &prm->key, get_path_length + 1, xget_path, -- cgit v1.2.3-18-g5258 From f24f95b6664f5e1d2a8e3cd6d03c957b0d2efd74 Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Tue, 12 Jun 2018 23:03:47 +0200 Subject: rps profiler: generate output for randomness tests --- src/rps/gnunet-rps-profiler.c | 21 +++- src/rps/rps-test_util.c | 219 +++++++++++++++++++++++++++++++++++++++--- src/rps/rps-test_util.h | 8 +- 3 files changed, 233 insertions(+), 15 deletions(-) diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c index 5ef42187f2..4a7a89b15d 100644 --- a/src/rps/gnunet-rps-profiler.c +++ b/src/rps/gnunet-rps-profiler.c @@ -41,6 +41,11 @@ */ static uint32_t num_peers; +/** + * @brief numer of bits required to represent the largest peer id + */ +static unsigned bits_needed; + /** * How long do we run the test? * In seconds. @@ -1698,6 +1703,7 @@ profiler_reply_handle (void *cls, char *file_name; char *file_name_dh; char *file_name_dhr; + char *file_name_dhru; unsigned int i; struct PendingReply *pending_rep = (struct PendingReply *) cls; @@ -1706,6 +1712,7 @@ profiler_reply_handle (void *cls, file_name = "/tmp/rps/received_ids"; file_name_dh = "/tmp/rps/diehard_input"; file_name_dhr = "/tmp/rps/diehard_input_raw"; + file_name_dhru = "/tmp/rps/diehard_input_raw_aligned"; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%s] got %" PRIu64 " peers:\n", GNUNET_i2s (rps_peer->peer_id), @@ -1725,8 +1732,12 @@ profiler_reply_handle (void *cls, "%" PRIu32 "\n", (uint32_t) rcv_rps_peer->index); to_file_raw (file_name_dhr, - &rcv_rps_peer->index, + (char *) &rcv_rps_peer->index, sizeof (uint32_t)); + to_file_raw_unaligned (file_name_dhru, + (char *) &rcv_rps_peer->index, + sizeof (uint32_t), + bits_needed); } default_reply_handle (cls, n, recv_peers); } @@ -2626,6 +2637,14 @@ run (void *cls, GNUNET_DISK_directory_create ("/tmp/rps/"); timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, timeout_s); + /* Compute number of bits for representing largest peer id */ + for (bits_needed = 1; (bits_needed << 1) < num_peers - 1; bits_needed++) + ; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Need %u bits to represent largest peer id %" PRIu32 "\n", + bits_needed, + num_peers - 1); + rps_peers = GNUNET_new_array (num_peers, struct RPSPeer); peer_map = GNUNET_CONTAINER_multipeermap_create (num_peers, GNUNET_NO); rps_peer_ids = GNUNET_new_array (num_peers, struct GNUNET_PeerIdentity); diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index ea55deac55..64ef5b986d 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -29,13 +29,37 @@ #include -#define LOG(kind, ...) GNUNET_log_from(kind,"rps-sampler",__VA_ARGS__) +#define LOG(kind, ...) GNUNET_log_from(kind,"rps-test_util",__VA_ARGS__) #ifndef TO_FILE #define TO_FILE #endif /* TO_FILE */ #ifdef TO_FILE + +#define B2B_PAT "%c%c%c%c%c%c%c%c" +#define B2B(byte) \ + (byte & 0x80 ? '1' : '0'), \ + (byte & 0x40 ? '1' : '0'), \ + (byte & 0x20 ? '1' : '0'), \ + (byte & 0x10 ? '1' : '0'), \ + (byte & 0x08 ? '1' : '0'), \ + (byte & 0x04 ? '1' : '0'), \ + (byte & 0x02 ? '1' : '0'), \ + (byte & 0x01 ? '1' : '0') + +#define min(x,y) ((x) > (y) ? (y) : (x)) + +/** + * @brief buffer for storing the unaligned bits for the next write + */ +static char buf_unaligned; + +/** + * @brief number of bits in unaligned buffer + */ +static unsigned num_bits_buf_unaligned; + void to_file_ (const char *file_name, char *line) { @@ -108,11 +132,10 @@ to_file_ (const char *file_name, char *line) } void -to_file_raw (const char *file_name, void *buf, size_t size_buf) +to_file_raw (const char *file_name, const char *buf, size_t size_buf) { struct GNUNET_DISK_FileHandle *f; - size_t size2; - + size_t size_written; if (NULL == (f = GNUNET_DISK_file_open (file_name, GNUNET_DISK_OPEN_APPEND | @@ -129,13 +152,13 @@ to_file_raw (const char *file_name, void *buf, size_t size_buf) return; } - size2 = GNUNET_DISK_file_write (f, buf, size_buf); - if (size_buf != size2) + size_written = GNUNET_DISK_file_write (f, buf, size_buf); + if (size_buf != size_written) { LOG (GNUNET_ERROR_TYPE_WARNING, - "Unable to write to file! (Size: %u, size2: %u)\n", + "Unable to write to file! (Size: %u, size_written: %u)\n", size_buf, - size2); + size_written); if (GNUNET_YES != GNUNET_DISK_file_close (f)) LOG (GNUNET_ERROR_TYPE_WARNING, @@ -143,15 +166,185 @@ to_file_raw (const char *file_name, void *buf, size_t size_buf) return; } +} - //if (512 < size_buf) +void +to_file_raw_unaligned (const char *file_name, + const char *buf, + size_t size_buf, + unsigned bits_needed) +{ + // TODO endianness! + GNUNET_assert (size_buf >= (bits_needed/8)); + //if (0 == num_bits_buf_unaligned) //{ - // GNUNET_free (output_buffer_p); + // if (0 == (bits_needed % 8)) + // { + // to_file_raw (file_name, buf, size_buf); + // return; + // } + // to_file_raw (file_name, buf, size_buf - 1); + // buf_unaligned = buf[size_buf - 1]; + // num_bits_buf_unaligned = bits_needed % 8; + // return; //} - //if (GNUNET_YES != GNUNET_DISK_file_close (f)) - // LOG (GNUNET_ERROR_TYPE_WARNING, - // "Unable to close file\n"); + char buf_write[size_buf + 1]; + const unsigned bytes_iter = (0 != bits_needed % 8? + (bits_needed/8)+1: + bits_needed/8); + // TODO what if no iteration happens? + unsigned size_buf_write = 0; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "num_bits_buf_unaligned: %u\n", + num_bits_buf_unaligned); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "ua args: size_buf: %u, bits_needed: %u -> iter: %u\n", + size_buf, + bits_needed, + bytes_iter); + buf_write[0] = buf_unaligned; + /* Iterate over input bytes */ + for (unsigned i = 0; i < bytes_iter; i++) + { + /* Number of bits needed in this iteration - 8 for all except last iter */ + unsigned num_bits_needed_iter; + /* Mask for bits to actually use */ + unsigned mask_bits_needed_iter; + char byte_input; + /* Number of bits needed to align unaligned byte */ + unsigned num_bits_to_align; + /* Number of bits that are to be moved */ + unsigned num_bits_to_move; + /* Mask for bytes to be moved */ + char mask_input_to_move; + /* Masked bits to be moved */ + char bits_to_move; + /* The amount of bits needed to fit the bits to shift to the nearest spot */ + unsigned distance_shift_bits; + /* Shifted bits on the move */ + char bits_moving; + /* (unaligned) byte being filled with bits */ + char byte_to_fill; + /* mask for needed bits of the input byte that have not been moved */ + char mask_input_leftover; + /* needed bits of the input byte that have not been moved */ + char byte_input_leftover; + unsigned num_bits_leftover; + unsigned num_bits_discard; + char byte_unaligned_new; + + if ( (bits_needed - (i * 8)) <= 8) + { + /* last iteration */ + num_bits_needed_iter = bits_needed - (i * 8); + } + else + { + num_bits_needed_iter = 8; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "number of bits needed in this iteration: %u\n", + num_bits_needed_iter); + mask_bits_needed_iter = ((char) 1 << num_bits_needed_iter) - 1; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "mask needed bits (current iter): "B2B_PAT"\n", + B2B(mask_bits_needed_iter)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Unaligned byte: "B2B_PAT" (%u bits)\n", + B2B(buf_unaligned), + num_bits_buf_unaligned); + byte_input = buf[i]; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "next whole input byte: "B2B_PAT"\n", + B2B(byte_input)); + byte_input &= mask_bits_needed_iter; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "input byte, needed bits: "B2B_PAT"\n", + B2B(byte_input)); + num_bits_to_align = 8 - num_bits_buf_unaligned; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "number of bits needed to align unaligned bit: %u\n", + num_bits_to_align); + num_bits_to_move = min (num_bits_to_align, num_bits_needed_iter); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "number of bits of new byte to move: %u\n", + num_bits_to_move); + mask_input_to_move = ((char) 1 << num_bits_to_move) - 1; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "mask of bits of new byte to take for moving: "B2B_PAT"\n", + B2B(mask_input_to_move)); + bits_to_move = byte_input & mask_input_to_move; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "masked bits of new byte to take for moving: "B2B_PAT"\n", + B2B(bits_to_move)); + distance_shift_bits = num_bits_buf_unaligned; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "distance needed to shift bits to their correct spot: %u\n", + distance_shift_bits); + bits_moving = bits_to_move << distance_shift_bits; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "shifted, masked bits of new byte being moved: "B2B_PAT"\n", + B2B(bits_moving)); + byte_to_fill = buf_unaligned | bits_moving; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "byte being filled: "B2B_PAT"\n", + B2B(byte_to_fill)); + if (num_bits_buf_unaligned + num_bits_needed_iter > 8) + { + /* buf_unaligned was aligned by filling + * -> can be written to storage */ + buf_write[i] = byte_to_fill; + size_buf_write++; + + /* store the leftover, unaligned bits in buffer */ + mask_input_leftover = mask_bits_needed_iter & (~ mask_input_to_move); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "mask of leftover bits of new byte: "B2B_PAT"\n", + B2B(mask_input_leftover)); + byte_input_leftover = byte_input & mask_input_leftover; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "masked, leftover bits of new byte: "B2B_PAT"\n", + B2B(byte_input_leftover)); + num_bits_leftover = num_bits_needed_iter - num_bits_to_move; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "number of unaligned bits left: %u\n", + num_bits_leftover); + num_bits_discard = 8 - num_bits_needed_iter; + byte_unaligned_new = byte_input_leftover >> num_bits_to_move; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "new unaligned byte: "B2B_PAT"\n", + B2B(byte_unaligned_new)); + buf_unaligned = byte_unaligned_new; + num_bits_buf_unaligned = num_bits_leftover % 8; + } + else + { + /* unaligned buffer still unaligned but 'fuller' */ + buf_unaligned = byte_to_fill; + num_bits_buf_unaligned = (num_bits_buf_unaligned + bits_needed) % 8; + } + ///* Byte to be completed will consist of what is left in the unaligned + // * byte and the rest of the input byte */ + //LOG (GNUNET_ERROR_TYPE_DEBUG, + // "ua: %u - %x, %x << %u = %x\n", + // i, + // buf_unaligned, + // num_bits_buf_unaligned, + // (char) ((char) buf_unaligned << num_bits_buf_unaligned)); + //buf_write[i] = buf_write[i] | + // (char) ((char) buf_unaligned << num_bits_buf_unaligned); + //LOG (GNUNET_ERROR_TYPE_DEBUG, + // "ua: %x\n", + // buf_write[i]); + //buf_unaligned = buf[i] >> num_bits_buf_unaligned; + //LOG (GNUNET_ERROR_TYPE_DEBUG, + // "ua: %x\n" + // "---\n", + // buf_unaligned); + } + to_file_raw (file_name, buf_write, size_buf_write); + LOG (GNUNET_ERROR_TYPE_DEBUG, "\n"); } char * diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h index d424227506..577a2b0a71 100644 --- a/src/rps/rps-test_util.h +++ b/src/rps/rps-test_util.h @@ -75,7 +75,13 @@ store_prefix_file_name (const struct GNUNET_PeerIdentity *peer, const char *prefix); void -to_file_raw (const char *file_name, void *buf, size_t size_buf); +to_file_raw (const char *file_name, const char *buf, size_t size_buf); + +void +to_file_raw_unaligned (const char *file_name, + const char *buf, + size_t size_buf, + unsigned bits_needed); #endif /* RPS_TEST_UTIL_H */ /* end of gnunet-service-rps.c */ -- cgit v1.2.3-18-g5258 From 8503c6fa26449228fa691c1dedfe3ca1a8d0b9ba Mon Sep 17 00:00:00 2001 From: Julius Bünger Date: Tue, 12 Jun 2018 23:07:53 +0200 Subject: rps profiler: cleaned debug output --- src/rps/rps-test_util.c | 86 ------------------------------------------------- 1 file changed, 86 deletions(-) diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c index 64ef5b986d..9a1dfe0d83 100644 --- a/src/rps/rps-test_util.c +++ b/src/rps/rps-test_util.c @@ -37,17 +37,6 @@ #ifdef TO_FILE -#define B2B_PAT "%c%c%c%c%c%c%c%c" -#define B2B(byte) \ - (byte & 0x80 ? '1' : '0'), \ - (byte & 0x40 ? '1' : '0'), \ - (byte & 0x20 ? '1' : '0'), \ - (byte & 0x10 ? '1' : '0'), \ - (byte & 0x08 ? '1' : '0'), \ - (byte & 0x04 ? '1' : '0'), \ - (byte & 0x02 ? '1' : '0'), \ - (byte & 0x01 ? '1' : '0') - #define min(x,y) ((x) > (y) ? (y) : (x)) /** @@ -195,14 +184,6 @@ to_file_raw_unaligned (const char *file_name, bits_needed/8); // TODO what if no iteration happens? unsigned size_buf_write = 0; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "num_bits_buf_unaligned: %u\n", - num_bits_buf_unaligned); - LOG (GNUNET_ERROR_TYPE_DEBUG, - "ua args: size_buf: %u, bits_needed: %u -> iter: %u\n", - size_buf, - bits_needed, - bytes_iter); buf_write[0] = buf_unaligned; /* Iterate over input bytes */ for (unsigned i = 0; i < bytes_iter; i++) @@ -243,53 +224,16 @@ to_file_raw_unaligned (const char *file_name, { num_bits_needed_iter = 8; } - LOG (GNUNET_ERROR_TYPE_DEBUG, - "number of bits needed in this iteration: %u\n", - num_bits_needed_iter); mask_bits_needed_iter = ((char) 1 << num_bits_needed_iter) - 1; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "mask needed bits (current iter): "B2B_PAT"\n", - B2B(mask_bits_needed_iter)); - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Unaligned byte: "B2B_PAT" (%u bits)\n", - B2B(buf_unaligned), - num_bits_buf_unaligned); byte_input = buf[i]; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "next whole input byte: "B2B_PAT"\n", - B2B(byte_input)); byte_input &= mask_bits_needed_iter; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "input byte, needed bits: "B2B_PAT"\n", - B2B(byte_input)); num_bits_to_align = 8 - num_bits_buf_unaligned; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "number of bits needed to align unaligned bit: %u\n", - num_bits_to_align); num_bits_to_move = min (num_bits_to_align, num_bits_needed_iter); - LOG (GNUNET_ERROR_TYPE_DEBUG, - "number of bits of new byte to move: %u\n", - num_bits_to_move); mask_input_to_move = ((char) 1 << num_bits_to_move) - 1; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "mask of bits of new byte to take for moving: "B2B_PAT"\n", - B2B(mask_input_to_move)); bits_to_move = byte_input & mask_input_to_move; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "masked bits of new byte to take for moving: "B2B_PAT"\n", - B2B(bits_to_move)); distance_shift_bits = num_bits_buf_unaligned; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "distance needed to shift bits to their correct spot: %u\n", - distance_shift_bits); bits_moving = bits_to_move << distance_shift_bits; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "shifted, masked bits of new byte being moved: "B2B_PAT"\n", - B2B(bits_moving)); byte_to_fill = buf_unaligned | bits_moving; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "byte being filled: "B2B_PAT"\n", - B2B(byte_to_fill)); if (num_bits_buf_unaligned + num_bits_needed_iter > 8) { /* buf_unaligned was aligned by filling @@ -299,22 +243,10 @@ to_file_raw_unaligned (const char *file_name, /* store the leftover, unaligned bits in buffer */ mask_input_leftover = mask_bits_needed_iter & (~ mask_input_to_move); - LOG (GNUNET_ERROR_TYPE_DEBUG, - "mask of leftover bits of new byte: "B2B_PAT"\n", - B2B(mask_input_leftover)); byte_input_leftover = byte_input & mask_input_leftover; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "masked, leftover bits of new byte: "B2B_PAT"\n", - B2B(byte_input_leftover)); num_bits_leftover = num_bits_needed_iter - num_bits_to_move; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "number of unaligned bits left: %u\n", - num_bits_leftover); num_bits_discard = 8 - num_bits_needed_iter; byte_unaligned_new = byte_input_leftover >> num_bits_to_move; - LOG (GNUNET_ERROR_TYPE_DEBUG, - "new unaligned byte: "B2B_PAT"\n", - B2B(byte_unaligned_new)); buf_unaligned = byte_unaligned_new; num_bits_buf_unaligned = num_bits_leftover % 8; } @@ -324,24 +256,6 @@ to_file_raw_unaligned (const char *file_name, buf_unaligned = byte_to_fill; num_bits_buf_unaligned = (num_bits_buf_unaligned + bits_needed) % 8; } - ///* Byte to be completed will consist of what is left in the unaligned - // * byte and the rest of the input byte */ - //LOG (GNUNET_ERROR_TYPE_DEBUG, - // "ua: %u - %x, %x << %u = %x\n", - // i, - // buf_unaligned, - // num_bits_buf_unaligned, - // (char) ((char) buf_unaligned << num_bits_buf_unaligned)); - //buf_write[i] = buf_write[i] | - // (char) ((char) buf_unaligned << num_bits_buf_unaligned); - //LOG (GNUNET_ERROR_TYPE_DEBUG, - // "ua: %x\n", - // buf_write[i]); - //buf_unaligned = buf[i] >> num_bits_buf_unaligned; - //LOG (GNUNET_ERROR_TYPE_DEBUG, - // "ua: %x\n" - // "---\n", - // buf_unaligned); } to_file_raw (file_name, buf_write, size_buf_write); LOG (GNUNET_ERROR_TYPE_DEBUG, "\n"); -- cgit v1.2.3-18-g5258