tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[tor/master] Always check returns from tor_munmap_file() in microdesc.c
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit df076eccfaa680ee08b8ae866690d9a2a8ba5555 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 18 12:39:02 2014 -0700 Always check returns from tor_munmap_file() in microdesc.c --- src/or/microdesc.c | 20 ++++++++++++++++---- src/or/routerlist.c | 22 ++++++++-------------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 6419ea7..f196536 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -275,6 +275,7 @@ void microdesc_cache_clear(microdesc_cache_t *cache) { microdesc_t **entry, **next; + for (entry = HT_START(microdesc_map, &cache->map); entry; entry = next) { microdesc_t *md = *entry; next = HT_NEXT_RMV(microdesc_map, &cache->map, entry); @@ -283,7 +284,13 @@ microdesc_cache_clear(microdesc_cache_t *cache) } HT_CLEAR(microdesc_map, &cache->map); if (cache->cache_content) { - tor_munmap_file(cache->cache_content); + int res = tor_munmap_file(cache->cache_content); + if (res != 0) { + log_warn(LD_FS, + "tor_munmap_file() failed clearing microdesc cache; " + "we are probably about to leak memory."); + /* TODO something smarter? */ + } cache->cache_content = NULL; } cache->total_len_seen = 0; @@ -429,7 +436,7 @@ int microdesc_cache_rebuild(microdesc_cache_t *cache, int force) { open_file_t *open_file; - int fd = -1; + int fd = -1, res; microdesc_t **mdp; smartlist_t *wrote; ssize_t size; @@ -496,8 +503,13 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) /* We must do this unmap _before_ we call finish_writing_to_file(), or * windows will not actually replace the file. */ - if (cache->cache_content) - tor_munmap_file(cache->cache_content); + if (cache->cache_content) { + res = tor_munmap_file(cache->cache_content); + if (res != 0) { + log_warn(LD_FS, + "Failed to unmap old microdescriptor cache while rebuilding"); + } + } if (finish_writing_to_file(open_file) < 0) { log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 725718b..c96fb2c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -990,7 +990,6 @@ router_rebuild_store(int flags, desc_store_t *store) size_t total_expected_len = 0; int had_any; int force = flags & RRS_FORCE; - int res; if (!force && !router_should_rebuild_store(store)) { r = 0; @@ -1065,10 +1064,9 @@ router_rebuild_store(int flags, desc_store_t *store) /* Our mmap is now invalid. */ if (store->mmap) { - res = tor_munmap_file(store->mmap); - if (res == 0) { - store->mmap = NULL; - } else { + int res = tor_munmap_file(store->mmap); + store->mmap = NULL; + if (res != 0) { log_warn(LD_FS, "Unable to munmap route store in %s", fname); } } @@ -1141,16 +1139,14 @@ router_reload_router_list_impl(desc_store_t *store) struct stat st; int extrainfo = (store->type == EXTRAINFO_STORE); store->journal_len = store->store_len = 0; - int res; fname = get_datadir_fname(store->fname_base); if (store->mmap) { /* get rid of it first */ - res = tor_munmap_file(store->mmap); - if (res == 0) { - store->mmap = NULL; - } else { + int res = tor_munmap_file(store->mmap); + store->mmap = NULL; + if (res != 0) { log_warn(LD_FS, "Failed to munmap %s", fname); tor_free(fname); return -1; @@ -2796,8 +2792,6 @@ extrainfo_free_(void *e) void routerlist_free(routerlist_t *rl) { - int res; - if (!rl) return; rimap_free(rl->identity_map, NULL); @@ -2811,13 +2805,13 @@ routerlist_free(routerlist_t *rl) smartlist_free(rl->routers); smartlist_free(rl->old_routers); if (routerlist->desc_store.mmap) { - res = tor_munmap_file(routerlist->desc_store.mmap); + int res = tor_munmap_file(routerlist->desc_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); } } if (routerlist->extrainfo_store.mmap) { - res = tor_munmap_file(routerlist->extrainfo_store.mmap); + int res = tor_munmap_file(routerlist->extrainfo_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap"); }

1 0

[tor/master] Eliminate lseek() with unchecked return in tor_mmap_file()
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 0938c20fa3b44a09d20ba2eb05775b0c46d39129 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 19 11:17:55 2014 -0700 Eliminate lseek() with unchecked return in tor_mmap_file() --- src/common/compat.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index b43af88..ead96ca 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -35,6 +35,12 @@ #ifdef HAVE_UNAME #include <sys/utsname.h> #endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -178,9 +184,10 @@ tor_mmap_file(const char *filename) { int fd; /* router file */ char *string; - int page_size; + int page_size, result; tor_mmap_t *res; size_t size, filesize; + struct stat st; tor_assert(filename); @@ -194,9 +201,22 @@ tor_mmap_file(const char *filename) return NULL; } - /* XXXX why not just do fstat here? */ - size = filesize = (size_t) lseek(fd, 0, SEEK_END); - lseek(fd, 0, SEEK_SET); + /* Get the size of the file */ + result = fstat(fd, &st); + if (result != 0) { + int save_errno = errno; + log_warn(LD_FS, + "Couldn't fstat opened descriptor for \"%s\" during mmap: %s", + filename, strerror(errno)); + close(fd); + errno = save_errno; + return NULL; + } + size = filesize = (size_t)(st.st_size); + /* + * Should we check for weird crap like mmapping a named pipe here, + * or just wait for if (!size) below to fail? + */ /* ensure page alignment */ page_size = getpagesize(); size += (size%page_size) ? page_size-(size%page_size) : 0;

1 0

[tor/master] Always check returns from tor_munmap_file() in routerlist.c
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 947a6daa311ebc139043fe39b775ee5928014fd6 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 18 11:04:20 2014 -0700 Always check returns from tor_munmap_file() in routerlist.c --- src/or/routerlist.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8d29b89..725718b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -990,6 +990,7 @@ router_rebuild_store(int flags, desc_store_t *store) size_t total_expected_len = 0; int had_any; int force = flags & RRS_FORCE; + int res; if (!force && !router_should_rebuild_store(store)) { r = 0; @@ -1064,8 +1065,12 @@ router_rebuild_store(int flags, desc_store_t *store) /* Our mmap is now invalid. */ if (store->mmap) { - tor_munmap_file(store->mmap); - store->mmap = NULL; + res = tor_munmap_file(store->mmap); + if (res == 0) { + store->mmap = NULL; + } else { + log_warn(LD_FS, "Unable to munmap route store in %s", fname); + } } if (replace_file(fname_tmp, fname)<0) { @@ -1136,12 +1141,21 @@ router_reload_router_list_impl(desc_store_t *store) struct stat st; int extrainfo = (store->type == EXTRAINFO_STORE); store->journal_len = store->store_len = 0; + int res; fname = get_datadir_fname(store->fname_base); - if (store->mmap) /* get rid of it first */ - tor_munmap_file(store->mmap); - store->mmap = NULL; + if (store->mmap) { + /* get rid of it first */ + res = tor_munmap_file(store->mmap); + if (res == 0) { + store->mmap = NULL; + } else { + log_warn(LD_FS, "Failed to munmap %s", fname); + tor_free(fname); + return -1; + } + } store->mmap = tor_mmap_file(fname); if (store->mmap) { @@ -2782,6 +2796,8 @@ extrainfo_free_(void *e) void routerlist_free(routerlist_t *rl) { + int res; + if (!rl) return; rimap_free(rl->identity_map, NULL); @@ -2794,10 +2810,18 @@ routerlist_free(routerlist_t *rl) signed_descriptor_free(sd)); smartlist_free(rl->routers); smartlist_free(rl->old_routers); - if (routerlist->desc_store.mmap) - tor_munmap_file(routerlist->desc_store.mmap); - if (routerlist->extrainfo_store.mmap) - tor_munmap_file(routerlist->extrainfo_store.mmap); + if (routerlist->desc_store.mmap) { + res = tor_munmap_file(routerlist->desc_store.mmap); + if (res != 0) { + log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); + } + } + if (routerlist->extrainfo_store.mmap) { + res = tor_munmap_file(routerlist->extrainfo_store.mmap); + if (res != 0) { + log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap"); + } + } tor_free(rl); router_dir_info_changed();

1 0

[tor/master] Always check returns from unlink()
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit abdf1878a3f8fe366d8bb7f649127880bdbdf82d Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Mar 18 17:52:31 2014 -0700 Always check returns from unlink() --- src/common/util.c | 9 ++++++++- src/or/config.c | 5 ++++- src/or/hibernate.c | 10 +++++++++- src/or/main.c | 17 +++++++++++++---- src/or/networkstatus.c | 21 +++++++++++++++++---- src/or/statefile.c | 10 ++++++++-- 6 files changed, 59 insertions(+), 13 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 3c2f664..c4f8c88 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2141,6 +2141,7 @@ static int finish_writing_to_file_impl(open_file_t *file_data, int abort_write) { int r = 0; + tor_assert(file_data && file_data->filename); if (file_data->stdio_file) { if (fclose(file_data->stdio_file)) { @@ -2157,7 +2158,13 @@ finish_writing_to_file_impl(open_file_t *file_data, int abort_write) if (file_data->rename_on_close) { tor_assert(file_data->tempname && file_data->filename); if (abort_write) { - unlink(file_data->tempname); + int res = unlink(file_data->tempname); + if (res != 0) { + /* We couldn't unlink and we'll leave a mess behind */ + log_warn(LD_FS, "Failed to unlink %s: %s", + file_data->tempname, strerror(errno)); + r = -1; + } } else { tor_assert(strcmp(file_data->filename, file_data->tempname)); if (replace_file(file_data->tempname, file_data->filename)) { diff --git a/src/or/config.c b/src/or/config.c index 0da4877..5b590f2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6464,7 +6464,10 @@ remove_file_if_very_old(const char *fname, time_t now) format_local_iso_time(buf, st.st_mtime); log_notice(LD_GENERAL, "Obsolete file %s hasn't been modified since %s. " "Removing it.", fname, buf); - unlink(fname); + if (unlink(fname) != 0) { + log_warn(LD_FS, "Failed to unlink %s: %s", + fname, strerror(errno)); + } } } diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 607dec8..bbda842 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -648,7 +648,15 @@ read_bandwidth_usage(void) { char *fname = get_datadir_fname("bw_accounting"); - unlink(fname); + int res; + + res = unlink(fname); + if (res != 0) { + log_warn(LD_FS, + "Failed to unlink %s: %s", + fname, strerror(errno)); + } + tor_free(fname); } diff --git a/src/or/main.c b/src/or/main.c index 7294c89..3d5ce10 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2574,10 +2574,19 @@ tor_cleanup(void) time_t now = time(NULL); /* Remove our pid file. We don't care if there was an error when we * unlink, nothing we could do about it anyways. */ - if (options->PidFile) - unlink(options->PidFile); - if (options->ControlPortWriteToFile) - unlink(options->ControlPortWriteToFile); + if (options->PidFile) { + if (unlink(options->PidFile) != 0) { + log_warn(LD_FS, "Couldn't unlink pid file %s: %s", + options->PidFile, strerror(errno)); + } + } + if (options->ControlPortWriteToFile) { + if (unlink(options->ControlPortWriteToFile) != 0) { + log_warn(LD_FS, "Couldn't unlink control port file %s: %s", + options->ControlPortWriteToFile, + strerror(errno)); + } + } if (accounting_is_enabled(options)) accounting_record_bandwidth_usage(now, get_or_state()); or_state_mark_dirty(get_or_state(), 0); /* force an immediate save. */ diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49478a7..74c4ca4 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1254,7 +1254,11 @@ networkstatus_set_current_consensus(const char *consensus, /* Even if we had enough signatures, we'd never use this as the * latest consensus. */ if (was_waiting_for_certs && from_cache) - unlink(unverified_fname); + if (unlink(unverified_fname) != 0) { + log_warn(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); + } } goto done; } else { @@ -1264,8 +1268,13 @@ networkstatus_set_current_consensus(const char *consensus, "consensus"); result = -2; } - if (was_waiting_for_certs && (r < -1) && from_cache) - unlink(unverified_fname); + if (was_waiting_for_certs && (r < -1) && from_cache) { + if (unlink(unverified_fname) != 0) { + log_warn(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); + } + } goto done; } } @@ -1313,7 +1322,11 @@ networkstatus_set_current_consensus(const char *consensus, waiting->body = NULL; waiting->set_at = 0; waiting->dl_failed = 0; - unlink(unverified_fname); + if (unlink(unverified_fname) != 0) { + log_warn(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); + } } /* Reset the failure count only if this consensus is actually valid. */ diff --git a/src/or/statefile.c b/src/or/statefile.c index 8ab0476..2251f25 100644 --- a/src/or/statefile.c +++ b/src/or/statefile.c @@ -260,7 +260,7 @@ or_state_set(or_state_t *new_state) static void or_state_save_broken(char *fname) { - int i; + int i, res; file_status_t status; char *fname2 = NULL; for (i = 0; i < 100; ++i) { @@ -274,7 +274,13 @@ or_state_save_broken(char *fname) log_warn(LD_BUG, "Unable to parse state in \"%s\"; too many saved bad " "state files to move aside. Discarding the old state file.", fname); - unlink(fname); + res = unlink(fname); + if (res != 0) { + log_warn(LD_FS, + "Also couldn't discard old state file \"%s\" because " + "unlink() failed: %s", + fname, strerror(errno)); + } } else { log_warn(LD_BUG, "Unable to parse state in \"%s\". Moving it aside " "to \"%s\". This could be a bug in Tor; please tell "

1 0

[tor/master] Check strftime() return in tortls.c
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit dea81901114f2bc67cdc9d9072fbfe1b6797920e Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Mar 19 11:22:11 2014 -0700 Check strftime() return in tortls.c --- src/common/tortls.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 315a767..50ae8af 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2311,6 +2311,7 @@ log_cert_lifetime(int severity, const X509 *cert, const char *problem) char mytime[33]; time_t now = time(NULL); struct tm tm; + size_t n; if (problem) tor_log(severity, LD_GENERAL, @@ -2336,11 +2337,17 @@ log_cert_lifetime(int severity, const X509 *cert, const char *problem) BIO_get_mem_ptr(bio, &buf); s2 = tor_strndup(buf->data, buf->length); - strftime(mytime, 32, "%b %d %H:%M:%S %Y UTC", tor_gmtime_r(&now, &tm)); - - tor_log(severity, LD_GENERAL, - "(certificate lifetime runs from %s through %s. Your time is %s.)", - s1,s2,mytime); + n = strftime(mytime, 32, "%b %d %H:%M:%S %Y UTC", tor_gmtime_r(&now, &tm)); + if (n > 0) { + tor_log(severity, LD_GENERAL, + "(certificate lifetime runs from %s through %s. Your time is %s.)", + s1,s2,mytime); + } else { + tor_log(severity, LD_GENERAL, + "(certificate lifetime runs from %s through %s. " + "Couldn't get your time.)", + s1, s2); + } end: /* Not expected to get invoked */

1 0

[tor/master] Handle tor_munmap_file(NULL) consistently
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 7cdb50e86604c33cfbf5e94ab56629f0bf92b804 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 31 11:35:39 2014 -0400 Handle tor_munmap_file(NULL) consistently --- src/common/compat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index ead96ca..135f2c9 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -354,7 +354,9 @@ tor_mmap_file(const char *filename) int tor_munmap_file(tor_mmap_t *handle) { - tor_assert(handle != NULL); + if (handle == NULL) + return 0; + if (handle->data) { /* This is an ugly cast, but without it, "data" in struct tor_mmap_t would have to be redefined as non-const. */ @@ -394,8 +396,9 @@ int tor_munmap_file(tor_mmap_t *handle) { char *d = NULL; + if (handle == NULL) + return 0; - tor_assert(handle != NULL); d = (char*)handle->data; tor_free(d); memwipe(handle, 0, sizeof(tor_mmap_t));

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 32a84d6a5dcc374418b76e01c278bde3f9362190 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 15:45:24 2014 +0000 Update translations for tails-persistence-setup_completed --- sk/sk.po | 316 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 316 insertions(+) diff --git a/sk/sk.po b/sk/sk.po new file mode 100644 index 0000000..a147d75 --- /dev/null +++ b/sk/sk.po @@ -0,0 +1,316 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-01-18 21:00+0100\n" +"PO-Revision-Date: 2014-03-31 15:39+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Súkromné údaje" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Zachovať súbory uložené v priečinku `Persistent'" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG zväzok kľúčov a konfigurácia" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH klient" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSH kľúče, konfigurácia a známi hostovia" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin profily a OTR zväzok kľúčov" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail profily a lokálne uložený email" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOME zväzok kľúčov" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "Tajomstvá ukryté GNOME zväzkom kľúčov" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Sieťové pripojenia" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Nastavenia sieťových zariadení a pripojení" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Záložky prehliadača" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Záložky uložené v prehliadači Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "Printers" +msgstr "Tlačiarne" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Printers configuration" +msgstr "Nastavenie tlačiarní" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Packages" +msgstr "APT balíčky" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Packages downloaded by APT" +msgstr "Balíčky stiahnuté pomocou APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "APT Lists" +msgstr "APT zoznamy" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "Lists downloaded by APT" +msgstr "Zoznamy stiahnuté pomocou APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Symbolicky odkazovať do $HOME každý súbor alebo priečinok nájdený v priečinku `dotfiles'" + +#: ../lib/Tails/Persistence/Setup.pm:227 +msgid "Setup Tails persistent volume" +msgstr "Nastaviť Tails perzistentné médium" + +#: ../lib/Tails/Persistence/Setup.pm:337 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "Zariadenie %s už má perzistentné médium." + +#: ../lib/Tails/Persistence/Setup.pm:345 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "Zariadenie %s nemá dostatok alokovaného miesta." + +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "Zariadenie %s nemá žiadne perzistentné médium." + +#: ../lib/Tails/Persistence/Setup.pm:359 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "Nemožno odstrániť perzistentné médium počas doby jeho používania. Mali by ste reštartovať Tails bez dátovej trvanlivosti." + +#: ../lib/Tails/Persistence/Setup.pm:378 +msgid "Persistence volume is not unlocked." +msgstr "Perzistentné médium nie je odomknuté." + +#: ../lib/Tails/Persistence/Setup.pm:383 +msgid "Persistence volume is not mounted." +msgstr "Perzistentné médium nie je pripojené." + +#: ../lib/Tails/Persistence/Setup.pm:388 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "Perzistentné médium nie je čitateľné. Problémy s oprávneniami alebo vlastníctvom?" + +#: ../lib/Tails/Persistence/Setup.pm:393 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "Perzistentné médium nie je zapisovateľné. Možno bolo pripojené iba ako read-only?" + +#: ../lib/Tails/Persistence/Setup.pm:402 +#, perl-format +msgid "Tails is running from non-USB / non-SDIO device %s." +msgstr "Tails je spustený z non-USB / non-SDIO zariadenia %s." + +#: ../lib/Tails/Persistence/Setup.pm:408 +#, perl-format +msgid "Device %s is optical." +msgstr "Zariadenie %s je optické." + +#: ../lib/Tails/Persistence/Setup.pm:415 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "Zariadenie %s nebolo vytvorené pomocou Tails USB inštalátora." + +#: ../lib/Tails/Persistence/Setup.pm:450 +msgid "Error" +msgstr "Chyba" + +#: ../lib/Tails/Persistence/Setup.pm:670 +msgid "Persistence wizard - Finished" +msgstr "Sprievodca trvanlivosťou dát - Dokončený" + +#: ../lib/Tails/Persistence/Setup.pm:673 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Akékoľvek zmeny, ktoré ste urobili, sa prejavia až po reštartovaní Tails.\n\nTeraz môžete zatvoriť túro aplikáciu." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Sprievodca trvanlivosťou dát - Vytvorenie perzistentného média" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Zvoľte si prístupové heslo za účelom ochrany perzistentného média" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Perzistentné médium veľkosti %s bude vytvorené na zariadení %s %s. Dáta na tomto médiu budú uložené v zašifrovanej podobe chránenej prístupovým heslom." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Vytvoriť" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "Pozor! Využívanie dátovej trvanlivosti so sebou obnáša isté následky, ktorým je nutné dobre porozumieť. Tails vam nepomôže ak ju použijete zle! Pozrite si <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails dokumentáciou o trvanlivosti dát</a> ak sa chcete dozvedieť viac." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Heslo:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Potvrďte heslo:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "Heslo nesmie byť prázdne" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "Heslo sa nezhoduje" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:129 +msgid "Failed" +msgstr "Zlyhalo" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +msgid "Mounting Tails persistence partition." +msgstr "Pripája sa Tails perzistentná partícia." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +msgid "The Tails persistence partition will be mounted." +msgstr "Tails perzistentná partícia bude pripojená." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "Correcting permissions of the persistent volume." +msgstr "Korigujú sa oprávnenia perzistentného média." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +msgid "The permissions of the persistent volume will be corrected." +msgstr "Oprávnenia perzistentného média budú skorigované." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +msgid "Creating..." +msgstr "Vytváram..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +msgid "Creating the persistent volume..." +msgstr "Vytvára sa perzistentné médium..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:61 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Sprievodca trvanlivosťou dát - Konfigurácia perzistentného média" + +#: ../lib/Tails/Persistence/Step/Configure.pm:64 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "Zvoľte súbory, ktoré budú uložené v perzistentnom médiu" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:68 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Vybrané súbory budú uložené v zašifrovanej partícii %s (%s) na zariadení %s %s." + +#: ../lib/Tails/Persistence/Step/Configure.pm:74 +msgid "Save" +msgstr "Uložiť" + +#: ../lib/Tails/Persistence/Step/Configure.pm:143 +msgid "Saving..." +msgstr "Ukladám..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:146 +msgid "Saving persistence configuration..." +msgstr "Ukladá sa konfigurácia trvanlivosti dát..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Sprievodca trvanlivosťou dát - Odstránenie perzistentného média" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "Vaše perzistentné dáta budú uložené." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "Perzistentná partícia %s (%s) na zariadení %s %s bude odstránená." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Vymazať" + +#: ../lib/Tails/Persistence/Step/Delete.pm:101 +msgid "Deleting..." +msgstr "Odstraňuje sa..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:104 +msgid "Deleting the persistent volume..." +msgstr "Odstraňuje sa perzistentné médium..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit f2eae4660026bac699b3ba2bd3d0752e6e070659 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 15:45:21 2014 +0000 Update translations for tails-persistence-setup --- sk/sk.po | 70 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 43ab812..a147d75 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-01-18 21:00+0100\n" -"PO-Revision-Date: 2014-03-31 15:14+0000\n" +"PO-Revision-Date: 2014-03-31 15:39+0000\n" "Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -77,11 +77,11 @@ msgstr "Nastavenia sieťových zariadení a pripojení" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Záložky prehliadača" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Záložky uložené v prehliadači Iceweasel" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" @@ -118,59 +118,59 @@ msgstr "Symbolicky odkazovať do $HOME každý súbor alebo priečinok nájdený #: ../lib/Tails/Persistence/Setup.pm:227 msgid "Setup Tails persistent volume" -msgstr "" +msgstr "Nastaviť Tails perzistentné médium" #: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." -msgstr "" +msgstr "Zariadenie %s už má perzistentné médium." #: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "" +msgstr "Zariadenie %s nemá dostatok alokovaného miesta." #: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." -msgstr "" +msgstr "Zariadenie %s nemá žiadne perzistentné médium." #: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." -msgstr "" +msgstr "Nemožno odstrániť perzistentné médium počas doby jeho používania. Mali by ste reštartovať Tails bez dátovej trvanlivosti." #: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." -msgstr "" +msgstr "Perzistentné médium nie je odomknuté." #: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." -msgstr "" +msgstr "Perzistentné médium nie je pripojené." #: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "" +msgstr "Perzistentné médium nie je čitateľné. Problémy s oprávneniami alebo vlastníctvom?" #: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "" +msgstr "Perzistentné médium nie je zapisovateľné. Možno bolo pripojené iba ako read-only?" #: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." -msgstr "" +msgstr "Tails je spustený z non-USB / non-SDIO zariadenia %s." #: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." -msgstr "" +msgstr "Zariadenie %s je optické." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "" +msgstr "Zariadenie %s nebolo vytvorené pomocou Tails USB inštalátora." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" @@ -178,7 +178,7 @@ msgstr "Chyba" #: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" -msgstr "" +msgstr "Sprievodca trvanlivosťou dát - Dokončený" #: ../lib/Tails/Persistence/Setup.pm:673 msgid "" @@ -189,11 +189,11 @@ msgstr "Akékoľvek zmeny, ktoré ste urobili, sa prejavia až po reštartovaní #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" -msgstr "" +msgstr "Sprievodca trvanlivosťou dát - Vytvorenie perzistentného média" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 msgid "Choose a passphrase to protect the persistent volume" -msgstr "" +msgstr "Zvoľte si prístupové heslo za účelom ochrany perzistentného média" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 @@ -201,11 +201,11 @@ msgstr "" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "Perzistentné médium veľkosti %s bude vytvorené na zariadení %s %s. Dáta na tomto médiu budú uložené v zašifrovanej podobe chránenej prístupovým heslom." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "Vytvoriť" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -213,7 +213,7 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "Pozor! Využívanie dátovej trvanlivosti so sebou obnáša isté následky, ktorým je nutné dobre porozumieť. Tails vam nepomôže ak ju použijete zle! Pozrite si <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails dokumentáciou o trvanlivosti dát</a> ak sa chcete dozvedieť viac." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" @@ -239,19 +239,19 @@ msgstr "Zlyhalo" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 msgid "Mounting Tails persistence partition." -msgstr "" +msgstr "Pripája sa Tails perzistentná partícia." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "Tails perzistentná partícia bude pripojená." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Correcting permissions of the persistent volume." -msgstr "" +msgstr "Korigujú sa oprávnenia perzistentného média." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The permissions of the persistent volume will be corrected." -msgstr "" +msgstr "Oprávnenia perzistentného média budú skorigované." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 msgid "Creating..." @@ -259,15 +259,15 @@ msgstr "Vytváram..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 msgid "Creating the persistent volume..." -msgstr "" +msgstr "Vytvára sa perzistentné médium..." #: ../lib/Tails/Persistence/Step/Configure.pm:61 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "Sprievodca trvanlivosťou dát - Konfigurácia perzistentného média" #: ../lib/Tails/Persistence/Step/Configure.pm:64 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "Zvoľte súbory, ktoré budú uložené v perzistentnom médiu" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:68 @@ -275,7 +275,7 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "Vybrané súbory budú uložené v zašifrovanej partícii %s (%s) na zariadení %s %s." #: ../lib/Tails/Persistence/Step/Configure.pm:74 msgid "Save" @@ -287,21 +287,21 @@ msgstr "Ukladám..." #: ../lib/Tails/Persistence/Step/Configure.pm:146 msgid "Saving persistence configuration..." -msgstr "" +msgstr "Ukladá sa konfigurácia trvanlivosti dát..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "Sprievodca trvanlivosťou dát - Odstránenie perzistentného média" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "Vaše perzistentné dáta budú uložené." #: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "" +msgstr "Perzistentná partícia %s (%s) na zariadení %s %s bude odstránená." #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" @@ -309,8 +309,8 @@ msgstr "Vymazať" #: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." -msgstr "Mažem..." +msgstr "Odstraňuje sa..." #: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." -msgstr "" +msgstr "Odstraňuje sa perzistentné médium..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 6829c87bfce80a9dea1291a2671ba0518b46b8d1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 15:15:19 2014 +0000 Update translations for tails-persistence-setup --- sk/sk.po | 77 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index 6321b2e..43ab812 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -4,13 +4,14 @@ # # Translators: # Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-01-18 21:00+0100\n" +"PO-Revision-Date: 2014-03-31 15:14+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "Súkromné údaje" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "Zachovať súbory uložené v priečinku `Persistent'" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" @@ -32,15 +33,15 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "" +msgstr "GnuPG zväzok kľúčov a konfigurácia" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" -msgstr "" +msgstr "SSH klient" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "SSH keys, configuration and known hosts" -msgstr "" +msgstr "SSH kľúče, konfigurácia a známi hostovia" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" @@ -48,23 +49,23 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "" +msgstr "Pidgin profily a OTR zväzok kľúčov" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "" +msgstr "Claws Mail profily a lokálne uložený email" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "" +msgstr "GNOME zväzok kľúčov" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" -msgstr "" +msgstr "Tajomstvá ukryté GNOME zväzkom kľúčov" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" @@ -92,94 +93,94 @@ msgstr "Nastavenie tlačiarní" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "" +msgstr "APT balíčky" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" -msgstr "" +msgstr "Balíčky stiahnuté pomocou APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Lists" -msgstr "" +msgstr "APT zoznamy" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Lists downloaded by APT" -msgstr "" +msgstr "Zoznamy stiahnuté pomocou APT" #: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "Dotfiles" -msgstr "" +msgstr "Dotfiles" #: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "" +msgstr "Symbolicky odkazovať do $HOME každý súbor alebo priečinok nájdený v priečinku `dotfiles'" #: ../lib/Tails/Persistence/Setup.pm:227 msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails USB installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Chyba" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -288,28 +289,28 @@ msgstr "Ukladám..." msgid "Saving persistence configuration..." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." msgstr "" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "Vymazať" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "Mažem..." -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr ""

1 0

[tor/master] Fix build of torify.1
by nickm＠torproject.org 31 Mar '14

31 Mar '14

commit 91f6a422cc2a7801e399111353e20ddbe2e17f33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 26 12:11:38 2014 -0400 Fix build of torify.1 The build was broken by changes in f8c45339f72525c68, but we didn't notice, since that commit also made torify.1 only get built when tor-fw-helper was turned on. Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha. --- changes/bug11321 | 5 +++++ doc/include.am | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/changes/bug11321 b/changes/bug11321 new file mode 100644 index 0000000..d737a1f --- /dev/null +++ b/changes/bug11321 @@ -0,0 +1,5 @@ + o Minor bugfixes (build): + - Build the torify.1 manpage again. Previously, we were only + trying to build it when also building tor-fw-helper. That's why + we didn't notice that we'd broken the ability to build it. + Fixes bug 11321; bugfix on 0.2.5.1-alpha. diff --git a/doc/include.am b/doc/include.am index 37c0237..30d3e20 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,17 +12,17 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -regular_mans = doc/tor doc/tor-gencert doc/tor-resolve -all_mans = $(regular_mans) doc/torify doc/tor-fw-helper - -if USE_ASCIIDOC +base_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify +all_mans = $(base_mans) doc/tor-fw-helper if USE_FW_HELPER -nodist_man1_MANS = $(all_mans:=.1) -doc_DATA = $(all_mans:=.html) +install_mans = $(all_mans) else -nodist_man1_MANS = $(regular_mans:=.1) -doc_DATA = $(regular_mans:=.html) +install_mans = $(base_mans) endif + +if USE_ASCIIDOC +nodist_man1_MANS = $(install_mans:=.1) +doc_DATA = $(install_mans:=.html) html_in = $(all_mans:=.html.in) man_in = $(all_mans:=.1.in) txt_in = $(all_mans:=.1.txt) @@ -53,11 +53,13 @@ $(man_in) : $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/$@ doc/tor.1.in: doc/tor.1.txt +doc/torify.1.in: doc/torify.1.txt doc/tor-gencert.1.in: doc/tor-gencert.1.txt doc/tor-resolve.1.in: doc/tor-resolve.1.txt doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt doc/tor.html.in: doc/tor.1.txt +doc/torify.html.in: doc/torify.1.txt doc/tor-gencert.html.in: doc/tor-gencert.1.txt doc/tor-resolve.html.in: doc/tor-resolve.1.txt doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt @@ -74,13 +76,13 @@ $(asciidoc_product) : doc/tor.html: doc/tor.html.in doc/tor-gencert.html: doc/tor-gencert.html.in doc/tor-resolve.html: doc/tor-resolve.html.in -doc/torify.html: doc/torify.1.txt +doc/torify.html: doc/torify.html.in doc/tor-fw-helper.html: doc/tor-fw-helper.html.in doc/tor.1: doc/tor.1.in doc/tor-gencert.1: doc/tor-gencert.1.in doc/tor-resolve.1: doc/tor-resolve.1.in -doc/torify.1: doc/torify.1.txt +doc/torify.1: doc/torify.1.in doc/tor-fw-helper.1: doc/tor-fw-helper.1.in CLEANFILES+= $(asciidoc_product) config.log

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014