May 2017 - tor-commits - lists.torproject.org

[metrics-lib/release] Test for empty keys in more places.
by karsten＠torproject.org 17 May '17

17 May '17

commit 3c0b08135a2f81d15c5b43c43a1765265a655e57 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 12:06:14 2017 +0200 Test for empty keys in more places. --- .../org/torproject/descriptor/impl/ParseHelper.java | 4 ++-- .../descriptor/impl/ExtraInfoDescriptorImplTest.java | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index e77bded..d5ce50f 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -401,7 +401,7 @@ public class ParseHelper { /* Handle below. */ } } - if (null == key) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' " + "contains an illegal key or value in list element '" + listElement + "'."); @@ -483,7 +483,7 @@ public class ParseHelper { /* Handle below. */ } } - if (null == key) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 5b3fe1f..8b96c88 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1383,6 +1383,15 @@ public class ExtraInfoDescriptorImplTest { } @Test() + public void testDirreqV3RespEmptyString() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage( + "Line 'dirreq-v3-resp =10848' contains an illegal key or value."); + DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp =10848"); + } + + @Test() public void testDirreqV3RespExtraArg() throws DescriptorParseException { DirreqStatsBuilder.createWithDirreqV3RespLine("dirreq-v3-resp " @@ -1624,6 +1633,16 @@ public class ExtraInfoDescriptorImplTest { "exit-kibibytes-written unknown=74647"); } + @Test() + public void testExitStatsWrittenEmptyString() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("Line 'exit-kibibytes-written =74647' contains " + + "an illegal key or value in list element '=74647'."); + ExitStatsBuilder.createWithExitKibibytesWrittenLine( + "exit-kibibytes-written =74647"); + } + @Test(expected = DescriptorParseException.class) public void testExitStatsReadNegativeBytes() throws DescriptorParseException {

1 0

[metrics-lib/release] Add change log entry for #22190.
by karsten＠torproject.org 17 May '17

17 May '17

commit 2187c711ad6019443e0968e955c867dcaf20fed5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 10 14:26:07 2017 +0200 Add change log entry for #22190. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee333a..e713a42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Fix a bug where unrecognized lines in extra-info descriptors below crypto blocks were silently skipped. - Add support for six new key-value pairs added by OnionPerf. + - Fix a bug where DescriptorIndexCollector would not delete + extraneous local files if remote paths start with /. * Minor changes - Accept extra arguments in statistics-related extra-info

1 0

[metrics-lib/release] Parse "padding-counts" lines in extra-info descriptors.
by karsten＠torproject.org 17 May '17

17 May '17

commit 75844d046cf6df8162599ce4de4794cc2de09af0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 11 16:21:17 2017 +0200 Parse "padding-counts" lines in extra-info descriptors. Implements #22217. --- CHANGELOG.md | 1 + .../torproject/descriptor/ExtraInfoDescriptor.java | 24 +++++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 36 +++++++++++ .../torproject/descriptor/impl/ParseHelper.java | 33 ++++++++++ .../impl/ExtraInfoDescriptorImplTest.java | 75 ++++++++++++++++++++++ 5 files changed, 169 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9322ecd..36aa082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ DescriptorParser and DescriptorReader and refer to getUnrecognizedLines() in Descriptor if applications really need to fail descriptors containing unrecognized lines. + - Parse "padding-counts" lines in extra-info descriptors. * Minor changes - Accept extra arguments in statistics-related extra-info diff --git a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java index bb1cbe6..04a46d4 100644 --- a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -650,6 +650,30 @@ public interface ExtraInfoDescriptor extends Descriptor { public Map<String, Double> getHidservDirOnionsSeenParameters(); /** + * Return the time in milliseconds since the epoch when the included + * padding-counts statistics ended, or -1 if no such statistics are included. + * + * @since 1.7.0 + */ + public long getPaddingCountsStatsEndMillis(); + + /** + * Return the interval length of the included padding-counts statistics in + * seconds, or -1 if no such statistics are included. + * + * @since 1.7.0 + */ + public long getPaddingCountsStatsIntervalLength(); + + /** + * Return padding-counts statistics, or <code>null</code> if no such + * statistics are included. + * + * @since 1.7.0 + */ + public Map<String, Long> getPaddingCounts(); + + /** * Return the RSA-1024 signature of the PKCS1-padded descriptor digest, * taken from the beginning of the router line through the newline after * the router-signature line, or null if the descriptor doesn't contain diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index e2b3827..dd1bc07 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -66,6 +66,7 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl atMostOnceKeywords.addAll(connBiDirectStatsKeywords); atMostOnceKeywords.addAll(exitStatsKeywords); atMostOnceKeywords.addAll(bridgeStatsKeywords); + atMostOnceKeywords.add("padding-counts"); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkKeywordsDependOn(dirreqStatsKeywords, "dirreq-stats-end"); this.checkKeywordsDependOn(entryStatsKeywords, "entry-stats-end"); @@ -220,6 +221,9 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl case "hidserv-dir-onions-seen": this.parseHidservDirOnionsSeenLine(line, lineNoOpt, partsNoOpt); break; + case "padding-counts": + this.parsePaddingCountsLine(line, lineNoOpt, partsNoOpt); + break; case "identity-ed25519": this.parseIdentityEd25519Line(line, lineNoOpt, partsNoOpt); nextCrypto = "identity-ed25519"; @@ -756,6 +760,16 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl partsNoOpt, 2); } + private void parsePaddingCountsLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + long[] parsedStatsEndData = this.parseStatsEndLine(line, partsNoOpt, + 6); + this.paddingCountsStatsEndMillis = parsedStatsEndData[0]; + this.paddingCountsStatsIntervalLength = parsedStatsEndData[1]; + this.paddingCounts = ParseHelper.parseSpaceSeparatedStringKeyLongValueMap( + line, partsNoOpt, 5); + } + private void parseRouterSignatureLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (!lineNoOpt.equals("router-signature")) { @@ -1341,6 +1355,28 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl : new HashMap<>(this.hidservDirOnionsSeenParameters); } + private long paddingCountsStatsEndMillis = -1L; + + @Override + public long getPaddingCountsStatsEndMillis() { + return this.paddingCountsStatsEndMillis; + } + + private long paddingCountsStatsIntervalLength = -1L; + + @Override + public long getPaddingCountsStatsIntervalLength() { + return this.paddingCountsStatsIntervalLength; + } + + private Map<String, Long> paddingCounts; + + @Override + public Map<String, Long> getPaddingCounts() { + return this.paddingCounts == null ? null + : new HashMap<>(this.paddingCounts); + } + private String routerSignature; @Override diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index fa6ca75..0d4a27a 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -493,6 +493,39 @@ public class ParseHelper { return result; } + protected static Map<String, Long> + parseSpaceSeparatedStringKeyLongValueMap(String line, + String[] partsNoOpt, int startIndex) + throws DescriptorParseException { + Map<String, Long> result = new LinkedHashMap<>(); + if (partsNoOpt.length < startIndex) { + throw new DescriptorParseException("Line '" + line + "' does not " + + "contain a key-value list starting at index " + startIndex + + "."); + } + for (int i = startIndex; i < partsNoOpt.length; i++) { + String listElement = partsNoOpt[i]; + String[] keyAndValue = listElement.split("="); + String key = null; + Long value = null; + if (keyAndValue.length == 2) { + try { + value = Long.parseLong(keyAndValue[1]); + key = keyAndValue[0]; + } catch (NumberFormatException e) { + /* Handle below. */ + } + } + if (key == null) { + throw new DescriptorParseException("Line '" + line + "' contains " + + "an illegal key or value in list element '" + listElement + + "'."); + } + result.put(key, value); + } + return result; + } + protected static String parseMasterKeyEd25519FromIdentityEd25519CryptoBlock( String identityEd25519CryptoBlock) throws DescriptorParseException { diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 76a2148..0afc344 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -180,6 +180,15 @@ public class ExtraInfoDescriptorImplTest { return new RelayExtraInfoDescriptorImpl(db.buildDescriptor(), true); } + private String paddingCountsLine = null; + + private static ExtraInfoDescriptor createWithPaddingCountsLine( + String line) throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.paddingCountsLine = line; + return new RelayExtraInfoDescriptorImpl(db.buildDescriptor(), true); + } + private String unrecognizedLine = null; private static ExtraInfoDescriptor createWithUnrecognizedLine( @@ -288,6 +297,9 @@ public class ExtraInfoDescriptorImplTest { if (this.hidservStatsLines != null) { sb.append(this.hidservStatsLines).append("\n"); } + if (this.paddingCountsLine != null) { + sb.append(this.paddingCountsLine).append("\n"); + } if (this.unrecognizedLine != null) { sb.append(this.unrecognizedLine).append("\n"); } @@ -1727,6 +1739,69 @@ public class ExtraInfoDescriptorImplTest { } @Test() + public void testPaddingCountsValid() + throws DescriptorParseException { + ExtraInfoDescriptor descriptor = DescriptorBuilder + .createWithPaddingCountsLine("padding-counts 2017-05-10 01:48:43 " + + "(86400 s) bin-size=10000 write-drop=10000 write-pad=10000 " + + "write-total=10000 read-drop=10000 read-pad=10000 read-total=70000 " + + "enabled-read-pad=0 enabled-read-total=0 enabled-write-pad=0 " + + "enabled-write-total=0 max-chanpad-timers=0"); + assertEquals(1494380923000L, + descriptor.getPaddingCountsStatsEndMillis()); + assertEquals(86400, descriptor.getPaddingCountsStatsIntervalLength()); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("bin-size")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-drop")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-pad")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-total")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("read-drop")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("read-pad")); + assertEquals(70000L, + (long) descriptor.getPaddingCounts().get("read-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-read-pad")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-read-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-write-pad")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-write-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("max-chanpad-timers")); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoTime() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s) bin-size=10000 write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoInterval() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "01:48:43 bin-size=10000 write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsCommaSeparatedList() + throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s) bin-size=10000,write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoList() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s)"); + } + + @Test() public void testHidservStatsValid() throws DescriptorParseException { ExtraInfoDescriptor descriptor = HidservStatsBuilder .createWithDefaultLines();

1 0

[metrics-lib/master] Prepare for 1.7.0 release.
by karsten＠torproject.org 17 May '17

17 May '17

commit 6941084f258130d53301769a332b7a501321b3ae Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 16:53:49 2017 +0200 Prepare for 1.7.0 release. --- CERT | 18 +++++++++--------- CHANGELOG.md | 2 +- build.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CERT b/CERT index 6cc5a93..0f90f7a 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEM/uNRzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw -MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +NTE2MTQ0NDAwWhcNMTcwODE0MTQ0NDAwWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5 -o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6 -y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR -2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ -CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk -11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO -IRcgAfpjtg8cry/eiw== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEACxUk +6eZkayjJGZjw02bWjrkwwe/N5iOnOz9XcpGQY5lUEk12uIYCYHDB66SsZngsbwNQ +qZ8T6Avm9XSrKAKMxBcPsjTUy0Fb7yG3jLRypPlbgoe61YoliYYaWiaV1OQY1nsZ +ujt6f7T5bwsLeh7La7+kB1SGDu+hKH7Bi3RtVN09iL7x+BJVuJOKHKYoK+UO2fB3 +ltFenkGpiDzGQQxJRzA1WbCQsSPrE6Qi3NmWXsTAc+24Y9gTO8qlmfi6zp1W7TGO ++cUmHIO0u3+ewkb8oIj8jjzGTmEbuJrwgBOohQr6CXCicQHhIrBF6Opi7mF/UHSO +J8d+DLvT41EL9JrgCg== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index 36aa082..c76bbc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.7.0 - ??? +# Changes in version 1.7.0 - 2017-05-17 * Medium changes - Fix a bug where unrecognized lines in extra-info descriptors diff --git a/build.xml b/build.xml index fb926c2..950b5c7 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.6.0-dev" /> + <property name="release.version" value="1.7.0" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/master] Fix a few checkstyle complaints about whitespace.
by karsten＠torproject.org 17 May '17

17 May '17

commit b82c054dbf6902462daf0cd18b0d41e9d8eaf38f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 16:52:54 2017 +0200 Fix a few checkstyle complaints about whitespace. --- .../org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 8b96c88..b6e1343 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1777,7 +1777,7 @@ public class ExtraInfoDescriptorImplTest { "enabled-read-pad", "enabled-read-total", "enabled-write-pad", "enabled-write-total", "max-chanpad-timers"}, new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, - 0L, 0L, 0L, 0L, 0L}); + 0L, 0L, 0L, 0L, 0L}); } @Test() @@ -1794,7 +1794,7 @@ public class ExtraInfoDescriptorImplTest { "enabled-read-pad", "enabled-read-total", "xenabled-write-pad", "enabled-write-total"}, new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, - 0L, 0L, 0L, 0L}); + 0L, 0L, 0L, 0L}); } private void checkPaddingCounts(ExtraInfoDescriptor descriptor, @@ -1822,7 +1822,7 @@ public class ExtraInfoDescriptorImplTest { "enabled-read-pad", "enabled-read-total", "enabled-write-pad", "enabled-write-total", "max-chanpad-timers", "some-new-value"}, new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, - 0L, 0L, 0L, 0L, 0L, 42L}); + 0L, 0L, 0L, 0L, 0L, 42L}); } @Test(expected = DescriptorParseException.class)

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 17 May '17

17 May '17

commit d1fdb04ada0e5adaf9faa43b7009da5bbf5acfa3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 09:18:20 2017 +0000 Update translations for tails-greeter-2_completed --- tr/tr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 2743842..da12adf 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>, 2017\n" +"Last-Translator: T. E. Kalayci <tekrei(a)fsfe.org>, 2017\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -196,8 +196,8 @@ msgid "" " disable all networking." msgstr "" "Bu bilgisayarın İnternet bağlantısı kısıtlanıyor, süzülüyor ya da vekil " -"sunucu üzerinden geçiyorsa, bir Tor köpürüsü ya da yerel vekil sunucu " -"kullanabilirsiniz. Tamamen çevrim dışı çalışmak için tüm ağları devre dışı " +"sunucu üzerinden geçiyorsa, bir Tor köprüsü ya da yerel vekil sunucu " +"kullanabilirsiniz. Tamamen çevrimdışı çalışmak için tüm ağları devre dışı " "bırakabilirsiniz." #: ../data/greeter.ui.h:41 @@ -254,7 +254,7 @@ msgstr "Köprü ve Vekil Sunucu" #: ../tailsgreeter/gui.py:394 msgid "Offline" -msgstr "Çevrim Dışı" +msgstr "Çevrimdışı" #: ../tailsgreeter/gui.py:478 msgid "Failed to relock persistent storage."

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 17 May '17

17 May '17

commit b84816d539bf8ac1a7e9c2721fa3063be3b0c6ff Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 09:18:16 2017 +0000 Update translations for tails-greeter-2 --- tr/tr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 2743842..da12adf 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>, 2017\n" +"Last-Translator: T. E. Kalayci <tekrei(a)fsfe.org>, 2017\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -196,8 +196,8 @@ msgid "" " disable all networking." msgstr "" "Bu bilgisayarın İnternet bağlantısı kısıtlanıyor, süzülüyor ya da vekil " -"sunucu üzerinden geçiyorsa, bir Tor köpürüsü ya da yerel vekil sunucu " -"kullanabilirsiniz. Tamamen çevrim dışı çalışmak için tüm ağları devre dışı " +"sunucu üzerinden geçiyorsa, bir Tor köprüsü ya da yerel vekil sunucu " +"kullanabilirsiniz. Tamamen çevrimdışı çalışmak için tüm ağları devre dışı " "bırakabilirsiniz." #: ../data/greeter.ui.h:41 @@ -254,7 +254,7 @@ msgstr "Köprü ve Vekil Sunucu" #: ../tailsgreeter/gui.py:394 msgid "Offline" -msgstr "Çevrim Dışı" +msgstr "Çevrimdışı" #: ../tailsgreeter/gui.py:478 msgid "Failed to relock persistent storage."

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 17 May '17

17 May '17

commit ec76882d5628046a2dee14c9f0f65fe2deaeb6cd Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 09:16:39 2017 +0000 Update translations for torbutton-torbuttonproperties --- tr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/torbutton.properties b/tr/torbutton.properties index 357a6eb..b228a64 100644 --- a/tr/torbutton.properties +++ b/tr/torbutton.properties @@ -14,7 +14,7 @@ extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarını ya torbutton.popup.external.title = Dış bir dosya türü indirilsin mi? torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n torbutton.popup.external.note = Bazı dosya türleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n -torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n +torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrimdışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 May '17

17 May '17

commit 6c774806b338a067aef82314410e0e420cfb18be Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 09:15:40 2017 +0000 Update translations for tails-persistence-setup_completed --- tr/tr.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index ae73801..ed41f07 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -8,16 +8,16 @@ # cmldrs, 2014 # Emre <conan(a)operamail.com>, 2013 # Kaya Zeren <kayazeren(a)gmail.com>, 2015-2016 -# Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015 +# Ozancan Karataş <ozanc27(a)icloud.com>, 2015 # sgtpepper <barlasmirc(a)gmail.com>, 2013 -# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2015 +# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2015,2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-06-06 08:15+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2017-05-15 13:51+0200\n" +"PO-Revision-Date: 2017-05-17 09:00+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,12 +58,12 @@ msgid "Pidgin profiles and OTR keyring" msgstr "Pidgin profilleri ve Kayıt Dışı anahtarlığı" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 -msgid "Icedove" -msgstr "Icedove" +msgid "Thunderbird" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 -msgid "Icedove profiles and locally stored email" -msgstr "Icedove profilleri ve yerel olarak depolanmış e-posta" +msgid "Thunderbird profiles and locally stored email" +msgstr "Thunderbird profilleri ve yerel olarak depolanmış e-posta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 May '17

17 May '17

commit a13867995f2ecd7a411409d19e07fae8808ada92 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 09:15:34 2017 +0000 Update translations for tails-persistence-setup --- tr/tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index ce97c6e..ed41f07 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -10,14 +10,14 @@ # Kaya Zeren <kayazeren(a)gmail.com>, 2015-2016 # Ozancan Karataş <ozanc27(a)icloud.com>, 2015 # sgtpepper <barlasmirc(a)gmail.com>, 2013 -# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2015 +# Volkan Gezer <volkangezer(a)gmail.com>, 2013-2015,2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-05-17 03:09+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2017-05-17 09:00+0000\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,11 +59,11 @@ msgstr "Pidgin profilleri ve Kayıt Dışı anahtarlığı" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Thunderbird" -msgstr "" +msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Thunderbird profiles and locally stored email" -msgstr "" +msgstr "Thunderbird profilleri ve yerel olarak depolanmış e-posta" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring"

1 0