tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
September 2020
- 17 participants
- 1822 discussions

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation@torproject.org 16 Sep '20
by translation@torproject.org 16 Sep '20
16 Sep '20
commit 17e81de87efa4f5152457fde52f9e65196b1f089
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Sep 16 17:17:13 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
contents+is.po | 188 ++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 134 insertions(+), 54 deletions(-)
diff --git a/contents+is.po b/contents+is.po
index 6a7f163c0d..43f1bcd524 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,3 +1,4 @@
+#
# Translators:
# erinm, 2019
# Sveinn í Felli <sv1(a)fellsnet.is>, 2020
@@ -78,7 +79,7 @@ msgstr "Niðurhal"
#: https//tb-manual.torproject.org/menu/
#: (content/menu/contents+en.lrtopic.body)
msgid "Running Tor Browser for the First Time"
-msgstr ""
+msgstr "Að keyra Tor-vafrann í fyrsta skipti"
#: https//tb-manual.torproject.org/menu/
#: (content/menu/contents+en.lrtopic.body)
@@ -147,7 +148,7 @@ msgstr "Þekkt vandamál"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.title)
msgid "Mobile Tor"
-msgstr ""
+msgstr "Tor á ferðinni"
#: https//tb-manual.torproject.org/menu/
#: (content/menu/contents+en.lrtopic.body)
@@ -422,11 +423,12 @@ msgid ""
"1. Navigate to the Tor Browser [download "
"page](https://www.torproject.org/download)."
msgstr ""
+"1. Farðu á [niðurhalssíðu](https://www.torproject.org/download) Tor-vafrans."
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
msgid "2. Download the Windows `.exe` file"
-msgstr ""
+msgstr "2. Sæktu Windows `.exe` skrána"
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -434,6 +436,8 @@ msgid ""
"3. (Recommended) Verify the [file's "
"signature](https://support.torproject.org/en/tbb/how-to-verify-signature/)."
msgstr ""
+"3. (Ráðlagt) Sannreyndu [undirritun "
+"skrárinnar](https://support.torproject.org/en/tbb/how-to-verify-signature/)."
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -441,6 +445,8 @@ msgid ""
"4. When the download is complete, double click the `.exe` file. Complete the"
" installation wizard process."
msgstr ""
+"4. Þegar búið er að sækja skrána, skaltu tvísmella á `.exe` skrána. Farðu "
+"eftir ferlinu í leiðarvísisforritinu."
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -452,7 +458,7 @@ msgstr "Fyrir macOS:"
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
msgid "2. Download the macOS `.dmg` file"
-msgstr ""
+msgstr "2. Sæktu macOS `.dmg` skrána"
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -460,6 +466,8 @@ msgid ""
"4. When the download is complete, double click the `.dmg` file. Complete the"
" installation wizard process."
msgstr ""
+"4. Þegar búið er að sækja skrána, skaltu tvísmella á `.dmg` skrána. Farðu "
+"eftir ferlinu í leiðarvísisforritinu."
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -471,7 +479,7 @@ msgstr "Fyrir GNU/Linux:"
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
msgid "2. Download the GNU/Linux `.tar.xz` file"
-msgstr ""
+msgstr "2. Sæktu GNU/Linux `.tar.xz` skrána"
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -502,7 +510,7 @@ msgstr ""
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
msgid "Double-click the icon to start up Tor Browser for the first time."
-msgstr ""
+msgstr "Tvísmelltu á táknmyndina til að keyra Tor-vafrann í fyrsta skipti."
#: https//tb-manual.torproject.org/installation/
#: (content/installation/contents+en.lrtopic.body)
@@ -607,7 +615,7 @@ msgstr ""
#: https//tb-manual.torproject.org/running-tor-browser/
#: (content/running-tor-browser/contents+en.lrtopic.body)
msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">"
-msgstr ""
+msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">"
#: https//tb-manual.torproject.org/running-tor-browser/
#: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -756,6 +764,9 @@ msgid ""
"of using Tor. meek-azure makes it look like you are using a Microsoft web "
"site."
msgstr ""
+"meek tengileiðir líkja eftir vafri á stórum þekktum vefsvæðum þrátt fyrir að"
+" vera að nota Tor. meek-azure lætur líta út eins og þú sért að nota vefsvæði"
+" hjá Microsoft."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -797,6 +808,8 @@ msgid ""
"To use a pluggable transport, click \"Configure\" when starting Tor Browser "
"for the first time."
msgstr ""
+"Til að nota 'pluggable transport' tengileið, skaltu smella á 'Stilla' ef þú "
+"ert að nota Tor-vafrann í fyrsta skipti."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -804,12 +817,16 @@ msgid ""
"After checking the checkbox \"Tor is censored in my country,\" choose the "
"\"Select a built-in bridge\" option."
msgstr ""
+"Eftir að þú hefur merkt við 'Tor er ritskoðað í landinu mínu' skaltu velja "
+"'Velja innbyggða brú' valkostinn."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
msgid ""
"From the dropdown, select whichever pluggable transport you'd like to use."
msgstr ""
+"Úr fellivalmyndinni skaltu velja hvaða 'pluggable transport' tengileið þú "
+"vilt nota."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -817,6 +834,8 @@ msgid ""
"Once you've selected the pluggable transport, click \"Connect\" to save your"
" settings."
msgstr ""
+"Þegar þú hefur valið þá tengileið sem þú ætlar að nota, skaltu smella á 'Í "
+"lagi' til að vista stillingarnar þínar."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -841,6 +860,7 @@ msgstr ""
#: (content/bridges/contents+en.lrtopic.body)
msgid "Your settings will automatically be saved once you close the tab."
msgstr ""
+"Stillingarnar þínar verða sjálfkrafa vistaðar þegar þú lokar flipanum."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -853,6 +873,9 @@ msgid ""
"Each of the transports listed in Tor Launcher’s menu works in a different "
"way, and their effectiveness depends on your individual circumstances."
msgstr ""
+"Hver og ein tengileið sem taldar eru upp í valmynd Tor-ræsisins virkar á "
+"mismunandi hátt og eru áhrif þeirra og virkni háð því í nákvæmlega hvaða "
+"aðstæðum þú ert."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -860,6 +883,9 @@ msgid ""
"If you are trying to circumvent a blocked connection for the first time, you"
" should try the different transports: obfs4, snowflake, or meek-azure."
msgstr ""
+"Ef þú ert að reyna að komast framhjá útilokaðri tengingu í fyrsta skipti, "
+"ættirðu að prófa hinar mismunandi tengileiðir: obfs4, snowflake, og meek-"
+"azure."
#: https//tb-manual.torproject.org/circumvention/
#: (content/circumvention/contents+en.lrtopic.body)
@@ -886,6 +912,8 @@ msgid ""
"Most Pluggable Transports, such as obfs4, rely on the use of “bridge” "
"relays."
msgstr ""
+"Flestar 'pluggable transport' tengileiðir, eins og t.d. obfs4, reiða sig á "
+"notkun brúarendurvarpa (bridge relay)."
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -924,7 +952,7 @@ msgstr ""
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
msgid "### GETTING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "### AÐ FÁ VISTFÖNG FYRIR BRÝR"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -932,6 +960,8 @@ msgid ""
"Because bridge addresses are not public, you will need to request them "
"yourself. You have a few options:"
msgstr ""
+"Vegna þess að vistföng brúa eru ekki opinber, verður þú að biðja sjálfur um "
+"þau. Þú hefur nokkra kosti:"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -945,6 +975,7 @@ msgstr ""
#: (content/bridges/contents+en.lrtopic.body)
msgid "* Email bridges(a)torproject.org from a Gmail, or Riseup email address"
msgstr ""
+"* Sendu póst á bridges(a)torproject.org frá Gmail eða Riseup tölvupóstfangi"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -954,7 +985,7 @@ msgstr ""
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
msgid "### USING MOAT"
-msgstr ""
+msgstr "### AÐ NOTA SÍKI (MOAT)"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -962,6 +993,8 @@ msgid ""
"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
"src=\"../../static/images/request-a-bridge.png\">"
msgstr ""
+"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
+"src=\"../../static/images/request-a-bridge.png\">"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -969,6 +1002,8 @@ msgid ""
"If you're starting Tor Browser for the first time, click \"Configure\" to "
"open the Tor Network Settings window."
msgstr ""
+"Ef þú ert að keyra Tor-vafrann í fyrsta skipti, skaltu smella á 'Stilla' til"
+" að opna glugga með stillingum Tor-netkerfisins."
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -1003,7 +1038,7 @@ msgstr ""
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
msgid "### ENTERING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "### AÐ SETJA INN VISTFÖNG FYRIR BRÝR"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -1011,6 +1046,8 @@ msgid ""
"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
"src=\"../../static/images/tor-launcher-custom-bridges.png\">"
msgstr ""
+"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
+"src=\"../../static/images/tor-launcher-custom-bridges.png\">"
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -1032,7 +1069,7 @@ msgstr ""
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
msgid "Click \"Connect\" to save your settings."
-msgstr ""
+msgstr "Smelltu á 'Tengjast' til að vista stillingarnar þínar."
#: https//tb-manual.torproject.org/bridges/
#: (content/bridges/contents+en.lrtopic.body)
@@ -1099,7 +1136,7 @@ msgstr ""
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
msgid "### THE URL BAR"
-msgstr ""
+msgstr "### STAÐSETNINGASTIKAN"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1134,6 +1171,8 @@ msgid ""
"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
"src=\"../../static/images/circuit_full.png\">"
msgstr ""
+"<img class=\"col-md-6\" align=\"right\" hspace=\"5\" "
+"src=\"../../static/images/circuit_full.png\">"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1167,7 +1206,7 @@ msgstr ""
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
msgid "### LOGGING IN OVER TOR"
-msgstr ""
+msgstr "### AÐ SKRÁ SIG INN Í GEGNUM TOR"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1238,7 +1277,7 @@ msgstr ""
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
msgid "### CHANGING IDENTITIES AND CIRCUITS"
-msgstr ""
+msgstr "### SKIPTA UM AUÐKENNI OG RÁSIR"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1255,7 +1294,7 @@ msgstr ""
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
msgid "### NEW IDENTITY"
-msgstr ""
+msgstr "### NÝTT AUÐKENNI"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1286,7 +1325,7 @@ msgstr ""
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
msgid "### NEW TOR CIRCUIT FOR THIS SITE"
-msgstr ""
+msgstr "### NÝ TOR-RÁS FYRIR ÞETTA VEFSVÆÐI"
#: https//tb-manual.torproject.org/managing-identities/
#: (content/managing-identities/contents+en.lrtopic.body)
@@ -1381,7 +1420,7 @@ msgstr ""
#: https//tb-manual.torproject.org/onion-services/
#: (content/onion-services/contents+en.lrtopic.body)
msgid "### HOW TO ACCESS AN ONION SERVICE"
-msgstr ""
+msgstr "### HVERNIG Á AÐ TENGJAST ONION-ÞJÓNUSTU"
#: https//tb-manual.torproject.org/onion-services/
#: (content/onion-services/contents+en.lrtopic.body)
@@ -1413,7 +1452,7 @@ msgstr ""
#: https//tb-manual.torproject.org/onion-services/
#: (content/onion-services/contents+en.lrtopic.body)
msgid "### TROUBLESHOOTING"
-msgstr ""
+msgstr "### LAUSN Á VANDAMÁLUM"
#: https//tb-manual.torproject.org/onion-services/
#: (content/onion-services/contents+en.lrtopic.body)
@@ -1521,7 +1560,7 @@ msgstr ""
#: https//tb-manual.torproject.org/security-settings/
#: (content/security-settings/contents+en.lrtopic.body)
msgid "### ACCESSING THE SECURITY SETTINGS"
-msgstr ""
+msgstr "### AÐ FINNA ÖRYGGISSTILLINGARNAR"
#: https//tb-manual.torproject.org/security-settings/
#: (content/security-settings/contents+en.lrtopic.body)
@@ -1553,7 +1592,7 @@ msgstr ""
#: https//tb-manual.torproject.org/security-settings/
#: (content/security-settings/contents+en.lrtopic.body)
msgid "### SECURITY LEVELS"
-msgstr ""
+msgstr "### ÖRYGGISSTIG"
#: https//tb-manual.torproject.org/security-settings/
#: (content/security-settings/contents+en.lrtopic.body)
@@ -1688,7 +1727,7 @@ msgstr ""
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
msgid "### UPDATING TOR BROWSER AUTOMATICALLY"
-msgstr ""
+msgstr "### SJÁLFVIRK UPPFÆRSLA Á TOR-VAFRANUM"
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
@@ -1705,7 +1744,7 @@ msgstr ""
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
msgid "<img width=\"500\" src=\"../../static/images/update4.png\" />"
-msgstr ""
+msgstr "<img width=\"500\" src=\"../../static/images/update4.png\" />"
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
@@ -1717,7 +1756,7 @@ msgstr ""
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
msgid "### UPDATING TOR BROWSER MANUALLY"
-msgstr ""
+msgstr "### HANDVIRK UPPFÆRSLA Á TOR-VAFRANUM"
#: https//tb-manual.torproject.org/updating/
#: (content/updating/contents+en.lrtopic.body)
@@ -1772,7 +1811,7 @@ msgstr ""
#: https//tb-manual.torproject.org/troubleshooting/
#: (content/troubleshooting/contents+en.lrtopic.body)
msgid "### QUICK FIXES"
-msgstr ""
+msgstr "### SKYNDILAUSNIR"
#: https//tb-manual.torproject.org/troubleshooting/
#: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1832,7 +1871,7 @@ msgstr ""
#: https//tb-manual.torproject.org/troubleshooting/
#: (content/troubleshooting/contents+en.lrtopic.body)
msgid "### IS YOUR CONNECTION CENSORED?"
-msgstr ""
+msgstr "### ER TENGINGIN ÞÍN RITSKOÐUÐ?"
#: https//tb-manual.torproject.org/troubleshooting/
#: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1850,7 +1889,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### KNOWN ISSUES"
-msgstr ""
+msgstr "### ÞEKKT VANDAMÁL"
#: https//tb-manual.torproject.org/troubleshooting/
#: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1876,7 +1915,7 @@ msgstr "Hvernig Tor-vafrinn meðhöndlar viðbætur, hjálparforrit og JavaScrip
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
msgid "### FLASH PLAYER"
-msgstr ""
+msgstr "### FLASH MARGMIÐLUNARSPILARI"
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
@@ -1911,7 +1950,7 @@ msgstr ""
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
msgid "### JAVASCRIPT"
-msgstr ""
+msgstr "### JAVASCRIPT"
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
@@ -1951,7 +1990,7 @@ msgstr ""
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
msgid "### BROWSER ADD-ONS"
-msgstr ""
+msgstr "### VIÐBÆTUR FYRIR VAFRANN"
#: https//tb-manual.torproject.org/plugins/
#: (content/plugins/contents+en.lrtopic.body)
@@ -2229,12 +2268,12 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.description)
msgid "Learn about Tor for mobile devices"
-msgstr ""
+msgstr "Kynntu þér Tor á snjalltækjum"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### Tor Browser for Android"
-msgstr ""
+msgstr "### Tor-vafrinn fyrir Android"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2242,6 +2281,8 @@ msgid ""
"Tor Browser for Android is the only official mobile browser supported and "
"developed by the Tor Project."
msgstr ""
+"Tor-vafrinn fyrir Android er eini opinberi snjalltækjavafrinn sem hannaður "
+"er og studdur af Tor-verkefninu."
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2260,7 +2301,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### DOWNLOADING AND INSTALLATION"
-msgstr ""
+msgstr "### NIÐURHAL OG UPPSETNING"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2291,7 +2332,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Google Play"
-msgstr ""
+msgstr "#### Google Play"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2303,7 +2344,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### F-Droid"
-msgstr ""
+msgstr "#### F-Droid"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2383,7 +2424,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### The Tor Project website"
-msgstr ""
+msgstr "#### Vefsvæði Tor-verkefnisins"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2396,7 +2437,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### RUNNING TOR BROWSER FOR ANDROID FOR THE FIRST TIME"
-msgstr ""
+msgstr "### AÐ KEYRA TOR-VAFRANN Á ANDROID Í FYRSTA SKIPTI"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2409,7 +2450,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Connect"
-msgstr ""
+msgstr "#### Tengjast"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2417,6 +2458,8 @@ msgid ""
"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
"/android-connect.png\" alt=\"Connect to Tor Browser for Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-connect.png\" alt=\"Connect to Tor Browser for Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2436,7 +2479,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Configure"
-msgstr ""
+msgstr "#### Stilla"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2444,6 +2487,8 @@ msgid ""
"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
"/android-configure.png\" alt=\"Configure Tor Browser for Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-configure.png\" alt=\"Configure Tor Browser for Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2477,7 +2522,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### CIRCUMVENTION"
-msgstr ""
+msgstr "### HJÁLEIÐIR"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2521,6 +2566,9 @@ msgid ""
"/android-censored.png\" alt=\"Censored internet on Tor Browser for "
"Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-censored.png\" alt=\"Censored internet on Tor Browser for "
+"Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2543,6 +2591,9 @@ msgid ""
"/android-select-a-bridge.png\" alt=\"Select a bridge on Tor Browser for "
"Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-select-a-bridge.png\" alt=\"Select a bridge on Tor Browser for "
+"Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2551,6 +2602,9 @@ msgid ""
"/android-selected-a-bridge.png\" alt=\"Selected a bridge on Tor Browser for "
"Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-selected-a-bridge.png\" alt=\"Selected a bridge on Tor Browser for "
+"Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2566,6 +2620,9 @@ msgid ""
"/android-provide-a-bridge.png\" alt=\"Provide a bridge on Tor Browser for "
"Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-provide-a-bridge.png\" alt=\"Provide a bridge on Tor Browser for "
+"Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2574,16 +2631,19 @@ msgid ""
"/android-provided-a-bridge.png\" alt=\"Provide brigde addresses on Tor "
"Browser for Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-provided-a-bridge.png\" alt=\"Provide brigde addresses on Tor "
+"Browser for Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### MANAGING IDENTITIES"
-msgstr ""
+msgstr "### SÝSL MEÐ PERSÓNUAUÐKENNI"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### New Identity"
-msgstr ""
+msgstr "#### Nýtt auðkenni"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2591,6 +2651,8 @@ msgid ""
"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
"/android-new-identity.png\" alt=\"New Identity on Tor Browser for Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-new-identity.png\" alt=\"New Identity on Tor Browser for Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2620,7 +2682,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### SECURITY SETTINGS"
-msgstr ""
+msgstr "### ÖRYGGISSTILLINGAR"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2629,6 +2691,9 @@ msgid ""
"/android-security-settings.gif\" alt=\"Security settings and security slider"
" on Tor Browser for Android\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-security-settings.gif\" alt=\"Security settings and security slider"
+" on Tor Browser for Android\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2668,7 +2733,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### UPDATING"
-msgstr ""
+msgstr "### UPPFÆRSLA"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2678,7 +2743,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Updating Tor Browser for Android automatically"
-msgstr ""
+msgstr "#### Sjálfvirk uppfærsla á Tor-vafranum fyrir Android"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2690,7 +2755,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "##### Google Play"
-msgstr ""
+msgstr "##### Google Play"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2699,6 +2764,9 @@ msgid ""
"/android-update-google-play.png\" alt=\"Updating Tor Browser for Android on "
"Google Play\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-update-google-play.png\" alt=\"Updating Tor Browser for Android on "
+"Google Play\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2717,7 +2785,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "##### F-Droid"
-msgstr ""
+msgstr "##### F-Droid"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2726,6 +2794,9 @@ msgid ""
"/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on "
"F-droid\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-update-f-droid.png\" alt=\"Updating Tor Browser for Android on "
+"F-droid\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2742,7 +2813,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Updating Tor Browser for Android manually"
-msgstr ""
+msgstr "#### Handvirk uppfærsla á Tor-vafranum fyrir Android"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2785,7 +2856,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### UNINSTALLING"
-msgstr ""
+msgstr "### TAKA ÚT UPPSETNINGU"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2801,6 +2872,9 @@ msgid ""
"/android-uninstall-google-play.png\" alt=\"Uninstalling Tor Browser for "
"Android on Google Play\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-uninstall-google-play.png\" alt=\"Uninstalling Tor Browser for "
+"Android on Google Play\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2823,6 +2897,9 @@ msgid ""
"/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android "
"on F-droid\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-uninstall-f-droid.png\" alt=\"Uninstalling Tor Browser for Android "
+"on F-droid\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2834,7 +2911,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Mobile device app settings"
-msgstr ""
+msgstr "#### Stillingar forrits á snjalltækjum"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2843,6 +2920,9 @@ msgid ""
"/android-uninstall-device-settings.png\" alt=\"Uninstalling Tor Browser for "
"Android using device app settings\">"
msgstr ""
+"<img style=\"max-width:300px\" class=\"col-md-6\" src=\"../../static/images"
+"/android-uninstall-device-settings.png\" alt=\"Uninstalling Tor Browser for "
+"Android using device app settings\">"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2903,12 +2983,12 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### More about Tor on mobile devices"
-msgstr ""
+msgstr "### Meira um Tor á snjalltækjum"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Orfox"
-msgstr ""
+msgstr "#### Orfox"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2946,7 +3026,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "#### Orbot"
-msgstr ""
+msgstr "#### Orbot"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -2984,7 +3064,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### Tor Browser for iOS"
-msgstr ""
+msgstr "### Tor-vafrinn fyrir iOS"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
@@ -3030,7 +3110,7 @@ msgstr ""
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
msgid "### Tor Browser for Windows Phone"
-msgstr ""
+msgstr "### Tor-vafrinn fyrir Windows Phone"
#: https//tb-manual.torproject.org/mobile-tor/
#: (content/mobile-tor/contents+en.lrtopic.body)
1
0

[tor-browser-build/master] Bug 40094: Bring back torbrowser-android-* targets for Rust
by sysrqb@torproject.org 16 Sep '20
by sysrqb@torproject.org 16 Sep '20
16 Sep '20
commit e8ff6b182dcd9d721ec97473051bda48d36d822e
Author: Georg Koppen <gk(a)torproject.org>
Date: Wed Sep 16 16:54:21 2020 +0000
Bug 40094: Bring back torbrowser-android-* targets for Rust
Apparently we can't just replace the torbrowser-android-* targets with
android-* ones when including the Rust compilers for application-services.
Thus, we revert that part of the patch for #40070. See: #40094 for more
details.
---
projects/application-services/config | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/projects/application-services/config b/projects/application-services/config
index 0560872..336de62 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -23,22 +23,23 @@ input_files:
- project: container-image
- project: '[% c("var/compiler") %]'
name: '[% c("var/compiler") %]'
+ # We need the torbrowser-* targets for Rust, see: #40094.
- project: fenix-rust
name: rust-armv7
target_prepend:
- - android-armv7
+ - torbrowser-android-armv7
- project: fenix-rust
name: rust-aarch64
target_prepend:
- - android-aarch64
+ - torbrowser-android-aarch64
- project: fenix-rust
name: rust-x86
target_prepend:
- - android-x86
+ - torbrowser-android-x86
- project: fenix-rust
name: rust-x86_64
target_prepend:
- - android-x86_64
+ - torbrowser-android-x86_64
- project: nss
name: nss-armv7
target_prepend:
1
0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40094'
by sysrqb@torproject.org 16 Sep '20
by sysrqb@torproject.org 16 Sep '20
16 Sep '20
commit 6cbd373aad047d53032170be4a3da19a8c49ab8f
Merge: 47e2748 e8ff6b1
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Sep 16 17:15:21 2020 +0000
Merge remote-tracking branch 'gkgl/bug_40094'
projects/application-services/config | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
1
0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation@torproject.org 16 Sep '20
by translation@torproject.org 16 Sep '20
16 Sep '20
commit 55f092366564eeb828fafa7d349b41b7b97fdd5f
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Sep 16 16:15:52 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co…
---
code_of_conduct+is.po | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 674 insertions(+)
diff --git a/code_of_conduct+is.po b/code_of_conduct+is.po
new file mode 100644
index 0000000000..07988c924b
--- /dev/null
+++ b/code_of_conduct+is.po
@@ -0,0 +1,674 @@
+# Code of conduct of the tor project
+# Copyright (C) 2019 tor project.
+# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0
+# International license.e.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# Sveinn í Felli <sv1(a)fellsnet.is>, 2020
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Code of conduct of the Tor Project\n"
+"POT-Creation-Date: 2019-08-02 12:00+0000\n"
+"PO-Revision-Date: 2019-08-27 18:54+0000\n"
+"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>, 2020\n"
+"Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24
+#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75
+#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180
+#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213
+#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243
+#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278
+#, no-wrap
+msgid "============================================================\n"
+msgstr "============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:3
+#, no-wrap
+msgid ""
+"Tor Project Code of Conduct\n"
+"============================================================\n"
+msgstr ""
+"Siðareglur Tor-verkefnisins\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:6
+msgid "Statement of Intent:"
+msgstr "Yfirlýsing um tilgang:"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:10
+msgid ""
+"The Tor Project is committed to fostering an inclusive environment and "
+"community. Tor is a place where people should feel safe to engage, share "
+"their point of view, and participate."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:15
+msgid ""
+"This code of conduct applies to The Tor Project as a whole. It is intended "
+"to provide guidelines for contributors. Employees and contractors of The Tor"
+" Project, Inc. (TPI) are also subject to company policies and procedures. "
+"Those people should feel free to contact HR with questions or concerns."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:23
+msgid ""
+"This code of conduct is not exhaustive or complete. It is an ongoing effort "
+"to summarize our shared understanding. We want to provide a welcoming, safe "
+"environment, so we can work together to pursue powerful solutions. We "
+"reserve the right to deviate from strictly enforcing this code. Any "
+"deviations must produce an outcome which is fairer, and aligned with our "
+"values. We understand that keeping a living document relevant and “patched” "
+"involves sustained effort."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:26
+#, no-wrap
+msgid ""
+"0. Summary: Don't be a jerk. Be awesome instead.\n"
+"============================================================\n"
+msgstr ""
+"0. Samantekt: Ekki vera fífl. Vertu frekar frábær.\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:29
+msgid "The Tor community should be a good place where people are glad to be."
+msgstr ""
+"Tor-samfélagið ætti að vera góður staður þar sem allir ættu að vera glaðir "
+"yfir að tilheyra."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:31
+#, no-wrap
+msgid " DO: Be kind, thoughtful, and considerate.\n"
+msgstr " VERTU: Góður, hugulsamur og tillitssamur.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:33
+#, no-wrap
+msgid " DO: Make Tor a place where people are happy and comfortable.\n"
+msgstr ""
+" GERÐU: Láttu Tor vera stað þar sem fólk er hamingjusamt og líður vel.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:36
+#, no-wrap
+msgid ""
+" DO: Remember: We are all contributing; we are all learning. Nobody was born\n"
+" an expert.\n"
+msgstr ""
+" MUNDU: Við erum öll að leggja eitthvað af mörkum; við erum öll að læra.\n"
+"Enginn fæddist sérfræðingur.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:38
+#, no-wrap
+msgid " DO: Yield the floor. Listen. Make sure everyone gets heard.\n"
+msgstr ""
+" GERÐU: Láttu eftir pláss. Hlustaðu. Vertu viss um að það heyrist í "
+"öllum.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:40
+#, no-wrap
+msgid " DON'T: Insult, harass, intimidate, or be a jerk.\n"
+msgstr " EKKI: Móðga, leggja í einelti, þrúga eða vera fífl.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:43
+#, no-wrap
+msgid ""
+" DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for\n"
+" learning.\n"
+msgstr ""
+" EKKI: Nota heiðarleg mistök til að herja á fólk\n"
+" Mistök eru til að læra af þeim.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:46
+#, no-wrap
+msgid ""
+" DON'T: Hunt for ways to uphold the letter of this code while violating its\n"
+" spirit.\n"
+msgstr ""
+" EKKI: Leitast við að túlka þessar reglur svo bókstaflega að\n"
+" þú sért að brjóta gegn anda þeirra.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:50
+#, no-wrap
+msgid ""
+" AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with\n"
+" questions or concerns. Public key:\n"
+" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n"
+msgstr ""
+" OG GERÐU: Sendu tölvupóst á: tor-community-council(a)lists.torproject.org með allar\n"
+" spurningar eða áhyggjur. Dreifilykill:\n"
+" https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:53
+#, no-wrap
+msgid ""
+"1. Purpose\n"
+"============================================================\n"
+msgstr ""
+"1. Tilgangur\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:63
+msgid ""
+"A primary goal of the Tor community is to be inclusive of many different "
+"contributors. We want to include contributors from the most varied and "
+"diverse backgrounds possible. As such, we are committed to providing a "
+"friendly, safe and welcoming environment for all, regardless of their "
+"experience, gender identity or expression, sexual orientation, family, "
+"relationships, ability (whether bodily or mental), personal appearance, "
+"socioeconomic status, body size, race, ethnicity, age, religion, "
+"nationality, or membership in a disadvantaged and/or underrepresented group."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:68
+msgid ""
+"A safe environment means one free from abuse, whether isolated or systemic. "
+"We explicitly acknowledge that tolerating abuse is a security problem. "
+"Allowing abusers and malicious people to disrupt our community puts our "
+"software, developers, and users at risk."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:71
+msgid ""
+"This code of conduct outlines our expectations for all those who participate"
+" in our community, as well as the consequences for unacceptable behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:74
+msgid ""
+"We invite all those who participate in The Tor Project to help us create "
+"safe and positive experiences for everyone."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:77
+#, no-wrap
+msgid ""
+"2. Be your best self\n"
+"============================================================\n"
+msgstr ""
+"2. Vertu það besta af þér sjálfu\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:80
+msgid ""
+"The following behaviors are expected and requested of all community members:"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:83
+msgid ""
+"Participate in an honest and active way. In doing so, you contribute to the "
+"health and longevity of this community."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:85
+msgid "Exercise consideration and respect in your speech and actions."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:87
+msgid "Attempt collaboration and dialog before engaging in conflict."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:89
+msgid ""
+"Refrain from demeaning, discriminatory, or harassing behavior and speech."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:92
+msgid ""
+"Be mindful of your surroundings and of your fellow participants. Alert "
+"community leaders if you notice:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:94
+msgid "a dangerous situation"
+msgstr "varasamar aðstæður"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:96
+msgid "someone in distress"
+msgstr "einhver sem á í vandræðum"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:98
+msgid "violations of this code of conduct, even if they seem minor"
+msgstr "brot á siðareglunum, jafnvel minniháttar"
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:101
+msgid ""
+"Remember that community event venues may be shared with members of the "
+"public. Please be respectful to everyone using these locations."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:103
+msgid "Respect the privacy of your fellow community members."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:106
+#, no-wrap
+msgid ""
+"3. Unacceptable behaviors\n"
+"============================================================\n"
+msgstr ""
+"3. Óásættanleg hegðun\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:109
+msgid "The following behaviors are unacceptable within our community:"
+msgstr "Eftirfarandi hegðun er óásættanleg innan samfélagsins okkar:"
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:114
+msgid ""
+"Violence, sexual assault, threats of violence, or violent language directed "
+"against another person, especially violence against a person or group based "
+"on a protected characteristic. (Display of weapons may constitute "
+"intimidation or a threat of violence.)"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:117
+msgid ""
+"Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory"
+" jokes and language."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:122
+msgid ""
+"Spontaneously posting or displaying sexually explicit or violent material. "
+"(If it is necessary to share such material when working on Tor's mission, do"
+" so with sensitivity. Be aware that many people don't want to see it.)"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:125
+msgid ""
+"Posting or threatening to post other people’s personally identifying "
+"information (\"doxing\") without their consent."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:127
+msgid "Personal insults or attacks, particularly those related to:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:129
+msgid "experience"
+msgstr "reynslu"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:131
+msgid "gender identity or expression"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:133
+msgid "sexual orientation"
+msgstr "kynhneigð"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:135
+msgid "family"
+msgstr "fjölskyldu"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:137
+msgid "relationships"
+msgstr "sambond"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:139
+msgid "ability (whether bodily or mental)"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:141
+msgid "personal appearance"
+msgstr "útlit"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:143
+msgid "socioeconomic status"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:145
+msgid "body size"
+msgstr "líkamsstærð"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:147
+msgid "race"
+msgstr "kynþátt"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:149
+msgid "ethnicity"
+msgstr "menningarlegan uppruna"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:151
+msgid "age"
+msgstr "aldur"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:153
+msgid "religion"
+msgstr "trúarbrögð"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:155
+msgid "nationality"
+msgstr "þjóðerni"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:157
+msgid "membership in a disadvantaged and/or underrepresented group"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:161
+msgid ""
+"Inappropriate photography, audio recording, or recording of personal "
+"information. You should have someone's consent before recording these "
+"things, and before posting them publicly."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:164
+msgid ""
+"Inappropriate physical contact. You should have someone’s consent before "
+"touching them."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:167
+msgid ""
+"Unwelcome sexual attention: this includes sexualized comments or jokes, "
+"inappropriate touching, groping, and unwelcome sexual advances."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:169
+msgid "Deliberate intimidation, stalking or following (online or in person)."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:172
+msgid ""
+"Deliberately undermining the spirit of this code while following the letter."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:175
+msgid ""
+"Sustained disruption of any community events, including talks, "
+"presentations, and online conversations."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:177
+msgid "Deliberately pushing against someone's stated boundaries."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ../code_of_conduct.txt:179
+msgid "Advocating for, or encouraging, any of the above behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:182
+#, no-wrap
+msgid ""
+"4. Unacceptable behavior has consequences\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:188
+msgid ""
+"We will not tolerate unacceptable behavior from any community member. We "
+"will not make exceptions for sponsors and those with decision-making "
+"authority. People in formal or informal leadership roles must model the "
+"highest standards of behavior."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:192
+msgid ""
+"Anyone asked by another community member to stop unacceptable behavior is "
+"expected to comply immediately. Please don't step in on someone else's "
+"behalf without their consent."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:195
+#, no-wrap
+msgid ""
+"5. Where to go for help\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:201
+msgid ""
+"The Community Council is an elected body of Tor Core Contributors who can "
+"assist with intra-community conflict resolution. Community Council policies "
+"and information can be found on the Community Council wiki [1]. You can "
+"contact the whole Community council:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:203
+msgid "if you have questions or concerns about the code of conduct, or"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:205
+msgid "if you feel that you have witnessed a code of conduct violation"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:212
+msgid ""
+"However, if you feel that there is a conflict of interest with any council "
+"member, you may contact members individually. Council members' GPG keys are "
+"listed on the Community Council wiki. If there is a conflict of interest, "
+"the affected council member will recuse themselves. They will not be "
+"involved in any discussion or documentation of the incident. More about the "
+"Community Council can be found in the guidelines [2]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:215
+#, no-wrap
+msgid ""
+"6. What to do if you witness unacceptable behavior\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:230
+msgid ""
+"If you are subject to or witness unacceptable behavior, or have any other "
+"concerns, please notify the Community Council as soon as possible. You can "
+"contact the community council in person, or at tor-community-"
+"council(a)lists.torproject.org. Current councilmembers are listed on the wiki "
+"[1]. The Community Council's incident response will vary on a case-by-case "
+"basis. The council will make every effort to respond to the incident "
+"immediately. The council will prioritize the safety of the person who has "
+"been harmed, or is at risk of harm. Person(s) who have been harmed or are at"
+" risk of harm can withdraw the incident report at any time. We will never do"
+" anything without the consent of the person who has been harmed or is at "
+"risk of harm, except in situations where there is a threat of imminent "
+"danger or harm to anyone. More information about the Community Council's "
+"incident reporting and response policies can be found on their wiki [1]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:233
+#, no-wrap
+msgid ""
+"7. What the person reporting a violation can expect\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:242
+msgid ""
+"The Community Council prioritizes the safety and well-being of any person "
+"who feels that they have been harmed or may be in danger of being harmed. "
+"Anyone reporting an issue to the Community Council can expect that their "
+"report will be taken seriously. Initial reports can be taken in written or "
+"verbal form. If the incident does not require an immediate resolution, then "
+"a written report can be shared with the Community Council in an encrypted "
+"format. The next steps in an incident response will vary on a case-by-case "
+"basis."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:245
+#, no-wrap
+msgid ""
+"8. How the Community Council responds to incidents\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:252
+msgid ""
+"If a community member engages in unacceptable behavior, the Community "
+"Council may take any action they deem appropriate, including but not limited"
+" to a warning, informal mediation, temporary ban or permanent expulsion from"
+" the community. Any actions and decisions by the Community Council may be "
+"appealed by following the appeals process in the Community Council "
+"Guidelines [1]."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:255
+#, no-wrap
+msgid ""
+"9. Scope of this document\n"
+"============================================================\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:258
+msgid "This code of conduct covers all community participants:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:260
+msgid "paid and unpaid contributors"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:262
+msgid "sponsors"
+msgstr "styrktaraðilar"
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:264
+msgid "other guests"
+msgstr "aðrir gestir"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:266
+msgid "when interacting:"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:268
+msgid "in all online and in-person community venues"
+msgstr ""
+
+#. type: Bullet: ' - '
+#: ../code_of_conduct.txt:270
+msgid "in one-on-one communications that relate to community work"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:277
+msgid ""
+"This code of conduct and its related procedures also applies to unacceptable"
+" behavior occurring outside the scope of community activities when such "
+"behavior has the potential to adversely affect the safety and well-being of "
+"community members. As members of the Tor community, we support and follow "
+"this Code while we are working on Tor, and take care not to undermine it in "
+"the rest of our time."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:280
+#, no-wrap
+msgid ""
+"10. License and attribution\n"
+"============================================================\n"
+msgstr ""
+"10. Notkunarleyfi og tilvísanir\n"
+"============================================================\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:284
+msgid ""
+"This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 "
+"International license."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:287
+msgid ""
+"This code of conduct uses some language and framing from the Citizen Code of"
+" Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:289
+msgid ""
+"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] "
+"https://gitweb.torproject.org/community/policies.git/tree/community_council…"
+msgstr ""
+"[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil [2] "
+"https://gitweb.torproject.org/community/policies.git/tree/community_council…"
1
0

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation@torproject.org 16 Sep '20
by translation@torproject.org 16 Sep '20
16 Sep '20
commit 036bf7112dab03a19ecd85f6fb92e035c750cd9b
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Sep 16 16:15:08 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
is/LC_MESSAGES/bridgedb.po | 247 +++++++++++++++++++++++----------------------
1 file changed, 124 insertions(+), 123 deletions(-)
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 613cfe4ea9..2c42bda669 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-10 18:43+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-09-16 15:58+0000\n"
"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.7.0\n"
+"Generated-By: Babel 2.8.0\n"
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
@@ -38,18 +38,16 @@ msgstr ""
#. variable.
#. We use our metrics singleton to keep track of BridgeDB metrics such as
#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,15 +55,15 @@ msgstr ""
msgid "Language"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:95
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr ""
-#: bridgedb/distributors/https/templates/base.html:98
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr ""
@@ -81,31 +79,26 @@ msgstr ""
msgid "QRCode for your bridge lines"
msgstr ""
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a problem!" in your language. For example,
-#. for Italian, you might translate this into "Mama mia!",
-#. or for French: "Sacrebleu!". :)
-#: bridgedb/distributors/https/templates/bridges.html:67
-#: bridgedb/distributors/https/templates/bridges.html:125
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: bridgedb/distributors/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr ""
-#: bridgedb/distributors/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr ""
-#: bridgedb/distributors/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr ""
-#: bridgedb/distributors/https/templates/bridges.html:133
-#: bridgedb/distributors/https/templates/bridges.html:137
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -181,64 +174,32 @@ msgstr ""
msgid "%sG%set Bridges"
msgstr ""
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr ""
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr ""
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr ""
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr ""
-
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
-msgid "Public Keys"
-msgstr ""
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor".
#. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -249,7 +210,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -261,7 +222,7 @@ msgstr ""
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -270,21 +231,21 @@ msgid ""
"\n"
msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr ""
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
-#: bridgedb/strings.py:109
+#: bridgedb/strings.py:86
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Leave the email subject\n"
@@ -293,106 +254,146 @@ msgid ""
"providers: %s or %s."
msgstr ""
-#: bridgedb/strings.py:117
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
#. "Support Portal", respectively.
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:98
#, python-format
msgid ""
"If your Tor Browser cannot connect, please take a look at the %s and our %s."
msgstr ""
-#: bridgedb/strings.py:125
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:130
-msgid "Please select options for bridge type:"
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
msgstr ""
-#: bridgedb/strings.py:131
-msgid "Do you need IPv6 addresses?"
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
msgstr ""
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:115
#, python-format
-msgid "Do you need a %s?"
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
msgstr ""
-#: bridgedb/strings.py:136
-msgid "Your browser is not displaying images properly."
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
msgstr ""
-#: bridgedb/strings.py:137
-msgid "Enter the characters from the image above..."
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges(a)torproject.org%s and writing \"get transport obfs4\" in the\n"
+"email body."
msgstr ""
-#: bridgedb/strings.py:141
-msgid "How to start using your bridges"
+#: bridgedb/strings.py:129
+msgid "Reserved"
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:143
+#: bridgedb/strings.py:130
#, python-format
msgid ""
-"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
-"page %s and then follow the instructions there for downloading and starting\n"
-"Tor Browser."
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
-msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
+#: bridgedb/strings.py:137
+msgid "None"
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:138
msgid ""
-"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
-"to the Tor network?"
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:156
-msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:164
-msgid "Displays this message."
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
msgstr ""
-#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
-#. same non-Pluggable Transport bridges described above as being
-#. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:168
-msgid "Request vanilla bridges."
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:169
-msgid "Request IPv6 bridges."
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
msgstr ""
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:171
-msgid "Request a Pluggable Transport by TYPE."
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
msgstr ""
-#. TRANSLATORS: Please DO NOT translate "BridgeDB".
-#. TRANSLATORS: Please DO NOT translate "GnuPG".
#: bridgedb/strings.py:174
-msgid "Get a copy of BridgeDB's public GnuPG key."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
msgstr ""
1
0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation@torproject.org 16 Sep '20
by translation@torproject.org 16 Sep '20
16 Sep '20
commit c141c01bdd8d297ac98a2713cfae8961d0ad9c65
Author: Translation commit bot <translation(a)torproject.org>
Date: Wed Sep 16 16:15:05 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
is/LC_MESSAGES/bridgedb.po | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index ddcdd6be03..2e5689a52e 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
"POT-Creation-Date: 2020-05-14 14:21-0700\n"
-"PO-Revision-Date: 2020-09-16 15:11+0000\n"
+"PO-Revision-Date: 2020-09-16 15:58+0000\n"
"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr "Nei"
#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
-msgstr "ekkert"
+msgstr "engin"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -288,7 +288,7 @@ msgid ""
"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
"mechanisms is."
-msgstr "BridgeDB er með fjórar aðferðir til að dreifa brúm: \"HTTPS\", \"Síki (Moat)\",\n\"Tölvupóstur (Email)\" og \"Frátekið (Reserved)\". Brýr sem ekki er dreift með BridgeDB nota\ngervi-aðferðina \"Ekkert (None)\". Eftirfarandi listi skýrir í stuttu máli hvernig þessar\naðferðir virka auk þess sem %sBridgeDB mælingar%s okkar sýna hve vinsæl\nhver aðferð er."
+msgstr "BridgeDB er með fjórar aðferðir til að dreifa brúm: \"HTTPS\", \"Síki (Moat)\",\n\"Tölvupóstur (Email)\" og \"Frátekið (Reserved)\". Brýr sem ekki er dreift með BridgeDB nota\ngervi-aðferðina \"Engin (None)\". Eftirfarandi listi skýrir í stuttu máli hvernig þessar\naðferðir virka auk þess sem %sBridgeDB mælingar%s okkar sýna hve vinsæl\nhver aðferð er."
#: bridgedb/strings.py:115
#, python-format
@@ -329,7 +329,7 @@ msgid ""
"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
"called \"Unallocated\" in %sbridge pool assignment%s files."
-msgstr ""
+msgstr "BridgeDB geymir nokkrar brýr sem ekki er dreift sjálfvirkt. Þessar brýr eru\nfráteknar fyrir handvirka dreifingu og við úthlutum þeim reglulega til ýmissa\nhjálparsamtaka og félaga eða einstaklinga sem gætu þurft á slíkum brúm að\nhalda. Brýr sem dreift er með \"Frátekið\" aðferðinni eru stundum ekki notaðar\ná löngum tímabilum. Athugaðu að \"Frátekið (Reserved)\" dreifingaraðferðin\nkallast \"Óúthlutað (Unallocated)\" í %sbridge pool assignment%s skránum."
#: bridgedb/strings.py:137
msgid "None"
@@ -342,7 +342,7 @@ msgid ""
"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
"it will then change to the bridge's actual distribution mechanism.\n"
-msgstr ""
+msgstr "Brúm þar sem dreifingaraðferðin er \"Engin (None)\" er ekki dreift með BridgeDB.\nÞað er á ábyrgð rekstraraðila brúarinnar að dreifa brúnum þeirra til notendanna.\nAthugaðu að í leit að endurvörpum (relay search), mun nýuppsett dreifingaraðferð\nskila \"Engin\" í allt að einn sólarhring. Sýndu dálitla þolinmæði, að lokum mun þetta\nbreytast yfir í raunverulega dreifingaraðferð brúarinnar.\n"
#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
@@ -384,7 +384,7 @@ msgid ""
"Add these bridges to your Tor Browser by opening your browser\n"
"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
"bridge\" field."
-msgstr ""
+msgstr "Bættu þessum brúm við Tor-vafrann með því að opna kjörstillingar\nvafrans, smella á \"Tor\" og bæta þeim svo inn í reitinn \"Útvegaðu brú\"."
#: bridgedb/strings.py:173
msgid "(Request unobfuscated Tor bridges.)"
1
0

[tpo/master] Close https://gitlab.torproject.org/tpo/web/tpo/-/issues/94
by gus@torproject.org 16 Sep '20
by gus@torproject.org 16 Sep '20
16 Sep '20
commit 203afd66c897f7079a5c84571690192c367d14c0
Author: antonela <antonela(a)torproject.org>
Date: Wed Sep 16 12:02:42 2020 -0300
Close https://gitlab.torproject.org/tpo/web/tpo/-/issues/94
---
content/about/people/biella/contents.lr | 2 --
content/about/people/julius/contents.lr | 4 ++--
content/about/people/komlo-core/contents.lr | 19 +++++++++++++++++++
content/about/people/komlo/contents.lr | 12 ++++--------
content/about/people/matt/contents.lr | 2 --
content/about/people/megan/contents.lr | 18 ------------------
.../about/people/rabbi-rob-thomas-core/contents.lr | 17 +++++++++++++++++
content/about/people/rabbi-rob-thomas/contents.lr | 10 ++++------
content/about/people/ssteele/contents.lr | 17 -----------------
9 files changed, 46 insertions(+), 55 deletions(-)
diff --git a/content/about/people/biella/contents.lr b/content/about/people/biella/contents.lr
index 42297bf2..09575fb7 100644
--- a/content/about/people/biella/contents.lr
+++ b/content/about/people/biella/contents.lr
@@ -8,8 +8,6 @@ name: Gabriella Coleman
---
title: Board Clerk
---
-twitter_handle: BiellaColeman
----
nickname: biella
---
description:
diff --git a/content/about/people/julius/contents.lr b/content/about/people/julius/contents.lr
index 7d393cc1..6bdf72f1 100644
--- a/content/about/people/julius/contents.lr
+++ b/content/about/people/julius/contents.lr
@@ -2,11 +2,11 @@ _model: person
---
_hidden: yes
---
-role:board
+role: board
---
name: Julius Mittenzwei
---
-twitter_handle: mittenzwei
+title: Director
---
nickname: julius
---
diff --git a/content/about/people/komlo-core/contents.lr b/content/about/people/komlo-core/contents.lr
new file mode 100644
index 00000000..336f7f90
--- /dev/null
+++ b/content/about/people/komlo-core/contents.lr
@@ -0,0 +1,19 @@
+_model: person
+---
+_hidden: yes
+---
+role:core
+---
+name: Chelsea Komlo
+---
+nickname: komlo
+---
+twitter_handle: chelseakomlo
+---
+gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8B58FBCA50A4900BA3C5FE84…
+---
+image: /static/images/people/komlo.png
+---
+description:
+
+Chelsea is a software/security engineer and contributes to core tor.
diff --git a/content/about/people/komlo/contents.lr b/content/about/people/komlo/contents.lr
index 336f7f90..cf755e24 100644
--- a/content/about/people/komlo/contents.lr
+++ b/content/about/people/komlo/contents.lr
@@ -2,18 +2,14 @@ _model: person
---
_hidden: yes
---
-role:core
+role: board
---
name: Chelsea Komlo
---
-nickname: komlo
----
-twitter_handle: chelseakomlo
+title: Director
---
-gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8B58FBCA50A4900BA3C5FE84…
----
-image: /static/images/people/komlo.png
+nickname: komlo
---
description:
-Chelsea is a software/security engineer and contributes to core tor.
+Chelsea Komlo is a cryptography and privacy researcher and engineer, and has been a technical contributor to Tor since 2016. Chelsea has nearly a decade of engineering experience and is a lead author on several cryptographic designs ranging from multi-party signature schemes to post-quantum primitives with applications to secure messaging. She has experience working on technical teams around the world on both enterprise and open-source projects. She currently is completing her Ph.D at the University of Waterloo in the Cryptography, Security, and Privacy Lab, and is a Principal Technical Advisor and Researcher for the Zcash Foundation. Chelsea also serves as a member of the Tor Research Safety Board.
diff --git a/content/about/people/matt/contents.lr b/content/about/people/matt/contents.lr
index 7baae5b9..a39502ef 100644
--- a/content/about/people/matt/contents.lr
+++ b/content/about/people/matt/contents.lr
@@ -8,8 +8,6 @@ name: Matt Blaze
---
title: Board Chair
---
-twitter_handle: mattblaze
----
nickname: matt
---
description:
diff --git a/content/about/people/megan/contents.lr b/content/about/people/megan/contents.lr
deleted file mode 100644
index 93d394c3..00000000
--- a/content/about/people/megan/contents.lr
+++ /dev/null
@@ -1,18 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:board
----
-name: Megan Price
----
-title: Director
----
-nickname: megan
----
-description:
-
-Megan is Executive Director of the Human Rights Data Analysis Group, where she designs strategies and methods for statistical analysis of human rights data for projects in places like Guatemala, Colombia, and Syria.
-She is lead statistician on a project in Guatemala in which she analyzes documents from the National Police Archive.
-She is lead statistician and author on three reports on documented deaths in Syria, commissioned by the officer of the United Nations High Commissioner of Human Rights.
-Megan is on the Technical Advisory Board for the Office of the Prosecutor at the International Criminal Court, a Research Fellow at the Carnegie Mellon University Center for Human Rights Science, and Human Rights Editor for the Statistical Journal of the International Association for Official Statistics (IAOS).
diff --git a/content/about/people/rabbi-rob-thomas-core/contents.lr b/content/about/people/rabbi-rob-thomas-core/contents.lr
new file mode 100644
index 00000000..92b66434
--- /dev/null
+++ b/content/about/people/rabbi-rob-thomas-core/contents.lr
@@ -0,0 +1,17 @@
+_model: person
+---
+_hidden: yes
+---
+role:core
+---
+name: Rabbi Rob Thomas
+---
+nickname: rabbi-rob-thomas
+---
+gpg: /static/keys/robt.txt
+---
+image: /static/images/people/robt.png
+---
+description:
+
+CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.
diff --git a/content/about/people/rabbi-rob-thomas/contents.lr b/content/about/people/rabbi-rob-thomas/contents.lr
index 92b66434..b0023de1 100644
--- a/content/about/people/rabbi-rob-thomas/contents.lr
+++ b/content/about/people/rabbi-rob-thomas/contents.lr
@@ -2,16 +2,14 @@ _model: person
---
_hidden: yes
---
-role:core
+role: board
---
name: Rabbi Rob Thomas
---
-nickname: rabbi-rob-thomas
----
-gpg: /static/keys/robt.txt
+title: Director
---
-image: /static/images/people/robt.png
+nickname: rabbi-rob-thomas
---
description:
-CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.
+Rabbi Rob Thomas is the founder and CEO of Team Cymru. Rabbi Rob has been a Unix kernel developer, ISP backbone engineer, security architect, and an adjunct professor. Rabbi Rob took his first C programming class at age 12, and has been addicted to technology ever since. Rabbi Rob and Team Cymru are long-time fans and supporters of the Tor Project, and provide infrastructure services to the project. Rabbi Rob and Team Cymru are rabidly devoted to community services, and are proud to support the great work of the Tor Project and the freedoms its technology enables.
diff --git a/content/about/people/ssteele/contents.lr b/content/about/people/ssteele/contents.lr
deleted file mode 100644
index 09005cf0..00000000
--- a/content/about/people/ssteele/contents.lr
+++ /dev/null
@@ -1,17 +0,0 @@
-_model: person
----
-_hidden: yes
----
-role:board
----
-name: Shari Steele
----
-title: Director
----
-nickname: ssteele
----
-description:
-
-Shari Steele was the Executive Director of the Tor Project from December 2015 through December 2018. She came to Tor after serving as Executive Director of the Electronic Frontier Foundation (EFF) for 15 years.
-From 1992 to 2000, Shari worked as an attorney and then legal director at EFF, where she spoke widely about civil liberties law in newly emerging technologies.
-A graduate of Widener University School of Law, Shari later served as a teaching fellow at [Georgetown University Law Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree in Advocacy. Shari has been on EFF's Board of Directors since 2000 and the Tor Project Board of Directors since January 2019.
1
0
commit 47e2748ac843e06ab7f38b0363f3df05cfbc993f
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Wed Sep 16 15:31:39 2020 +0000
Minor ChangeLog fixups
---
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index b0cdf08..c13d834 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -20,12 +20,12 @@ Tor Browser 10.0a7 -- September 14 2020
* Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
* Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
* Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
- * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja
- * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore
+ * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja [tor-browser-build]
* Windows
* Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
* Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
* Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
+ * Bug 40090: NSIS 3.06.1 based builds are not reproducible anymore [tor-browser-build]
Tor Browser 10.0a6 -- August 26 2020
* All Platforms
1
0

[onionperf/develop] Also accept a directory in `onionperf filter -i`.
by karsten@torproject.org 16 Sep '20
by karsten@torproject.org 16 Sep '20
16 Sep '20
commit 053da92c69d4b3628f33e1dd610a1bc8f601cbe0
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Thu Aug 27 09:59:59 2020 +0200
Also accept a directory in `onionperf filter -i`.
And clarify that we're leaving statistics unchanged as part of the
filtering.
---
CHANGELOG.md | 4 ++--
onionperf/filtering.py | 10 +++-------
onionperf/onionperf | 35 ++++++++++++++++++++++++-----------
3 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c57695e..ebd43e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
# Changes in version 0.7 - 2020-??-??
- Add a new `onionperf filter` mode that takes an OnionPerf analysis
- results file as input, applies filters, and produces a new
- OnionPerf analysis results file as output.
+ results file or directory as input, applies filters, and produces
+ new OnionPerf analysis results file(s) as output.
# Changes in version 0.6 - 2020-08-08
diff --git a/onionperf/filtering.py b/onionperf/filtering.py
index ab96f1e..b431eb9 100644
--- a/onionperf/filtering.py
+++ b/onionperf/filtering.py
@@ -15,9 +15,6 @@ class Filtering(object):
self.fingerprints_to_exclude = None
self.fingerprint_pattern = re.compile("\$?([0-9a-fA-F]{40})")
- def read_input(self, path):
- self.analysis = OPAnalysis.load(filename=path)
-
def include_fingerprints(self, path):
self.fingerprints_to_include = []
with open(path, 'rt') as f:
@@ -36,7 +33,8 @@ class Filtering(object):
fingerprint = fingerprint_match.group(1).upper()
self.fingerprints_to_exclude.append(fingerprint)
- def apply_filters(self):
+ def apply_filters(self, input_path, output_dir, output_file):
+ self.analysis = OPAnalysis.load(filename=input_path)
if self.fingerprints_to_include is None and self.fingerprints_to_exclude is None:
return
for source in self.analysis.get_nodes():
@@ -94,7 +92,5 @@ class Filtering(object):
retained_tgen_transfers[transfer_id] = transfer_data
self.analysis.set_tgen_streams(source, retained_tgen_streams)
self.analysis.set_tgen_transfers(source, retained_tgen_transfers)
-
- def write_output(self, path):
- self.analysis.save(filename=path)
+ self.analysis.save(filename=output_file, output_prefix=output_dir)
diff --git a/onionperf/onionperf b/onionperf/onionperf
index 96c6869..7c16aea 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -76,8 +76,11 @@ Analyze Tor and TGen output
"""
DESC_FILTER = """
-Takes an OnionPerf analysis results file as input, applies filters,
-and produces a new OnionPerf analysis results file as output.
+Takes an OnionPerf analysis results file or directory as input, applies filters,
+and produces new OnionPerf analysis results file(s) as output.
+
+This subcommand only filters measurements in `data/[source]/tgen/transfers`
+and `data/[source]/tgen/streams`, but leaves any summaries unchanged.
"""
HELP_FILTER = """
Filter OnionPerf analysis results
@@ -295,7 +298,8 @@ files generated by this script will be written""",
filter_parser.set_defaults(func=filter, formatter_class=my_formatter_class)
filter_parser.add_argument('-i', '--input',
- help="""read the OnionPerf analysis results at PATH as input""",
+ help="""a file or directory PATH from which OnionPerf analysis results
+ files are read""",
metavar="PATH", required="True",
action="store", dest="input")
@@ -314,8 +318,8 @@ files generated by this script will be written""",
default=None)
filter_parser.add_argument('-o', '--output',
- help="""write the filtered output OnionPerf analysis results file to
- PATH""",
+ help="""a file or directory PATH where filtered output OnionPerf
+ analysis results files are written""",
metavar="PATH", required="True",
action="store", dest="output")
@@ -439,17 +443,26 @@ def analyze(args):
def filter(args):
from onionperf.filtering import Filtering
- p = os.path.abspath(os.path.expanduser(args.input))
- if not os.path.exists(p):
- raise argparse.ArgumentTypeError("path '%s' does not exist" % args.input)
+ input_path = os.path.abspath(os.path.expanduser(args.input))
+ if not os.path.exists(input_path):
+ raise argparse.ArgumentTypeError("input path '%s' does not exist" % args.input)
+ output_path = os.path.abspath(os.path.expanduser(args.output))
+ if os.path.exists(output_path):
+ raise argparse.ArgumentTypeError("output path '%s' already exists" % args.output)
filtering = Filtering()
- filtering.read_input(args.input)
if args.include_fingerprints is not None:
filtering.include_fingerprints(args.include_fingerprints)
if args.exclude_fingerprints is not None:
filtering.exclude_fingerprints(args.exclude_fingerprints)
- filtering.apply_filters()
- filtering.write_output(args.output)
+ if os.path.isfile(input_path):
+ output_dir, output_file = os.path.split(output_path)
+ filtering.apply_filters(input_path=input_path, output_dir=output_dir, output_file=output_file)
+ else:
+ for dirpath, dirnames, filenames in os.walk(input_path):
+ for filename in filenames:
+ input_file = os.path.join(dirpath, filename)
+ output_dir = os.path.join(output_path, os.path.relpath(dirpath, input_path))
+ filtering.apply_filters(input_path=input_file, output_dir=output_dir, output_file=filename)
def visualize(args):
from onionperf.visualization import TGenVisualization
1
0

16 Sep '20
commit 1a81b3dff756cf197d661f931485443d1454c7c4
Author: Ana Custura <ana(a)netstat.org.uk>
Date: Fri Aug 21 01:38:01 2020 +0100
Add path validation to filter interface
---
onionperf/onionperf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/onionperf/onionperf b/onionperf/onionperf
index b1e7bd3..96c6869 100755
--- a/onionperf/onionperf
+++ b/onionperf/onionperf
@@ -439,6 +439,9 @@ def analyze(args):
def filter(args):
from onionperf.filtering import Filtering
+ p = os.path.abspath(os.path.expanduser(args.input))
+ if not os.path.exists(p):
+ raise argparse.ArgumentTypeError("path '%s' does not exist" % args.input)
filtering = Filtering()
filtering.read_input(args.input)
if args.include_fingerprints is not None:
1
0