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

[translation/support-censorship] Update translations for support-censorship
by translation＠torproject.org 11 May '18

11 May '18

commit 603db85bb53dd1dc71697735b2f4193fabaf9874 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 20:48:56 2018 +0000 Update translations for support-censorship --- ru.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru.json b/ru.json index cf1b6877a..1947a5841 100644 --- a/ru.json +++ b/ru.json @@ -9,13 +9,13 @@ "id": "#censorship-2", "control": "censorship-2", "title": "ÐÐŸÐ¹ Ð»ÑÐ±ÐžÐŒÑÐ¹ ÑÐ°Ð¹Ñ Ð±Ð»ÐŸÐºÐžÑÑÐµÑ ÐŽÐŸÑÑÑÐ¿ ÑÐµÑÐµÐ· Tor.", - "description": "<p class=\"mb-3\">Sorry to hear that you can't visit the website you wanted! Sometimes websites will block Tor users because they can't tell the difference between the average Tor user and automated traffic. The best success we've had in getting sites to unblock Tor users is getting users to contact the site administrators directly. Something like this might do the trick:<br />\"Hi! I tried to access your site xyz.com while using Tor Browser and discovered that you don't allow Tor users to access your site. I urge you to reconsider this decision; Tor is used by people all over the world to protect their privacy and fight censorship. By blocking Tor users, you are likely blocking people in repressive countries who want to use a free internet, journalists and researchers who want to protect themselves from discovery, whistleblowers, activists, and ordinary people who want to opt out of invasive third party tracking. Please take a strong stance in favor of digital priv acy and internet freedom, and allow Tor users access to xyz.com. Thank you.\"<br />In the case of banks, and other sensitive websites, it is also common to see geography-based blocking (if a bank knows you generally access their services from one country, and suddenly you are connecting from an exit relay on the other side of the world, your account may be locked or suspended). If you are unable to connect to an onion service, please see <a href=\"#onionservices-3\">I cannot reach X.onion!</a></p>" + "description": "<p class=\"mb-3\">ÐÐµÑÐ°Ð»ÑÐœÐŸ ÑÐ»ÑÑÐ°ÑÑ, ÑÑÐŸ Ð²Ñ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÑÐµÑÐžÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹Ñ, ÐºÐŸÑÐŸÑÑÐ¹ Ð²Ð°ÐŒ ÐœÑÐ¶ÐµÐœ! ÐÐœÐŸÐ³ÐŽÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ Ð±Ð»ÐŸÐºÐžÑÑÑÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð¿ÐŸÑÐŸÐŒÑ ÑÑÐŸ ÐŸÐœÐž ÐœÐµ ÐŒÐŸÐ³ÑÑ ÐŸÐ¿ÑÐµÐŽÐµÐ»ÐžÑÑ ÑÐ°Ð·ÐœÐžÑÑ ÐŒÐµÐ¶ÐŽÑ ÐŸÐ±ÑÑÐœÑÐŒ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÐµÐŒ Tor Ðž Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐžÐŒ ÑÑÐ°ÑÐžÐºÐŸÐŒ. ÐÐ°ÐžÐ»ÑÑÑÐžÐŒ ÐžÐ·Ð²ÐµÑÑÐœÑÐŒ ÐœÐ°ÐŒ Ð²ÑÑÐŸÐŽÐŸÐŒ ÐŽÐ»Ñ ÑÐ°Ð·Ð±Ð»ÐŸÐºÐžÑÐŸÐ²Ð°ÐœÐžÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÐµÐ¹ Tor Ð±ÑÐŽÐµÑ ÑÐ»ÐµÐŽÑÑÑÐµÐµ: Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÑÐŒ ÐœÐ°ÐŽÐ»ÐµÐ¶ÐžÑ ÐœÐ°Ð¿ÑÑÐŒÑÑ ÐŸÐ±ÑÐ°ÑÐ°ÑÑÑÑ Ðº Ð°ÐŽÐŒÐžÐœÐžÑÑÑÐ°ÑÐŸÑÐ°ÐŒ ÑÐ°Ð¹ÑÐ°. ÐÐœÐŸÐ³ÐŽÐ° ÑÑÐ°Ð±Ð°ÑÑÐ²Ð°ÐµÑ ÑÐ°ÐºÐŸÐ¹ ÑÑÑÐº:<br />\"ÐÑÐžÐ²ÐµÑ! Ð¯ Ð¿ÐŸÐ¿ÑÑÐ°Ð»ÑÑ Ð¿ÐŸÐ»ÑÑÐžÑÑ ÐŽÐŸÑÑÑÐ¿ Ðº Ð²Ð°ÑÐµÐŒÑ ÑÐ°Ð¹ÑÑ xyz.com ÑÐµÑÐµÐ· Tor Browser Ðž ÐŸÐ±ÐœÐ°ÑÑÐ¶ÐžÐ», ÑÑÐŸ Ð²Ñ ÐœÐµ ÑÐ°Ð·ÑÐµÑÐ°ÐµÑÐµ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÑÐ Œ Tor Ð·Ð°ÑÐŸÐŽÐžÑÑ ÐœÐ° ÐœÐµÐ³ÐŸ. Ð¯ ÐœÐ°ÑÑÐŸÑÑÐµÐ»ÑÐœÐŸ Ð¿ÑÐžÐ·ÑÐ²Ð°Ñ Ð²Ð°Ñ Ð¿ÐµÑÐµÑÐŒÐŸÑÑÐµÑÑ ÑÑÐŸ ÑÐµÑÐµÐœÐžÐµ: Tor ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ Ð»ÑÐŽÑÐŒÐž Ð²ÐŸ Ð²ÑÐµÐŒ ÐŒÐžÑÐµ ÐŽÐ»Ñ Ð·Ð°ÑÐžÑÑ ÐžÑ ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž Ðž Ð±ÐŸÑÑÐ±Ñ Ñ ÑÐµÐœÐ·ÑÑÐŸÐ¹. ÐÐ»ÐŸÐºÐžÑÑÑ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÐµÐ¹ Tor, Ð²Ñ ÐœÐ°Ð²ÐµÑÐœÑÐºÐ° Ð±Ð»ÐŸÐºÐžÑÑÐµÑÐµ Ð»ÑÐŽÐµÐ¹ Ð² ÑÐµÐ¿ÑÐµÑÑÐžÐ²ÐœÑÑ ÑÑÑÐ°ÐœÐ°Ñ, ÐºÐŸÑÐŸÑÑÐµ ÑÐŸÑÑÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÑÐ²ÐŸÐ±ÐŸÐŽÐœÑÐ¹ ÐžÐœÑÐµÑÐœÐµÑ, Ð¶ÑÑÐœÐ°Ð»ÐžÑÑÐŸÐ² Ðž ÐžÑÑÐ»ÐµÐŽÐŸÐ²Ð°ÑÐµÐ»ÐµÐ¹, ÐºÐŸÑÐŸÑÑÐµ ÑÐŸÑÑÑ Ð·Ð°ÑÐžÑÐžÑÑ ÑÐµÐ±Ñ ÐŸÑ ÑÐ»ÐµÐ¶ÐºÐž Ðž ÐŸÑÐ²ÐµÐŽÐŸÐŒÐžÑÐµÐ»ÐµÐ¹, Ð°ÐºÑÐžÐ²ÐžÑÑÐŸÐ² Ðž ÐŸÐ±ÑÑÐœÑÑ Ð»ÑÐŽÐµÐ¹, ÐºÐŸÑÐŸÑÑÐµ ÑÐŸÑÑÑ ÐŸÑÐºÐ°Ð·Ð°ÑÑÑÑ ÐŸÑ ÐžÐœÐ²Ð°Ð·ÐžÐ²ÐœÐŸÐ³ÐŸ ÐŸÑÑÐ»ÐµÐ¶ÐžÐ²Ð°ÐœÐžÑ ÑÑÐµÑÑÐµÐ¹ ÑÑÐŸÑÐŸÐœÐŸÐ¹. ÐÐŸÐ¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐžÐŽÐµÑÐ¶ÐžÐ²Ð°Ð¹ÑÐµÑÑ ÑÐµÑÐžÑÐµÐ»ÑÐœÐŸÐ¹ Ð¿ÐŸÐ·ÐžÑÐžÐž Ð² Ð¿ÐŸÐ»ÑÐ·Ñ ÐºÐŸÐœÑÐž ÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž ÑÐžÑÑÐŸÐ²ÐŸÐ³ÐŸ ÐºÐŸÐœÑÐµÐœÑÐ° Ðž ÑÐ²ÐŸÐ±ÐŸÐŽÑ Ð² ÐžÐœÑÐµÑÐœÐµÑÐµ Ðž ÑÐ°Ð·ÑÐµÑÐ°Ð¹ÑÐµ Ð¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÐµÐ»ÑÐŒ Tor Ð·Ð°ÑÐŸÐŽÐžÑÑ ÐœÐ° xyz.com. Ð¡Ð¿Ð°ÑÐžÐ±ÐŸ.\"<br />Ð ÑÐ»ÑÑÐ°Ðµ Ñ Ð±Ð°ÐœÐºÐ°ÐŒÐž Ðž ÐŽÑÑÐ³ÐžÐŒÐž ÑÑÐ²ÑÑÐ²ÐžÑÐµÐ»ÑÐœÑÐŒÐž Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ°ÐŒÐž ÑÐ°ÐºÐ¶Ðµ ÑÐ°ÑÑÐŸ ÐœÐ°Ð±Ð»ÑÐŽÐ°ÐµÑÑÑ Ð±Ð»ÐŸÐºÐžÑÐŸÐ²Ð°ÐœÐžÐµ ÐœÐ° ÐŸÑÐœÐŸÐ²Ðµ ÐŒÐµÑÑÐŸÐ¿ÐŸÐ»ÐŸÐ¶ÐµÐœÐžÑ (ÐµÑÐ»Ðž Ð±Ð°ÐœÐº Ð·ÐœÐ°ÐµÑ, ÑÑÐŸ Ð²Ñ ÐŸÐ±ÑÑÐœÐŸ ÐŸÐ±ÑÐ°ÑÐ°ÐµÑÐµÑÑ Ðº ÐžÑ ÑÑÐ»ÑÐ³Ð°ÐŒ ÐžÐ· ÐŸÐŽÐœÐŸÐ¹ ÑÑÑÐ°ÐœÑ Ðž Ð²ÐŽÑÑÐ³ Ð²Ñ Ð¿ÐŸÐŽÐºÐ»ÑÑÐ°ÐµÑÐµÑÑ ÑÐµÑÐµÐ· ÑÐµÑÑÐ°ÐœÑÐ»ÑÑÐŸÑ ÐœÐ° ÐŽÑÑÐ³ÐŸÐ¹ ÑÑÐŸÑÐŸÐœÐµ ÐŒÐžÑÐ°, Ð²Ð°ÑÐ° ÑÑÑÑÐœÐ°Ñ Ð·Ð°Ð¿ÐžÑÑ Ðž ÑÑÑÑ ÐŒÐŸÐ³ÑÑ Ð±ÑÑÑ Ð·Ð°Ð±Ð»ÐŸÐºÐžÑÐŸÐ²Ð°ÐœÑ ÐžÐ»Ðž Ð·Ð°ÐŒÐŸÑÐŸÐ¶ÐµÐœÑ). ÐÑÐ»Ðž Ð²Ñ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐŽÐºÐ»ÑÑÐžÑÑÑÑ Ðº onion-ÑÐ°Ð¹ÑÑ, ÑÐŒ. <a href=\"#onionservices-3\">Ð¯ ÐœÐµ ÐŒÐŸÐ³Ñ ÐŸÑÐºÑÑÑÑ X.onion!</a></p>" }, "censorship-3": { "id": "#censorship-3", "control": "censorship-3", "title": "ÐÐ°Ðº Ð·Ð°Ð³ÑÑÐ·ÐžÑÑ Tor, ÐµÑÐ»Ðž torproject.org Ð·Ð°Ð±Ð»ÐŸÐºÐžÑÐŸÐ²Ð°Ðœ?", - "description": "<p class=\"mb-3\">ÐÑÐ»Ðž ÐÑ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ ÑÐºÐ°ÑÐ°ÑÑ Tor ÑÐµÑÐµÐ· ÐœÐ°Ñ <mark><a href=\"https://www.torproject.org\">ÑÐ°Ð¹Ñ</a></mark>, Ð²Ñ ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐ»ÑÑÐžÑÑ ÐºÐŸÐ¿ÐžÑ Tor ÑÐµÑÐµÐ· GetTor. GetTor - ÑÑÐŸ ÑÑÐ»ÑÐ³Ð°, ÐºÐŸÑÐŸÑÐ°Ñ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž ÐŸÑÐ²ÐµÑÐ°ÐµÑ ÐœÐ° ÑÐŸÐŸÐ±ÑÐµÐœÐžÑ ÑÑÑÐ»ÐºÐ°ÐŒÐž ÐœÐ° Ð¿ÐŸÑÐ»ÐµÐŽÐœÑÑ Ð²ÐµÑÑÐžÑ Tor Browser, ÑÐ°Ð·ÐŒÐµÑÐµÐœÐœÑÐµ Ð² ÑÐ°Ð·Ð»ÐžÑÐœÑÑ ÐŒÐµÑÑÐ°Ñ, ÐºÐŸÑÐŸÑÑÐµ ÐŒÐµÐœÐµÐµ Ð²ÐµÑÐŸÑÑÐœÐŸ Ð¿ÐŸÐŽÐ²ÐµÑÐ³Ð°ÑÑÑÑ ÑÐµÐœÐ·ÑÑÐµ, ÑÐ°ÐºÐžÐµ ÐºÐ°Ðº Dropbox, Google ÐÐžÑÐº Ðž Github.</p>" + "description": "<p class=\"mb-3\">ÐÑÐ»Ðž Ð²Ñ ÐœÐµ ÐŒÐŸÐ¶ÐµÑÐµ ÑÐºÐ°ÑÐ°ÑÑ Tor ÑÐµÑÐµÐ· ÐœÐ°Ñ <mark><a href=\"https://www.torproject.org\">ÑÐ°Ð¹Ñ</a></mark>, Ð²Ñ ÐŒÐŸÐ¶ÐµÑÐµ Ð¿ÐŸÐ»ÑÑÐžÑÑ ÐºÐŸÐ¿ÐžÑ Tor ÑÐµÑÐµÐ· GetTor. GetTor - ÑÑÐŸ ÑÑÐ»ÑÐ³Ð°, ÐºÐŸÑÐŸÑÐ°Ñ Ð°Ð²ÑÐŸÐŒÐ°ÑÐžÑÐµÑÐºÐž ÐŸÑÐ²ÐµÑÐ°ÐµÑ ÐœÐ° ÑÐŸÐŸÐ±ÑÐµÐœÐžÑ ÑÑÑÐ»ÐºÐ°ÐŒÐž ÐœÐ° Ð¿ÐŸÑÐ»ÐµÐŽÐœÑÑ Ð²ÐµÑÑÐžÑ Tor Browser, ÑÐ°Ð·ÐŒÐµÑÐµÐœÐœÑÐµ Ð² ÑÐ°Ð·Ð»ÐžÑÐœÑÑ ÐŒÐµÑÑÐ°Ñ, ÐºÐŸÑÐŸÑÑÐµ ÐŒÐµÐœÐµÐµ Ð²ÐµÑÐŸÑÑÐœÐŸ Ð¿ÐŸÐŽÐ²ÐµÑÐ³Ð°ÑÑÑÑ ÑÐµÐœÐ·ÑÑÐµ, ÑÐ°ÐºÐžÐµ ÐºÐ°Ðº Dropbox, Google ÐÐžÑÐº Ðž Github.</p>" }, "censorship-4": { "id": "#censorship-4", @@ -26,7 +26,7 @@ "censorship-5": { "id": "#censorship-5", "control": "censorship-5", - "title": "I am having trouble connecting to Tor, and I canât figure out whatâs wrong.", + "title": "Ð£ ÐŒÐµÐœÑ Ð¿ÑÐŸÐ±Ð»ÐµÐŒÑ Ñ Ð¿ÐŸÐŽÐºÐ»ÑÑÐµÐœÐžÐµÐŒ Ðº Tor Ðž Ñ ÐœÐµ ÐŒÐŸÐ³Ñ Ð¿ÐŸÐœÑÑÑ, ÑÑÐŸ ÐœÐµ ÑÐ°Ðº.", "description": "<p class=\"mb-3\">If youâre having trouble connecting, please select the option to \"copy Tor log to clipboard.\" Then paste the Tor log into a text file or other document. You should see one of these common log errors (look for the following lines in your Tor log):</p><h5>Common log error #1: Proxy connection failure</h5><p class=\"mb-3\"><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server fa ilure\")</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS proxy is required for your network setup, then please make sure youâve entered your proxy details correctly. If a SOCKS proxy is not required, or youâre not sure, please try connecting to the Tor network without a SOCKS proxy.<p><h5>Common log error #2: Canât reach guard relays</h5><p class=\"mb-3\"><pre><code> 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means your Tor failed to connect to the first node in the Tor circuit. This could mean that youâre on a network thatâs censored. Please try connecting with bridges, and that should fix the problem.</p><h5>Common log error #3: Failed to complete TLS handshake</h5><p class=\"mb-3\"><pre><code> 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means that Tor failed to complete a TLS handshake with the directory authorities. Using bridges will likely fix this.</p><h5>Common log error #4: Clock skew</h5><p class=\"mb-3\"><pre><code> 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n Tor requires an accurate clock to work: please check your time, timezone, and date settings.</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means your system clock is incorrect. Please make sure your clock is set accurately, including the correct timezone. Then restart Tor. </p>" }, "censorship-6": {

1 0

[tor/master] get rid of whitespace before #ifdef's
by arma＠torproject.org 11 May '18

11 May '18

commit 962c2f87766f200eb364e839038fafe50ddb0a93 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 11 16:27:55 2018 -0400 get rid of whitespace before #ifdef's i don't know if whitespace is ok to have before preprocessing directives on all platforms, but anyway we almost never have it, so now things are more uniform. --- src/or/control.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 6f87f5ab5..9323173f5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1861,24 +1861,24 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "process/pid")) { int myPid = -1; - #ifdef _WIN32 +#ifdef _WIN32 myPid = _getpid(); - #else +#else myPid = getpid(); - #endif +#endif tor_asprintf(answer, "%d", myPid); } else if (!strcmp(question, "process/uid")) { - #ifdef _WIN32 +#ifdef _WIN32 *answer = tor_strdup("-1"); - #else +#else int myUid = geteuid(); tor_asprintf(answer, "%d", myUid); #endif /* defined(_WIN32) */ } else if (!strcmp(question, "process/user")) { - #ifdef _WIN32 +#ifdef _WIN32 *answer = tor_strdup(""); - #else +#else int myUid = geteuid(); const struct passwd *myPwEntry = tor_getpwuid(myUid);

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 11 May '18

11 May '18

commit 91799146ee4d0e844282e842637c2e7890949019 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 18:15:27 2018 +0000 Update translations for whisperback_completed --- el/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/el.po b/el/el.po index b1bcad936..00c67c2cc 100644 --- a/el/el.po +++ b/el/el.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-04-12 18:55+0000\n" -"Last-Translator: Elektra M. <safiragon(a)yahoo.gr>\n" +"PO-Revision-Date: 2018-05-11 17:53+0000\n" +"Last-Translator: Dimitris Maroulidis <dmaroulidis(a)dimitrismaroulidis.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 11 May '18

11 May '18

commit 13761ce9fc47d63439e0714f92d6f4aa82ed49df Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 18:15:20 2018 +0000 Update translations for whisperback --- el/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/el.po b/el/el.po index b1bcad936..00c67c2cc 100644 --- a/el/el.po +++ b/el/el.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-04-12 18:55+0000\n" -"Last-Translator: Elektra M. <safiragon(a)yahoo.gr>\n" +"PO-Revision-Date: 2018-05-11 17:53+0000\n" +"Last-Translator: Dimitris Maroulidis <dmaroulidis(a)dimitrismaroulidis.com>\n" "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[exonerator/master] Add change log entry for #26032.
by karsten＠torproject.org 11 May '18

11 May '18

commit 84b073611ef72d84b58ce1b6cf7aa57afc473abe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 11 17:14:45 2018 +0200 Add change log entry for #26032. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bc4d1d..6b80bf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 2.0.3 - 2018-0?-?? + + * Minor changes + - Remove duplicate [] surrounding suggested IPv6 addresses. + + # Changes in version 2.0.2 - 2017-12-20 * Major changes

1 0

[exonerator/master] Avoid adding superfluous brackets in suggestion links.
by karsten＠torproject.org 11 May '18

11 May '18

commit fa80fff479cfd10359283e4e40e23b59bc109b50 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Jan 9 09:25:13 2018 +0000 Avoid adding superfluous brackets in suggestion links. Also add a test checking for superfluous brackets. Fixes task-26032. --- .../metrics/exonerator/ExoneraTorServlet.java | 8 +-- .../metrics/exonerator/ExoneraTorServletTest.java | 58 ++++++++++++++++++++++ 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 8f114eb..659f494 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -466,7 +466,7 @@ public class ExoneraTorServlet extends HttpServlet { contactLink); } - private void writeSummaryAddressesInSameNetwork(PrintWriter out, + void writeSummaryAddressesInSameNetwork(PrintWriter out, ResourceBundle rb, String relayIp, String timestampStr, String langStr, List<String> addressesInSameNetwork) throws IOException { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; @@ -475,10 +475,10 @@ public class ExoneraTorServlet extends HttpServlet { String link; String address; if (addressInSameNetwork.contains(":")) { + address = addressInSameNetwork.replaceAll("[\\[\\]]", ""); link = String.format("/?ip=[%s]&timestamp=%s&lang=%s", - addressInSameNetwork.replaceAll(":", "%3A"), timestampStr, - langStr); - address = "[" + addressInSameNetwork + "]"; + address.replaceAll(":", "%3A"), timestampStr, langStr); + address = "[" + address + "]"; } else { link = String.format("/?ip=%s&timestamp=%s&lang=%s", addressInSameNetwork, timestampStr, langStr); diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 81d6d3c..34dfd42 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java @@ -4,9 +4,17 @@ package org.torproject.metrics.exonerator; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.junit.Test; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Locale; +import java.util.ResourceBundle; + public class ExoneraTorServletTest { private static final String[][] ipTestData @@ -32,5 +40,55 @@ public class ExoneraTorServletTest { assertEquals(data[1], ExoneraTorServlet.parseIpParameter(data[0])); } } + + @Test + public void testNearbyIpV6Response() throws Exception { + ExoneraTorServlet es = new ExoneraTorServlet(); + ResourceBundle rb = ResourceBundle + .getBundle("ExoneraTor", Locale.forLanguageTag("en")); + for (QueryResponse qr : qrs) { + StringWriter sw = new StringWriter(); + es.writeSummaryAddressesInSameNetwork(new PrintWriter(sw), rb, + qr.queryAddress, qr.queryDate, "en", + Arrays.asList(qr.nearbyAddresses)); + String errorMsg = "Test data:" + QueryResponse.toJson(qr) + + "\nresult:\n" + sw.toString(); + assertTrue(errorMsg, + sw.toString().contains("Result is negative")); + assertTrue(errorMsg, + sw.toString().contains("ip=[2a06%3Ae80%3A1%3A%3A10]&")); + assertTrue(errorMsg, + sw.toString().contains("ip=[2a06%3Ae80%3A1%3A%3A15]&")); + } + } + + private QueryResponse[] qrs = new QueryResponse[]{ + QueryResponse.fromJson(new StringReader( + "{\"version\":\"1.0\"," + + "\"query_address\":\"2a06:e80:1::11\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":false," + + "\"nearby_addresses\":[\"2a06:e80:1::10\"," + + "\"2a06:e80:1::15\"]}")), + QueryResponse.fromJson(new StringReader( + "{\"version\":\"1.0\"," + + "\"query_address\":\"2a06:e80:1::11\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":false," + + "\"nearby_addresses\":[\"[2a06:e80:1::10]\"," + + "\"2a06:e80:1::15\"]}")), + QueryResponse.fromJson(new StringReader( + "{\"version\":\"1.0\"," + + "\"query_address\":\"2a06:e80:1::11\"," + + "\"query_date\":\"2016-12-12\"," + + "\"first_date_in_database\":\"2016-01-01\"," + + "\"last_date_in_database\":\"2016-12-31\"," + + "\"relevant_statuses\":false," + + "\"nearby_addresses\":[\"[2a06:e80:1::10]\"," + + "\"[2a06:e80:1::15]\"]}"))}; }

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 May '18

11 May '18

commit 7aae04ec798fb54967f124add72e53c06ec120d2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 14:46:49 2018 +0000 Update translations for tails-misc --- de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/de.po b/de.po index 24085bd40..0c29419e1 100644 --- a/de.po +++ b/de.po @@ -30,7 +30,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-16 10:17+0000\n" +"PO-Revision-Date: 2018-05-11 14:30+0000\n" "Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -62,18 +62,18 @@ msgid "" "an opportunity for eavesdroppers, like your email or Internet provider, to\n" "confirm that you are using Tails.\n" "</p>\n" -msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nwie unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren um das Problem\nzu klären. Dies ist notwendig für die große Mehrheit der erhaltenen Berichte, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihr Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" +msgstr "<h1>Helfen uns Ihren Fehler zu beheben!</h1>\n<p>Lesen Sie <a href=\"%s\">unsere Fehlerberichtanleitung</a>.</p>\n<p><strong>Geben Sie nur soviele persönliche Informationen an,\nwie unbedingt notwendig!</strong></p>\n<h2>Über die Angabe von Email-Adressen</h2>\n<p>\nDie Angabe einer Email-Adresse erlaubt uns, Sie zu kontaktieren, um das Problem\nzu klären. Dies ist für die große Mehrheit der erhaltenen Berichte notwendig, da die\nmeisten Berichte ohne Kontaktinformationen nutzlos sind. Andererseits ist dies eine\nEinladung für böswillige Dritte, wie Ihren Email- oder Internetprovider, um herauszufinden,\ndass Sie Tails nutzen.</p>\n" #: config/chroot_local-includes/usr/local/bin/electrum:57 msgid "Persistence is disabled for Electrum" -msgstr "Beständiges Speichern ist für Electrum deaktiviert." +msgstr "Beständiges Speicherbereich ist für Electrum deaktiviert." #: config/chroot_local-includes/usr/local/bin/electrum:59 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." -msgstr "Wenn Sie Tails neu starten, werden alle Daten von Electrum gelöscht, inklusive Ihrer Bitcoin-Geldbörse. Wir empfehlen eindringlich, Electrum mit aktiviertem beständigen Speicherbereich zu nutzen." +msgstr "Wenn Sie Tails neu starten, werden alle Daten von Electrum gelöscht, inklusive Ihrer Bitcoin-Geldbörse. Wir empfehlen eindringlich, Electrum ausschließlich mit aktiviertem beständigen Speicherbereich zu nutzen." #: config/chroot_local-includes/usr/local/bin/electrum:60 msgid "Do you want to start Electrum anyway?" @@ -158,7 +158,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:201 msgid "Your additional software are up to date" -msgstr "Die zusätzlichen Anwendungen sind auf dem neuesten Stand" +msgstr "Die zusätzlichen Anwendungen sind auf dem aktuellsten Stand" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:202 msgid "The upgrade was successful." @@ -284,7 +284,7 @@ msgid "" "monitor what you are doing in Tails. Only free software can be considered " "trustworthy, for both the host operating system and the virtualization " "software." -msgstr "Sowohl das Wirts-Betriebssystem als auch die Virtualisierungs-Anwendung können überwachen, was Sie in Tails machen. Nur Freie Software kann sowohl für das Wirts-Betriebssystem als auch für die Virtualisierungs-Anwendung als vertrauenswürdig gelten." +msgstr "Sowohl das Wirts-Betriebssystem als auch die Virtualisierungs-Anwendung können überwachen, was Sie in Tails tun. Nur Freie Software kann sowohl für das Wirts-Betriebssystem als auch für die Virtualisierungs-Anwendung als vertrauenswürdig gelten." #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83 msgid "Learn more" @@ -311,7 +311,7 @@ msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly " "use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "Die Netzwerkaktivität im unsicheren Browser ist <b>nicht anonym</b>. Benutzen Sie den unsicheren Browser nur wenn nötig, z.B. wenn Sie sich einloggen oder registrieren müssen, um Ihre Internetverbindung zu aktivieren." +msgstr "Die Netzwerkaktivität im unsicheren Browser ist <b>nicht anonym</b>.\\nBenutzen Sie den unsicheren Browser nur wenn nötig, z.B. wenn Sie sich einloggen oder registrieren müssen, um Ihre Internetverbindung zu aktivieren." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51 msgid "Starting the Unsafe Browser..." @@ -352,7 +352,7 @@ msgstr "Konnte chroot nicht einrichten." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:105 msgid "Failed to configure browser." -msgstr "Konfiguration des Browses fehlgeschlagen." +msgstr "Konfiguration des Browsers fehlgeschlagen." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:111 msgid ""

1 0

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

11 May '18

commit 1f6f517a5ce062241434335290eec3c45a2079ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 14:18:34 2018 +0000 Update translations for tails-greeter-2_completed --- de/de.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/de/de.po b/de/de.po index 425589035..a7177db79 100644 --- a/de/de.po +++ b/de/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 20:26+0100\n" +"POT-Creation-Date: 2018-05-07 19:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: max weber, 2017\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -94,7 +94,8 @@ msgstr "MAC-Adressen nicht manipulieren" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "" -"Verschlüsselter Speicher kann mit dieser Passphrase nicht entsperrt werden." +"Verschlüsselter Speicherbereich kann mit dieser Passphrase nicht entsperrt " +"werden." #: ../data/greeter.ui.h:18 msgid "" @@ -127,7 +128,7 @@ msgstr "Vorgabeeinstellungen" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "Sprache & Regionseinstellungen speichern" +msgstr "Sprache- und Regionseinstellungen speichern" #: ../data/greeter.ui.h:25 msgid "_Language" @@ -147,7 +148,7 @@ msgstr "_Zeitzone" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "Verschlüsselte _beständige Datenpartition" +msgstr "Verschlüsselter _beständiger Speicherbereich" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -155,12 +156,12 @@ msgstr "Passphrase anzeigen" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "Beständige Datenpartition konfigurieren" +msgstr "Beständigen Speicherbereich konfigurieren" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" -"Geben Sie Ihre Passphrase ein, um die beständige Datenpartition zu " +"Geben Sie Ihre Passphrase ein, um die beständigen Speicherbereich zu " "entsperren" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 @@ -170,13 +171,13 @@ msgstr "Entsperren" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "Beständige Datenpartition wieder sperren" +msgstr "Beständigen Speicherbereich wieder sperren" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" -"Ihre beständige Datenpartition ist entsperrt. Starten Sie Tails neu, um sie " -"wieder zu sperren." +"Ihr beständiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn" +" wieder zu sperren." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" @@ -223,7 +224,7 @@ msgid "" "press the \"+\" button below." msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " -"benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " +"benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die " "Schaltfläche »+«." #: ../data/greeter.ui.h:45 @@ -256,7 +257,7 @@ msgstr "_Windows-Tarnung" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Brücke & Vermittlungsserver" +msgstr "Brücke und Vermittlungsserver" #: ../tailsgreeter/gui.py:397 msgid "Offline" @@ -264,11 +265,11 @@ msgstr "Offline" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "Beständige Datenpartition konnte nicht wieder gesperrt werden." +msgstr "Beständiger Speicherbereich konnte nicht wieder gesperrt werden." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…" -msgstr "Wird entsperrt …" +msgstr "Wird entsperrt…" #: ../tailsgreeter/gui.py:594 msgid "Additional Settings"

1 0

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

11 May '18

commit 70860b10bd3f4f77688eea31bd79e4afc247959d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 14:18:29 2018 +0000 Update translations for tails-greeter-2 --- de/de.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/de/de.po b/de/de.po index 425589035..a7177db79 100644 --- a/de/de.po +++ b/de/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 20:26+0100\n" +"POT-Creation-Date: 2018-05-07 19:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: max weber, 2017\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -94,7 +94,8 @@ msgstr "MAC-Adressen nicht manipulieren" #: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:532 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "" -"Verschlüsselter Speicher kann mit dieser Passphrase nicht entsperrt werden." +"Verschlüsselter Speicherbereich kann mit dieser Passphrase nicht entsperrt " +"werden." #: ../data/greeter.ui.h:18 msgid "" @@ -127,7 +128,7 @@ msgstr "Vorgabeeinstellungen" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "Sprache & Regionseinstellungen speichern" +msgstr "Sprache- und Regionseinstellungen speichern" #: ../data/greeter.ui.h:25 msgid "_Language" @@ -147,7 +148,7 @@ msgstr "_Zeitzone" #: ../data/greeter.ui.h:29 msgid "Encrypted _Persistent Storage" -msgstr "Verschlüsselte _beständige Datenpartition" +msgstr "Verschlüsselter _beständiger Speicherbereich" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -155,12 +156,12 @@ msgstr "Passphrase anzeigen" #: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" -msgstr "Beständige Datenpartition konfigurieren" +msgstr "Beständigen Speicherbereich konfigurieren" #: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" -"Geben Sie Ihre Passphrase ein, um die beständige Datenpartition zu " +"Geben Sie Ihre Passphrase ein, um die beständigen Speicherbereich zu " "entsperren" #: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 @@ -170,13 +171,13 @@ msgstr "Entsperren" #: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" -msgstr "Beständige Datenpartition wieder sperren" +msgstr "Beständigen Speicherbereich wieder sperren" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" -"Ihre beständige Datenpartition ist entsperrt. Starten Sie Tails neu, um sie " -"wieder zu sperren." +"Ihr beständiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn" +" wieder zu sperren." #: ../data/greeter.ui.h:36 msgid "_Additional Settings" @@ -223,7 +224,7 @@ msgid "" "press the \"+\" button below." msgstr "" "Die Standardeinstellungen sind in den meisten Situationen sicher. Um " -"benutzerdefinierte Einstellungen vorzunehmen, drücken Sie unten auf die " +"benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die " "Schaltfläche »+«." #: ../data/greeter.ui.h:45 @@ -256,7 +257,7 @@ msgstr "_Windows-Tarnung" #: ../tailsgreeter/gui.py:391 msgid "Bridge & Proxy" -msgstr "Brücke & Vermittlungsserver" +msgstr "Brücke und Vermittlungsserver" #: ../tailsgreeter/gui.py:397 msgid "Offline" @@ -264,11 +265,11 @@ msgstr "Offline" #: ../tailsgreeter/gui.py:481 msgid "Failed to relock persistent storage." -msgstr "Beständige Datenpartition konnte nicht wieder gesperrt werden." +msgstr "Beständiger Speicherbereich konnte nicht wieder gesperrt werden." #: ../tailsgreeter/gui.py:499 msgid "Unlocking…" -msgstr "Wird entsperrt …" +msgstr "Wird entsperrt…" #: ../tailsgreeter/gui.py:594 msgid "Additional Settings"

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 11 May '18

11 May '18

commit 9897ad18cc25f21f73723320c31807c07d0761b9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 11 14:17:35 2018 +0000 Update translations for tails-perl5lib_completed --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index 81d977d0d..2c75b1001 100644 --- a/de.po +++ b/de.po @@ -5,6 +5,7 @@ # Translators: # Lukas N <luki.niesen(a)gmail.com>, 2018 # max weber, 2016 +# spriver, 2018 # Tobias Bannert <tobannert(a)gmail.com>, 2013 # rike, 2014-2015 msgid "" @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-03-15 12:15+0000\n" -"PO-Revision-Date: 2018-05-10 10:24+0000\n" -"Last-Translator: Lukas N <luki.niesen(a)gmail.com>\n" +"PO-Revision-Date: 2018-05-11 14:17+0000\n" +"Last-Translator: spriver\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,4 +36,4 @@ msgstr "Das Gerät, von dem Tails ausgeführt wird, konnte nicht gefunden werden msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Das Speichermedium von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?" +msgstr "Das Speichermedium, von dem Tails ausgeführt wird, konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?"

1 0