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

[collector/master] Make waiting time for regular module shutdown configurable.
by karsten＠torproject.org 06 Sep '16

06 Sep '16

commit cb78f5fe5b30dc138bb545c8f26b95b7abc90d9d Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Sep 6 19:41:57 2016 +0200 Make waiting time for regular module shutdown configurable. --- .../java/org/torproject/collector/conf/Configuration.java | 15 +++++++++++++++ src/main/java/org/torproject/collector/conf/Key.java | 1 + .../java/org/torproject/collector/cron/Scheduler.java | 13 ++++++++++--- src/main/resources/collector.properties | 3 +++ .../org/torproject/collector/conf/ConfigurationTest.java | 2 +- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index 4bab136..52e3bad 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -217,6 +217,21 @@ public class Configuration extends Observable implements Cloneable { } /** + * Parse a long property. + * Verifies that this enum is a Key for a Long value. + */ + public long getLong(Key key) throws ConfigurationException { + try { + checkClass(key, Long.class); + String prop = props.getProperty(key.name()); + return Long.parseLong(prop); + } catch (RuntimeException re) { + throw new ConfigurationException("Corrupt property: " + key + + " reason: " + re.getMessage(), re); + } + } + + /** * Returns a {@code Path} property, e.g. * {@code pathProperty = /my/path/file}. */ diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index fce89a2..5ec1be4 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -9,6 +9,7 @@ import java.nio.file.Path; */ public enum Key { + ShutdownGraceWaitMinutes(Long.class), RunOnce(Boolean.class), ExitlistOutputDirectory(Path.class), ExitlistUrl(URL.class), diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java index 1e72dc0..1863d73 100644 --- a/src/main/java/org/torproject/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/collector/cron/Scheduler.java @@ -29,7 +29,6 @@ public final class Scheduler implements ThreadFactory { public static final String ACTIVATED = "Activated"; public static final String PERIODMIN = "PeriodMinutes"; public static final String OFFSETMIN = "OffsetMinutes"; - private static final long GRACE_MIN = 20L; private static final long MILLIS_IN_A_MINUTE = 60_000L; private static final Logger logger = LoggerFactory.getLogger(Scheduler.class); @@ -37,6 +36,7 @@ public final class Scheduler implements ThreadFactory { private final ThreadFactory threads = Executors.defaultThreadFactory(); private int currentThreadNo = 0; + private long gracePeriodMinutes = 20L; private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10, this); @@ -55,6 +55,12 @@ public final class Scheduler implements ThreadFactory { */ public void scheduleModuleRuns(Map<Key, Class<? extends CollecTorMain>> collecTorMains, Configuration conf) { + try { + gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes); + } catch (ConfigurationException ce) { + logger.warn("Cannot read grace period: {}", ce); + gracePeriodMinutes = 20L; + } List<Callable<Object>> runOnceMains = new ArrayList<>(); for (Map.Entry<Key, Class<? extends CollecTorMain>> ctmEntry : collecTorMains.entrySet()) { @@ -119,9 +125,10 @@ public final class Scheduler implements ThreadFactory { public void shutdownScheduler() { try { logger.info("Waiting at most {} minutes for termination " - + "of running tasks ... ", GRACE_MIN); + + "of running tasks ... ", gracePeriodMinutes); scheduler.shutdown(); - scheduler.awaitTermination(GRACE_MIN, java.util.concurrent.TimeUnit.MINUTES); + scheduler.awaitTermination(gracePeriodMinutes, + java.util.concurrent.TimeUnit.MINUTES); logger.info("Shutdown of all scheduled tasks completed successfully."); } catch (InterruptedException ie) { List<Runnable> notTerminated = scheduler.shutdownNow(); diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 15b15aa..0c93cd0 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -8,6 +8,9 @@ # run one time and without any delay. # Make sure only to run non-interfering modules together. RunOnce = false +## +# Waiting time for regular shutdown in minutes. +ShutdownGraceWaitMinutes = 10 ## the following defines, if this module is activated BridgedescsActivated = false # period in minutes diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index 89a7750..fda9601 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -37,7 +37,7 @@ public class ConfigurationTest { public void testKeyCount() throws Exception { assertEquals("The number of properties keys in enum Key changed." + "\n This test class should be adapted.", - 48, Key.values().length); + 49, Key.values().length); } @Test()

1 0

[torspec/master] Consensus method 24: don't list invalid nodes.
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 4aff96041b25ae89acbaf2335743e3e0ffe52da9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 14:41:06 2016 -0400 Consensus method 24: don't list invalid nodes. Also, note that you can safely assume that methods before 13 will never happen. Part of proposal 272. --- dir-spec.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 6466d8a..db1378f 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2483,6 +2483,9 @@ * If consensus method 23 or later is used, authorities include shared randomness protocol data on their votes and consensus. + * If consensus-method 24 or later is in use, then routers that + do not have the Valid flag are not listed at all. + The signatures at the end of a consensus document are sorted in ascending order by identity digest. @@ -2561,6 +2564,7 @@ "21" -- Adds Ed25519 keys to microdescriptors. "22" -- Instantiates Ed25519 voting algorithm correctly. "23" -- Adds shared randomness protocol data. + "24" -- No longer lists routers that are not Valid in the consensus. Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number @@ -2569,9 +2573,11 @@ method that it supports (which will probably not result in a sufficiently signed consensus). - All authorities MUST support method 13; authorities SHOULD support more - recent methods as well. Authorities SHOULD NOT support or advertise - support for any method before 13. + All authorities MUST support method 13; authorities SHOULD support + more recent methods as well. Authorities SHOULD NOT support or + advertise support for any method before 13. Clients MAY assume that + they will never see a current valid signed consensus for any method + before method 13. (The consensuses generated by new methods must be parsable by implementations that only understand the old methods, and must not cause

1 0

[tor/master] prop272: When voting, include no non-Valid relays in consensus
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 9b9fb63276c892690d57ce5598e2e577d7e5ad9f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 14:14:34 2016 -0400 prop272: When voting, include no non-Valid relays in consensus Implements ticket 20002, and part of proposal 272. --- changes/ticket20002 | 4 ++++ src/or/dirvote.c | 10 +++++++++- src/or/dirvote.h | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changes/ticket20002 b/changes/ticket20002 new file mode 100644 index 0000000..28eaa8d --- /dev/null +++ b/changes/ticket20002 @@ -0,0 +1,4 @@ + o Minor features (directory authority): + - After voting, if the authorities decide that a relay is not "Valid", + they no longer include it in the consensus at all. Closes ticket + 20002; implements part of proposal 272. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9748f4a..ae869c9 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1582,7 +1582,7 @@ networkstatus_compute_consensus(smartlist_t *votes, const char *chosen_version; const char *chosen_name = NULL; int exitsummary_disagreement = 0; - int is_named = 0, is_unnamed = 0, is_running = 0; + int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0; int is_guard = 0, is_exit = 0, is_bad_exit = 0; int naming_conflict = 0; int n_listing = 0; @@ -1733,6 +1733,8 @@ networkstatus_compute_consensus(smartlist_t *votes, is_running = 1; else if (!strcmp(fl, "BadExit")) is_bad_exit = 1; + else if (!strcmp(fl, "Valid")) + is_valid = 1; } } } SMARTLIST_FOREACH_END(fl); @@ -1742,6 +1744,12 @@ networkstatus_compute_consensus(smartlist_t *votes, if (!is_running) continue; + /* Starting with consensus method 24, we don't list servers + * that are not valid in a consensus. See Proposal 272 */ + if (!is_valid && + consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES) + continue; + /* Pick the version. */ if (smartlist_len(versions)) { sort_version_list(versions, 0); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index a1f71ce..06bfe67 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -55,7 +55,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 23 +#define MAX_SUPPORTED_CONSENSUS_METHOD 24 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -99,6 +99,10 @@ * value(s). */ #define MIN_METHOD_FOR_SHARED_RANDOM 23 +/** Lowest consensus method where authorities drop all nodes that don't get + * the Valid flag. */ +#define MIN_METHOD_FOR_EXCLUDING_INVALID_NODES 24 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/master] Merge remote-tracking branch 'public/ticket20002'
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 128f7ffbc0cda7760b96b4d8eeda9550e2626f04 Merge: 5927ed8 9b9fb63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 14:27:13 2016 -0400 Merge remote-tracking branch 'public/ticket20002' changes/ticket20002 | 4 ++++ src/or/dirvote.c | 10 +++++++++- src/or/dirvote.h | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-)

1 0

[torspec/master] Add consensus method 23 to supported methods
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit b7a98754f09274309908304524b71e97ee03ebee Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Sep 6 12:45:04 2016 -0400 Add consensus method 23 to supported methods --- dir-spec.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dir-spec.txt b/dir-spec.txt index 6ba05bc..6466d8a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2560,6 +2560,7 @@ "20" -- Adds GuardFraction information to microdescriptors. "21" -- Adds Ed25519 keys to microdescriptors. "22" -- Instantiates Ed25519 voting algorithm correctly. + "23" -- Adds shared randomness protocol data. Before generating a consensus, an authority must decide which consensus method to use. To do this, it looks for the highest version number

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 06 Sep '16

06 Sep '16

commit 290012e61715f189daf982e20cb9f3e44117defc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 6 17:49:08 2016 +0000 Update translations for tails-onioncircuits --- om/onioncircuits.pot | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/om/onioncircuits.pot b/om/onioncircuits.pot new file mode 100644 index 0000000..ac4055a --- /dev/null +++ b/om/onioncircuits.pot @@ -0,0 +1,85 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-05-31 14:42+0200\n" +"PO-Revision-Date: 2016-03-30 03:31+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: om\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../onioncircuits:81 +msgid "You are not connected to Tor yet..." +msgstr "" + +#: ../onioncircuits:95 +msgid "Onion Circuits" +msgstr "" + +#: ../onioncircuits:125 +msgid "Circuit" +msgstr "" + +#: ../onioncircuits:126 +msgid "Status" +msgstr "" + +#: ../onioncircuits:142 +msgid "Click on a circuit for more detail about its Tor relays." +msgstr "" + +#: ../onioncircuits:221 +msgid "The connection to Tor was lost..." +msgstr "" + +#: ../onioncircuits:317 +msgid "..." +msgstr "" + +#: ../onioncircuits:343 +#, c-format +msgid "%s: %s" +msgstr "" + +#: ../onioncircuits:554 +msgid "GeoIP database unavailable. No country information will be displayed." +msgstr "" + +#: ../onioncircuits:585 +#, c-format +msgid "%s (%s)" +msgstr "" + +#: ../onioncircuits:590 +#, c-format +msgid "%.2f Mb/s" +msgstr "" + +#: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594 +msgid "Unknown" +msgstr "" + +#: ../onioncircuits:607 +msgid "Fingerprint:" +msgstr "" + +#: ../onioncircuits:608 +msgid "Published:" +msgstr "" + +#: ../onioncircuits:609 +msgid "IP:" +msgstr "" + +#: ../onioncircuits:610 +msgid "Bandwidth:" +msgstr ""

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 06 Sep '16

06 Sep '16

commit d239d3c6a352bd96a02c5a64bdf328a2101cfa1d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 6 17:49:02 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- om/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/om/abouttbupdate.dtd b/om/abouttbupdate.dtd new file mode 100644 index 0000000..37567bd --- /dev/null +++ b/om/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:">

1 0

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

06 Sep '16

commit a3a1c9645bc644c9cd9ee6564ccf1f59981d072f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 6 17:48:56 2016 +0000 Update translations for tails-openpgp-applet --- om/openpgp-applet.pot | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/om/openpgp-applet.pot b/om/openpgp-applet.pot new file mode 100644 index 0000000..aaafb00 --- /dev/null +++ b/om/openpgp-applet.pot @@ -0,0 +1,177 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: tails(a)boum.org\n" +"POT-Creation-Date: 2015-08-10 15:55+0200\n" +"PO-Revision-Date: 2015-11-23 02:23+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Oromo (http://www.transifex.com/otf/torproject/language/om/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: om\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bin/openpgp-applet:163 +msgid "You are about to exit OpenPGP Applet. Are you sure?" +msgstr "" + +#: bin/openpgp-applet:175 +msgid "OpenPGP encryption applet" +msgstr "" + +#: bin/openpgp-applet:178 +msgid "Exit" +msgstr "" + +#: bin/openpgp-applet:180 +msgid "About" +msgstr "" + +#: bin/openpgp-applet:235 +msgid "Encrypt Clipboard with _Passphrase" +msgstr "" + +#: bin/openpgp-applet:238 +msgid "Sign/Encrypt Clipboard with Public _Keys" +msgstr "" + +#: bin/openpgp-applet:243 +msgid "_Decrypt/Verify Clipboard" +msgstr "" + +#: bin/openpgp-applet:247 +msgid "_Manage Keys" +msgstr "" + +#: bin/openpgp-applet:251 +msgid "_Open Text Editor" +msgstr "" + +#: bin/openpgp-applet:295 +msgid "The clipboard does not contain valid input data." +msgstr "" + +#: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351 +msgid "Unknown Trust" +msgstr "" + +#: bin/openpgp-applet:353 +msgid "Marginal Trust" +msgstr "" + +#: bin/openpgp-applet:355 +msgid "Full Trust" +msgstr "" + +#: bin/openpgp-applet:357 +msgid "Ultimate Trust" +msgstr "" + +#: bin/openpgp-applet:410 +msgid "Name" +msgstr "" + +#: bin/openpgp-applet:411 +msgid "Key ID" +msgstr "" + +#: bin/openpgp-applet:412 +msgid "Status" +msgstr "" + +#: bin/openpgp-applet:444 +msgid "Fingerprint:" +msgstr "" + +#: bin/openpgp-applet:447 +msgid "User ID:" +msgid_plural "User IDs:" +msgstr[0] "" +msgstr[1] "" + +#: bin/openpgp-applet:476 +msgid "None (Don't sign)" +msgstr "" + +#: bin/openpgp-applet:539 +msgid "Select recipients:" +msgstr "" + +#: bin/openpgp-applet:547 +msgid "Hide recipients" +msgstr "" + +#: bin/openpgp-applet:550 +msgid "" +"Hide the user IDs of all recipients of an encrypted message. Otherwise " +"anyone that sees the encrypted message can see who the recipients are." +msgstr "" + +#: bin/openpgp-applet:556 +msgid "Sign message as:" +msgstr "" + +#: bin/openpgp-applet:560 +msgid "Choose keys" +msgstr "" + +#: bin/openpgp-applet:600 +msgid "Do you trust these keys?" +msgstr "" + +#: bin/openpgp-applet:603 +msgid "The following selected key is not fully trusted:" +msgid_plural "The following selected keys are not fully trusted:" +msgstr[0] "" +msgstr[1] "" + +#: bin/openpgp-applet:621 +msgid "Do you trust this key enough to use it anyway?" +msgid_plural "Do you trust these keys enough to use them anyway?" +msgstr[0] "" +msgstr[1] "" + +#: bin/openpgp-applet:634 +msgid "No keys selected" +msgstr "" + +#: bin/openpgp-applet:636 +msgid "" +"You must select a private key to sign the message, or some public keys to " +"encrypt the message, or both." +msgstr "" + +#: bin/openpgp-applet:664 +msgid "No keys available" +msgstr "" + +#: bin/openpgp-applet:666 +msgid "" +"You need a private key to sign messages or a public key to encrypt messages." +msgstr "" + +#: bin/openpgp-applet:794 +msgid "GnuPG error" +msgstr "" + +#: bin/openpgp-applet:815 +msgid "Therefore the operation cannot be performed." +msgstr "" + +#: bin/openpgp-applet:865 +msgid "GnuPG results" +msgstr "" + +#: bin/openpgp-applet:871 +msgid "Output of GnuPG:" +msgstr "" + +#: bin/openpgp-applet:896 +msgid "Other messages provided by GnuPG:" +msgstr ""

1 0

[translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd
by translation＠torproject.org 06 Sep '16

06 Sep '16

commit 28279c66156f889ea0ee4ec5ff177ea1a8ce0d73 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 6 17:48:45 2016 +0000 Update translations for tor-messenger-privdtd --- om/priv.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/om/priv.dtd b/om/priv.dtd new file mode 100644 index 0000000..7007979 --- /dev/null +++ b/om/priv.dtd @@ -0,0 +1,2 @@ +<!ENTITY privDialog.title "Generating private key"> +<!ENTITY privDialog.done "Done"> \ No newline at end of file

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 06 Sep '16

06 Sep '16

commit 5119db3c7305c91a74014675c7641f161df61288 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 6 17:48:39 2016 +0000 Update translations for tor-messenger-prefsdtd --- om/prefs.dtd | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/om/prefs.dtd b/om/prefs.dtd new file mode 100644 index 0000000..2ae9c9c --- /dev/null +++ b/om/prefs.dtd @@ -0,0 +1,22 @@ +<!ENTITY prefs.otrPreferences "OTR Preferences"> +<!ENTITY prefs.otrLabel "OTR"> +<!ENTITY prefs.coniksLabel "CONIKS"> +<!ENTITY prefs.otrSettings "OTR Settings"> +<!ENTITY prefs.requireEncryption "Require encryption"> +<!ENTITY prefs.otrKeys "My Private Keys"> +<!ENTITY prefs.keyForAccount "Key for account:"> +<!ENTITY prefs.fingerprint "Fingerprint:"> +<!ENTITY prefs.knownFingers "Known fingerprints"> +<!ENTITY prefs.introFingers "Manage the list of fingerprints you've seen."> +<!ENTITY prefs.showFingers "View"> +<!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."> +<!ENTITY prefs.verifyNudge "Always nudge to verify your contact's identity"> +<!ENTITY prefs.emptyAccountList "No accounts configured"> +<!ENTITY prefs.generate "Generate"> +<!ENTITY prefs.coniksConnection "Connection"> +<!ENTITY prefs.coniksServerAddress "Server Address"> +<!ENTITY prefs.coniksServerPort "Port"> +<!ENTITY prefs.coniksAccountPolicy "Account Policy"> +<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> +<!ENTITY prefs.coniksPrivateLookups "Private lookups"> +<!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0