June 2016 - tor-commits - lists.torproject.org

[torsocks/master] Use seconds since epoch, not local time, for log timestamps.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 35187508cfaf3fd21ed68159f4635ee2d376aea4 Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Fri Jun 19 04:23:36 2015 +0000 Use seconds since epoch, not local time, for log timestamps. Local time may require opening files to load the time zone database, which leads to a potential deadlock-against-self when intercepting a close() in the middle of tsocks_once initialization for close(). The same issue applies even if we use UTC, via gmtime. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/log.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index b68d66b..8bf8836 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -47,14 +47,12 @@ int tsocks_loglevel = DEFAULT_LOG_LEVEL; static size_t add_time_to_log(char *buf, size_t len) { time_t now; - const struct tm *tm; assert(buf); /* Get time stamp. */ time(&now); - tm = localtime(&now); - return strftime(buf, len, "[%b %d %H:%M:%S] ", tm); + return snprintf(buf, len, "%llu ", (unsigned long long)now); } /*

1 0

[torsocks/master] Use same type for i as for pool->count, uint32_t.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit fb062921a3085ec0cbf805baa5cd0f3a0f4342e6 Author: Taylor R Campbell <campbell+torsocks(a)mumble.net> Date: Tue Jun 16 20:27:58 2015 +0000 Use same type for i as for pool->count, uint32_t. --- src/common/onion.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/onion.c b/src/common/onion.c index 67b4297..6a61d83 100644 --- a/src/common/onion.c +++ b/src/common/onion.c @@ -141,7 +141,7 @@ error: ATTR_HIDDEN void onion_pool_destroy(struct onion_pool *pool) { - int i; + uint32_t i; assert(pool); @@ -220,7 +220,7 @@ ATTR_HIDDEN struct onion_entry *onion_entry_find_by_name(const char *onion_name, struct onion_pool *pool) { - int i; + uint32_t i; struct onion_entry *entry = NULL; assert(onion_name); @@ -251,7 +251,7 @@ ATTR_HIDDEN struct onion_entry *onion_entry_find_by_addr(const struct sockaddr *sa, struct onion_pool *pool) { - int i; + uint32_t i; struct onion_entry *entry = NULL; const struct sockaddr_in *sin;

1 0

[torsocks/master] Fix: allow port 65535.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit d4102a81aa30f5e6cff23242b376ce2f555a1c0e Author: junglefowl <junglefowl(a)riseup.net> Date: Fri Oct 30 19:23:10 2015 +0000 Fix: allow port 65535. Port 65535 is a valid port among the tor code base. In fact, in_port_t type will guarantee a valid port number. The only special value is "0", so drop the 65535 check completely. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/connection.c b/src/common/connection.c index d4ae722..2f48bbc 100644 --- a/src/common/connection.c +++ b/src/common/connection.c @@ -121,7 +121,7 @@ int connection_addr_set(enum connection_domain domain, const char *ip, assert(ip); assert(addr); - if (port == 0 || port >= 65535) { + if (port == 0) { ret = -EINVAL; ERR("Connection addr set port out of range: %d", port); goto error;

1 0

[torsocks/master] Use DEFAULT_CONF_FILE_ENV instead of a hardcoded value.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 80e10aa121cbc3476ef3960f96eaf55843c7c5be Author: Alexander Færøy <ahf(a)0x90.dk> Date: Mon Oct 12 21:56:30 2015 +0200 Use DEFAULT_CONF_FILE_ENV instead of a hardcoded value. This is a trivial clean-up patch that makes init_config() use the DEFAULT_CONF_FILE_ENV define instead of the hardcoded string literal. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 9d92e82..305ad22 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -141,7 +141,7 @@ static void init_config(void) const char *filename = NULL; if (!is_suid) { - filename = getenv("TORSOCKS_CONF_FILE"); + filename = getenv(DEFAULT_CONF_FILE_ENV); } ret = config_file_read(filename, &tsocks_config);

1 0

[torsocks/master] Fix typos in comments
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 7969b543b292b43cdc6e7d9ad8af4f05cb5989b5 Author: junglefowl <junglefowl(a)riseup.net> Date: Mon Jun 13 17:11:38 2016 -0400 Fix typos in comments Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/config-file.c | 4 ++-- src/common/socks5.c | 2 +- src/common/utils.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/config-file.c b/src/common/config-file.c index 05bd480..05ca9cb 100644 --- a/src/common/config-file.c +++ b/src/common/config-file.c @@ -115,7 +115,7 @@ error: } /* - * Parse a single line of from a configuration file and set the value found in + * Parse a single line from a configuration file and set the value found in * the configuration object. * * Return 0 on success or else a negative value. @@ -241,7 +241,7 @@ int conf_file_set_tor_port(const char *port, struct configuration *config) assert(port); assert(config); - /* Let's avoid a integer overflow here ;). */ + /* Let's avoid an integer overflow here ;). */ _port = strtoul(port, &endptr, 10); if (_port == 0 || _port > 65535) { ret = -EINVAL; diff --git a/src/common/socks5.c b/src/common/socks5.c index 962a968..1086deb 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -45,7 +45,7 @@ wait_on_fd(int fd) /* * Receive data on a given file descriptor using recv(2). This handles partial - * send and EINTR. + * recv and EINTR. * * Return the number of bytes received or a negative errno error. */ diff --git a/src/common/utils.c b/src/common/utils.c index e477f11..82479af 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -111,10 +111,10 @@ int utils_is_address_ipv6(const char *ip) } /* - * This routines breaks up input lines into tokens and places these tokens into - * the array specified by tokens + * This routine breaks up input lines into tokens and places these tokens into + * the array specified by tokens. * - * Return the number of token plus one set in the given array. + * Return the number of tokens plus one set in the given array. */ ATTR_HIDDEN int utils_tokenize_ignore_comments(const char *_line, size_t size, char **tokens)

1 0

[torsocks/master] Expose set_tor_{address, port} as conf_file_set_tor_{address, port}.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit e165097d7e719d794f174bc387c50bafa7f575c3 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Mon Oct 12 22:51:46 2015 +0200 Expose set_tor_{address,port} as conf_file_set_tor_{address,port}. This patch exposes set_tor_address and set_tor_port as part of the configuration API as conf_file_set_tor_address and conf_file_set_tor_port. We also ensure to free() the Tor address if it's set multiple times during execution. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/config-file.c | 154 +++++++++++++++++++++++++---------------------- src/common/config-file.h | 2 + src/lib/torsocks.c | 4 +- 3 files changed, 85 insertions(+), 75 deletions(-) diff --git a/src/common/config-file.c b/src/common/config-file.c index 750bfa8..05bd480 100644 --- a/src/common/config-file.c +++ b/src/common/config-file.c @@ -115,75 +115,6 @@ error: } /* - * Set the given string port in a configuration object. - * - * Return 0 on success or else a negative EINVAL if the port is equal to 0 or - * over 65535. - */ -static int set_tor_port(const char *port, struct configuration *config) -{ - int ret = 0; - char *endptr; - unsigned long _port; - - assert(port); - assert(config); - - /* Let's avoid a integer overflow here ;). */ - _port = strtoul(port, &endptr, 10); - if (_port == 0 || _port > 65535) { - ret = -EINVAL; - ERR("Config file invalid port: %s", port); - goto error; - } - - config->conf_file.tor_port = (in_port_t) _port; - - DBG("Config file setting tor port to %lu", _port); - -error: - return ret; -} - -/* - * Set the given string address in a configuration object. - * - * Return 0 on success or else a negative value. On error, the address was not - * recognized. - */ -static int set_tor_address(const char *addr, struct configuration *config) -{ - int ret; - - assert(addr); - assert(config); - - ret = utils_is_address_ipv4(addr); - if (ret == 1 ) { - config->conf_file.tor_domain = CONNECTION_DOMAIN_INET; - } else { - ret = utils_is_address_ipv6(addr); - if (ret != 1) { - /* At this point, the addr is either v4 nor v6 so error. */ - ERR("Config file unknown tor address: %s", addr); - goto error; - } - config->conf_file.tor_domain = CONNECTION_DOMAIN_INET6; - } - config->conf_file.tor_address = strdup(addr); - if (!config->conf_file.tor_address) { - ret = -ENOMEM; - goto error; - } - - DBG("Config file setting tor address to %s", addr); - ret = 0; - -error: - return ret; -} - -/* * Parse a single line of from a configuration file and set the value found in * the configuration object. * @@ -209,12 +140,12 @@ static int parse_config_line(const char *line, struct configuration *config) } if (!strcmp(tokens[0], conf_toraddr_str)) { - ret = set_tor_address(tokens[1], config); + ret = conf_file_set_tor_address(tokens[1], config); if (ret < 0) { goto error; } } else if (!strcmp(tokens[0], conf_torport_str)) { - ret = set_tor_port(tokens[1], config); + ret = conf_file_set_tor_port(tokens[1], config); if (ret < 0) { goto error; } @@ -295,6 +226,83 @@ error: } /* + * Set the given string port in a configuration object. + * + * Return 0 on success or else a negative EINVAL if the port is equal to 0 or + * over 65535. + */ +ATTR_HIDDEN +int conf_file_set_tor_port(const char *port, struct configuration *config) +{ + int ret = 0; + char *endptr; + unsigned long _port; + + assert(port); + assert(config); + + /* Let's avoid a integer overflow here ;). */ + _port = strtoul(port, &endptr, 10); + if (_port == 0 || _port > 65535) { + ret = -EINVAL; + ERR("Config file invalid port: %s", port); + goto error; + } + + config->conf_file.tor_port = (in_port_t) _port; + + DBG("Config file setting tor port to %lu", _port); + +error: + return ret; +} + +/* + * Set the given string address in a configuration object. + * + * Return 0 on success or else a negative value. On error, the address was not + * recognized. + */ +ATTR_HIDDEN +int conf_file_set_tor_address(const char *addr, struct configuration *config) +{ + int ret; + + assert(addr); + assert(config); + + ret = utils_is_address_ipv4(addr); + if (ret == 1 ) { + config->conf_file.tor_domain = CONNECTION_DOMAIN_INET; + } else { + ret = utils_is_address_ipv6(addr); + if (ret != 1) { + /* At this point, the addr is either v4 nor v6 so error. */ + ERR("Config file unknown tor address: %s", addr); + goto error; + } + config->conf_file.tor_domain = CONNECTION_DOMAIN_INET6; + } + + if (config->conf_file.tor_address == NULL) { + free(config->conf_file.tor_address); + config->conf_file.tor_address = NULL; + } + + config->conf_file.tor_address = strdup(addr); + if (!config->conf_file.tor_address) { + ret = -ENOMEM; + goto error; + } + + DBG("Config file setting tor address to %s", addr); + ret = 0; + +error: + return ret; +} + +/* * Set the SOCKS5 username to the given configuration. * * Return 0 on success else a negative value. @@ -538,12 +546,12 @@ int config_file_read(const char *filename, struct configuration *config) fp = fopen(filename, "r"); if (!fp) { WARN("Config file not found: %s. Using default for Tor", filename); - (void) set_tor_address(DEFAULT_TOR_ADDRESS, config); + (void) conf_file_set_tor_address(DEFAULT_TOR_ADDRESS, config); /* * We stringify the default value here so we can print the debug * statement in the function call to set port. */ - (void) set_tor_port(XSTR(DEFAULT_TOR_PORT), config); + (void) conf_file_set_tor_port(XSTR(DEFAULT_TOR_PORT), config); ret = set_onion_info( DEFAULT_ONION_ADDR_RANGE "/" DEFAULT_ONION_ADDR_MASK, config); diff --git a/src/common/config-file.h b/src/common/config-file.h index 48be392..154c7be 100644 --- a/src/common/config-file.h +++ b/src/common/config-file.h @@ -94,6 +94,8 @@ struct configuration { int config_file_read(const char *filename, struct configuration *config); void config_file_destroy(struct config_file *conf); +int conf_file_set_tor_address(const char *addr, struct configuration *config); +int conf_file_set_tor_port(const char *port, struct configuration *config); int conf_file_set_socks5_pass(const char *password, struct configuration *config); int conf_file_set_socks5_user(const char *username, diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 305ad22..60d586d 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -158,8 +158,8 @@ static void init_config(void) * are missing. */ if (!tsocks_config.conf_file.tor_address) { - tsocks_config.conf_file.tor_address = strdup(DEFAULT_TOR_ADDRESS); - if (!tsocks_config.conf_file.tor_address) { + ret = conf_file_set_tor_address(DEFAULT_TOR_ADDRESS, &tsocks_config); + if (ret < 0) { /* Most likely ENOMEM thus we can't continue. */ clean_exit(EXIT_FAILURE); }

1 0

[torsocks/master] Add --address and --port for torsocks.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit 4073958481faaf3220b09a3a499e1f104d969d29 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Mon Oct 12 23:21:25 2015 +0200 Add --address and --port for torsocks. This patch adds two new arguments for the torsocks script: --address (-a), for specifying the address of the Tor instance to use, and --port (-P), for specifying the port of the Tor instance to use. --- doc/torsocks.1 | 6 ++++++ doc/torsocks.8 | 8 ++++++++ src/bin/torsocks.in | 38 ++++++++++++++++++++++++++++---------- src/common/defaults.h | 4 ++++ src/lib/torsocks.c | 18 +++++++++++++++++- 5 files changed, 63 insertions(+), 11 deletions(-) diff --git a/doc/torsocks.1 b/doc/torsocks.1 index 0e3c341..e4ac628 100644 --- a/doc/torsocks.1 +++ b/doc/torsocks.1 @@ -47,6 +47,12 @@ Set password for the SOCKS5 authentication. Use for circuit isolation in Tor. Note that you MUST have a username set either by the command line, environment variable or configuration file (torsocks.conf(5)). .TP +.BR "\-a, \-\-address" +Set Tor address. +.TP +.BR "\-P, \-\-port" +Set Tor port. +.TP .BR "\-i, \-\-isolate" Automatic tor isolation. Set the username and password for the SOCKS5 authentication method to a PID/current time based value automatically. Username diff --git a/doc/torsocks.8 b/doc/torsocks.8 index ac3863a..c3f477f 100644 --- a/doc/torsocks.8 +++ b/doc/torsocks.8 @@ -95,6 +95,14 @@ Set the password for the SOCKS5 authentication method. Username MUST be set also with the variable above. .PP +.IP TORSOCKS_TOR_ADDRESS +Set the Tor address. (default: 127.0.0.1) + +.PP +.IP TORSOCKS_TOR_PORT +Set the Tor port. (default: 9050) + +.PP .IP TORSOCKS_ALLOW_INBOUND Allow inbound connections so the application can accept and listen for connections. diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index 5102fdc..b030ad2 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -140,16 +140,18 @@ usage () echo "usage: $0 command args" echo "" echo "Options:" - echo " -h, --help Show this help" - echo " --shell Spawn a torified shell" - echo " --version Show version" - echo " -d, --debug Set debug mode." - echo " -u, --user NAME Username for the SOCKS5 authentication" - echo " -p, --pass NAME Password for the SOCKS5 authentication" - echo " -i, --isolate Automatic tor isolation. Can't be used with -u/-p" - echo " on, off Set/Unset your shell to use Torsocks by default" - echo " Make sure to source the call when using this option. (See Examples)" - echo " show, sh Show the current value of the LD_PRELOAD" + echo " -h, --help Show this help" + echo " --shell Spawn a torified shell" + echo " --version Show version" + echo " -d, --debug Set debug mode." + echo " -u, --user NAME Username for the SOCKS5 authentication" + echo " -p, --pass NAME Password for the SOCKS5 authentication" + echo " -i, --isolate Automatic tor isolation. Can't be used with -u/-p" + echo " -a, --address HOST Specify Tor address" + echo " -P, --port PORT Specify Tor port" + echo " on, off Set/Unset your shell to use Torsocks by default" + echo " Make sure to source the call when using this option. (See Examples)" + echo " show, sh Show the current value of the LD_PRELOAD" echo "" echo "Examples:" echo "" @@ -230,6 +232,22 @@ do export TORSOCKS_PASSWORD=$2 shift ;; + -a|--address) + if [ -z $2 ]; then + echo "Missing address to -a" >&2 + exit 1 + fi + export TORSOCKS_TOR_ADDRESS=$2 + shift + ;; + -P|--port) + if [ -z $2 ]; then + echo "Missing port to -P" >&2 + exit 1 + fi + export TORSOCKS_TOR_PORT=$2 + shift + ;; -i|--isolate) export TORSOCKS_ISOLATE_PID=1 ;; diff --git a/src/common/defaults.h b/src/common/defaults.h index ab51690..958e7cd 100644 --- a/src/common/defaults.h +++ b/src/common/defaults.h @@ -63,6 +63,10 @@ #define DEFAULT_SOCKS5_USER_ENV "TORSOCKS_USERNAME" #define DEFAULT_SOCKS5_PASS_ENV "TORSOCKS_PASSWORD" +/* Env. variable for Tor hostname and port. */ +#define DEFAULT_TOR_ADDRESS_ENV "TORSOCKS_TOR_ADDRESS" +#define DEFAULT_TOR_PORT_ENV "TORSOCKS_TOR_PORT" + /* Control if torsocks allows inbound connection or not. */ #define DEFAULT_ALLOW_INBOUND_ENV "TORSOCKS_ALLOW_INBOUND" diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 7944e57..731b33c 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -75,7 +75,7 @@ static void clean_exit(int status) static void read_env(void) { int ret; - const char *username, *password, *allow_in, *isolate_pid; + const char *username, *password, *allow_in, *isolate_pid, *tor_address, *tor_port; if (is_suid) { goto end; @@ -97,6 +97,22 @@ static void read_env(void) } } + tor_address = getenv(DEFAULT_TOR_ADDRESS_ENV); + if (tor_address) { + ret = conf_file_set_tor_address(tor_address, &tsocks_config); + if (ret < 0) { + goto error; + } + } + + tor_port = getenv(DEFAULT_TOR_PORT_ENV); + if (tor_port) { + ret = conf_file_set_tor_port(tor_port, &tsocks_config); + if (ret < 0) { + goto error; + } + } + username = getenv(DEFAULT_SOCKS5_USER_ENV); password = getenv(DEFAULT_SOCKS5_PASS_ENV); if (!username && !password) {

1 0

[torsocks/master] Detect capabilities in torsocks wrapper
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit d03ab856ed770a8a7f925648f3ebd23f3e7e46c8 Author: Shawn Landden <shawn(a)churchofgit.com> Date: Wed Dec 2 02:24:29 2015 -0800 Detect capabilities in torsocks wrapper In addition to trying to detect them in the torsocks library, we also check for capabilities in the torsocks wrapper. Signed-off-by: Shawn Landden <shawn(a)churchofgit.com> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/bin/torsocks.in | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index 2a459b3..5102fdc 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -96,21 +96,36 @@ tor_shell () torify_app () { local app_path=`which $1` - - # NEVER remove that line or else nothing it torified. - set_ld_preload + local getcap=`PATH="$PATH:/usr/sbin:/sbin" which getcap` + local caps= if [ -z $1 ]; then echo "Please provide an application to torify." >&2 elif [ -z $app_path ]; then echo "ERROR: $1 cannot be found." >&2 exit 1 - elif [ -u $app_path ]; then + fi + + # This must be before torifying because getcap uses cap_get_file(3) + # via syscall(2) which breaks torsocks. + if [ -n $getcap ]; then + caps=`$getcap $app_path` + fi + + # NEVER remove that line or else nothing it torified. + set_ld_preload + + if [ -u $app_path ]; then echo "ERROR: $1 is setuid. torsocks will not work on a setuid executable." >&2 exit 1 elif [ -g $app_path ]; then echo "ERROR: $1 is setgid. torsocks will not work on a setgid executable." >&2 exit 1 + elif [ -n "$caps" ]; then + echo "ERROR: $1 gains the following elevated capabilities. torsocks will \ +not work with privledged executables. +$caps" >&2 + exit 1 fi exec "$@"

1 0

[torsocks/master] Read environment variables before creating the SOCKS5 connection.
by dgoulet＠torproject.org 13 Jun '16

13 Jun '16

commit c9abecb19f523bc11ff656e4466d355bcd10d81d Author: Alexander Færøy <ahf(a)0x90.dk> Date: Mon Oct 12 23:38:19 2015 +0200 Read environment variables before creating the SOCKS5 connection. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c index 60d586d..7944e57 100644 --- a/src/lib/torsocks.c +++ b/src/lib/torsocks.c @@ -175,6 +175,9 @@ static void init_config(void) tsocks_config.conf_file.onion_mask = atoi(DEFAULT_ONION_ADDR_MASK); } + /* Handle possible env. variables. */ + read_env(); + /* Create the Tor SOCKS5 connection address. */ ret = connection_addr_set(tsocks_config.conf_file.tor_domain, tsocks_config.conf_file.tor_address, @@ -187,9 +190,6 @@ static void init_config(void) clean_exit(EXIT_FAILURE); } - /* Handle possible env. variables. */ - read_env(); - /* Finalize the SOCKS auth (Isolation) settings. */ ret = conf_apply_socks_auth(&tsocks_config); if (ret < 0) {

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 13 Jun '16

13 Jun '16

commit 433298c452702965a84e6e3ea86b1bbc828d7e60 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 13 19:48:36 2016 +0000 Update translations for tails-openpgp-applet --- lb/openpgp-applet.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lb/openpgp-applet.pot b/lb/openpgp-applet.pot index 0cf2eaa..82c25bc 100644 --- a/lb/openpgp-applet.pot +++ b/lb/openpgp-applet.pot @@ -115,7 +115,7 @@ msgstr "" #: bin/openpgp-applet:556 msgid "Sign message as:" -msgstr "" +msgstr "Signéier de Message als:" #: bin/openpgp-applet:560 msgid "Choose keys" @@ -123,7 +123,7 @@ msgstr "Schlësselauswiel" #: bin/openpgp-applet:600 msgid "Do you trust these keys?" -msgstr "" +msgstr "Vertraut dir dëse Schlësselen?" #: bin/openpgp-applet:603 msgid "The following selected key is not fully trusted:" @@ -139,7 +139,7 @@ msgstr[1] "" #: bin/openpgp-applet:634 msgid "No keys selected" -msgstr "" +msgstr "Keng Schlësselen ausgewielt" #: bin/openpgp-applet:636 msgid ""

1 0