- tor-commits - lists.torproject.org

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 01 May '20

01 May '20

commit 281da22f899c836f4671407c3eaaf22c6213bc69 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 1 04:48:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- da.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/da.po b/da.po index 586468af1b..fff0b81e9d 100644 --- a/da.po +++ b/da.po @@ -9,13 +9,13 @@ # Mikkel Munch Mortensen <3xm(a)detfalskested.dk>, 2014 # mort3n <nalholm(a)yahoo.dk>, 2016 # cookiefox <neoleo(a)gmail.com>, 2014 -# scootergrisen, 2017-2019 +# scootergrisen, 2017-2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2019-12-05 00:48+0000\n" +"PO-Revision-Date: 2020-05-01 04:35+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "" msgid "" "For debugging information, execute the following command: sudo tails-" "debugging-info" -msgstr "Få fejlretningsinfo ved at køre kommandoen: sudo tails-debugging-info" +msgstr "Få fejlretningsinformation ved at køre følgende kommando: sudo tails-debugging-info" #: ../lib/Tails/IUK/Frontend.pm:218 msgid "Error while checking for upgrades" @@ -42,11 +42,11 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "Kunne ikke fastsætte om der er en opgradering tilgængelig på vores websted.\n\nCheck din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet ikke forsvinder, gå til filen:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Kunne ikke fastsætte om der findes en opgradering fra vores websted.\n\nTjek din netværksforbindelse og genstart Tails for at prøve at opgradere igen.\n\nHvis problemet ikke forsvinder, gå til file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:236 msgid "no automatic upgrade is available from our website for this version" -msgstr "ingen automatisk opgradering er tilgængelig fra vores websted for denne version" +msgstr "der findes ingen automatisk opgradering fra vores websted til denne version" #: ../lib/Tails/IUK/Frontend.pm:242 msgid "your device was not created using a USB image or Tails Installer" @@ -54,24 +54,24 @@ msgstr "din enhed blev ikke oprettet med et USB-aftryk eller Tails-installations #: ../lib/Tails/IUK/Frontend.pm:247 msgid "Tails was started from a DVD or a read-only device" -msgstr "Tails er startet fra en DVD eller en enhed der ikke kan skrives til" +msgstr "Tails blev startet fra en DVD eller en enhed der ikke kan skrives til" #: ../lib/Tails/IUK/Frontend.pm:252 msgid "there is not enough free space on the Tails system partition" -msgstr "der er ikke nok fri plads på Tails system partition" +msgstr "der er ikke nok ledig plads på Tails-systempartitionen" #: ../lib/Tails/IUK/Frontend.pm:257 msgid "not enough memory is available on this system" -msgstr "systemet har ikke nok tilgængelig hukommelse" +msgstr "der er ikke nok hukommelse tilgængelig på systemet" #: ../lib/Tails/IUK/Frontend.pm:263 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "Ingen forklaring tilgængelig fordi \"%{reason}s\"." +msgstr "Ingen forklaring tilgængelig pga. årsagen \"%{reason}s\"." #: ../lib/Tails/IUK/Frontend.pm:283 msgid "The system is up-to-date" -msgstr "Systemet er ajour" +msgstr "Systemet er fuldt opdateret" #: ../lib/Tails/IUK/Frontend.pm:288 msgid "This version of Tails is outdated, and may have security issues." @@ -99,7 +99,7 @@ msgstr "En gradvis opgradering er tilgængelig uden at der eksisterer en tilsvar #: ../lib/Tails/IUK/Frontend.pm:362 msgid "Error while detecting available upgrades" -msgstr "Der opstod en fejl mens der blev søgt efter tilgængelige opgraderinger" +msgstr "Fejl under registrering af tilgængelige opgraderinger" #: ../lib/Tails/IUK/Frontend.pm:372 #, perl-brace-format @@ -142,7 +142,7 @@ msgstr "Du skal foretage en manual opgradering til %{name}s %{version}s.\ #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available" -msgstr "En ny version er tilgængelig" +msgstr "Der findes en ny version" #: ../lib/Tails/IUK/Frontend.pm:469 msgid "Downloading upgrade" @@ -170,26 +170,26 @@ msgstr "Fejl under download af opgradering" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Outputfilen \"%{output_file}s\" eksisterer ikke, men tails-iuk-get-target-file meldte ingen fejl. Rapportér venligst en fejl." +msgstr "Outputfilen \"%{output_file}s\" findes ikke, men tails-iuk-get-target-file meldte ikke fejl. Rapportér venligst en fejl." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" -msgstr "Der opstod en fejl under oprettelsen af den midlertidige downloadmappe" +msgstr "Fejl under oprettelse af midlertidig downloadmappe" #: ../lib/Tails/IUK/Frontend.pm:563 msgid "Failed to create temporary download directory" -msgstr "Den midlertidige downloadmappe kunne ikke oprettes" +msgstr "Kunne ikke oprette midlertidig downloadmappe" #: ../lib/Tails/IUK/Frontend.pm:587 msgid "" "Could not choose a download server.\n" "\n" "This should not happen. Please report a bug." -msgstr "Kunne ikke vælge en downloadserver.\n\nDette burde ikke ske. Rapportérr venligst en fejl." +msgstr "Kunne ikke vælge en downloadserver.\n\nDet burde ikke ske. Rapportér venligst en fejl." #: ../lib/Tails/IUK/Frontend.pm:591 msgid "Error while choosing a download server" -msgstr "Der opstod en fejl under valg af downloadserver" +msgstr "Fejl under valg af downloadserver" #: ../lib/Tails/IUK/Frontend.pm:606 msgid "" @@ -232,15 +232,15 @@ msgstr "Genstart senere" #: ../lib/Tails/IUK/Frontend.pm:639 msgid "Error while restarting the system" -msgstr "Der opstod en fejl under genstart af systemet" +msgstr "Fejl under genstart af systemet" #: ../lib/Tails/IUK/Frontend.pm:642 msgid "Failed to restart the system" -msgstr "Systemet kunne ikke genstartes" +msgstr "Kunne ikke genstarte systemet" #: ../lib/Tails/IUK/Frontend.pm:657 msgid "Error while shutting down the network" -msgstr "Der opstod en fejl under nedlukningen af netværket" +msgstr "Fejl under lukning af netværket" #: ../lib/Tails/IUK/Frontend.pm:660 msgid "Failed to shutdown network" @@ -263,8 +263,8 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "En fejl opstod mens opgraderingen blev installeret.\\n\\nDin Tails-enhed har brug for at blive repareret, og kan muligvis ikke genstarte.\\n\\nVær venlig at følge instruktionerne i filen:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Der opstod en fejl under installation af opgraderingen.\\n\\nDin Tails-enhed skal repareres, og kan muligvis ikke genstarte.\\n\\nFølg venligst instruktionerne i file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: ../lib/Tails/IUK/Frontend.pm:715 msgid "Error while installing the upgrade" -msgstr "Fejl under installeringen af opgradering" +msgstr "Fejl under installation af opgraderingen"

1 0

[translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit 9ac5b94ac20fcd74009847af472b0d1ecbcd6489 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 23:15:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index df206fd01a..8b41bbce3b 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline ""> <!ENTITY aboutTor.newsletter.link_text ""> -<!ENTITY aboutTor.donationBanner.line2e ""> +<!ENTITY aboutTor.donationBanner.freeToUse ""> <!ENTITY aboutTor.donationBanner.buttonA "">

1 0

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 30 Apr '20

30 Apr '20

commit c568a0bb17c309e90dfb0276935716ad6fe11d69 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 30 23:15:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- is/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is/aboutTor.dtd b/is/aboutTor.dtd index ea83fa8ea8..14bad9ac5a 100644 --- a/is/aboutTor.dtd +++ b/is/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér."> <!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">

1 0

[collector/master] Prepare for 1.15.1 release.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit e3ae1ee8684c014323ca7979c4c6815cbf52f490 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:21:27 2020 +0200 Prepare for 1.15.1 release. --- CHANGELOG.md | 5 ++++- build.xml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1fc4c0..12ca280 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 1.??.? - 2020-??-?? +# Changes in version 1.15.1 - 2020-04-30 + + * Medium changes + - Update to metrics-lib 2.12.2. # Changes in version 1.15.0 - 2020-04-30 diff --git a/build.xml b/build.xml index 02e1564..45b1b3d 100644 --- a/build.xml +++ b/build.xml @@ -9,10 +9,10 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.15.0-dev" /> + <property name="release.version" value="1.15.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.12.1" /> + <property name="metricslibversion" value="2.12.2" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[collector/master] Bump version to 1.15.1-dev.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 9b293ee35f4d457dce4f7775e19401c22d51606c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:25:57 2020 +0200 Bump version to 1.15.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ca280..8ebda3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.??.? - 2020-??-?? + + # Changes in version 1.15.1 - 2020-04-30 * Medium changes diff --git a/build.xml b/build.xml index 45b1b3d..38022fc 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.15.1" /> + <property name="release.version" value="1.15.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.12.2" />

1 0

[metrics-lib/master] Bump version to 2.12.2-dev.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 95771bfb9fa745849673ae11bfe4d5d422111a26 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:15:10 2020 +0200 Bump version to 2.12.2-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b2722c..af5a7f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.??.? - 2020-??-?? + + # Changes in version 2.12.2 - 2020-04-30 * Minor changes diff --git a/build.xml b/build.xml index d3d78ea..978ed37 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.2" /> + <property name="release.version" value="2.12.2-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Change order of detecting descriptor types.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 1c3bcae76d92781fa7f7de86a3dcb6449bd3579d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:06:53 2020 +0200 Change order of detecting descriptor types. We are detecting descriptor types of parsed descriptors by either content or file name. In some cases, if we downloaded descriptors from web servers, there is no file name. In other cases the file name can match more than one descriptor type. It seems most robust to move the file name checks to the end, which includes web server access logs and OnionPerf analysis files. --- .../torproject/descriptor/impl/DescriptorParserImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 7dcd9d2..e008e7a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -131,9 +131,6 @@ public class DescriptorParserImpl implements DescriptorParser { } else if (firstLines.startsWith("@type torperf 1.")) { return TorperfResultImpl.parseTorperfResults(rawDescriptorBytes, sourceFile); - } else if (fileName.endsWith(".onionperf.analysis.json.xz")) { - return new OnionPerfAnalysisConverter(rawDescriptorBytes, sourceFile) - .asTorperfResults(); } else if (firstLines.startsWith("@type snowflake-stats 1.") || firstLines.startsWith(Key.SNOWFLAKE_STATS_END.keyword + SP) || firstLines.contains(NL + Key.SNOWFLAKE_STATS_END.keyword + SP)) { @@ -144,8 +141,6 @@ public class DescriptorParserImpl implements DescriptorParser { || firstLines.contains(NL + Key.BRIDGEDB_METRICS_END.keyword + SP)) { return this.parseOneOrMoreDescriptors(rawDescriptorBytes, sourceFile, Key.BRIDGEDB_METRICS_END, BridgedbMetricsImpl.class); - } else if (fileName.contains(LogDescriptorImpl.MARKER)) { - return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName); } else if (firstLines.startsWith("@type bandwidth-file 1.") || firstLines.matches("(?s)[0-9]{10}\\n.*")) { /* Identifying bandwidth files by a 10-digit timestamp in the first line @@ -156,6 +151,14 @@ public class DescriptorParserImpl implements DescriptorParser { parsedDescriptors.add(new BandwidthFileImpl(rawDescriptorBytes, sourceFile)); return parsedDescriptors; + } else if (null != fileName + && fileName.contains(LogDescriptorImpl.MARKER)) { + return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, + fileName); + } else if (null != fileName + && fileName.endsWith(".onionperf.analysis.json.xz")) { + return new OnionPerfAnalysisConverter(rawDescriptorBytes, sourceFile) + .asTorperfResults(); } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'.");

1 0

[metrics-lib/master] Prepare for 2.12.2 release.
by karsten＠torproject.org 30 Apr '20

30 Apr '20

commit 7a5115dd76bb22835f931295b65d58dc0117367b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 30 22:11:52 2020 +0200 Prepare for 2.12.2 release. --- CHANGELOG.md | 6 +++++- build.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb8430d..6b2722c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Changes in version 2.??.? - 2020-??-?? +# Changes in version 2.12.2 - 2020-04-30 + + * Minor changes + - Change the order of detecting descriptor types by content and/ + file name. # Changes in version 2.12.1 - 2020-04-30 diff --git a/build.xml b/build.xml index ac4a3ed..d3d78ea 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.12.1-dev" /> + <property name="release.version" value="2.12.2" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[snowflake-webext/master] Remove proxy/ prefix from .gitignore
by arlo＠torproject.org 30 Apr '20

30 Apr '20

commit 58406af560b78a807fd6dc70087c07157cf54eef Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Apr 30 16:07:10 2020 -0400 Remove proxy/ prefix from .gitignore --- .gitignore | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 448d843..cbd3202 100644 --- a/.gitignore +++ b/.gitignore @@ -3,16 +3,16 @@ *.swn *.swm .DS_Store -proxy/test -proxy/build -proxy/node_modules -proxy/snowflake-library.js -proxy/spec/support -proxy/webext/snowflake.js -proxy/webext/popup.js -proxy/webext/embed.html -proxy/webext/embed.css -proxy/webext/assets/ -proxy/webext/_locales/ +test +build +node_modules +snowflake-library.js +spec/support +webext/snowflake.js +webext/popup.js +webext/embed.html +webext/embed.css +webext/assets/ +webext/_locales/ ignore/ npm-debug.log

1 0

[snowflake-webext/master] Move getMessage inside missingFeature
by arlo＠torproject.org 30 Apr '20

30 Apr '20

commit 11f3d871f34ccb0ab732ac943ac7af6416830a3b Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Apr 15 13:51:35 2020 -0400 Move getMessage inside missingFeature --- init-badge.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init-badge.js b/init-badge.js index cb066e8..e676323 100644 --- a/init-badge.js +++ b/init-badge.js @@ -32,7 +32,7 @@ class BadgeUI extends UI { this.popup.setActive(false); this.popup.setStatusText(messages.getMessage('popupStatusOff')); this.setIcon('off'); - this.popup.setStatusDesc(missing, true); + this.popup.setStatusDesc(messages.getMessage(missing), true); this.popup.hideButton(); } @@ -139,7 +139,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific } if (!Util.hasWebRTC()) { - ui.missingFeature(messages.getMessage('popupWebRTCOff')); + ui.missingFeature('popupWebRTCOff'); snowflake.disable(); return; } @@ -154,7 +154,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific snowflake.beginWebRTC(); }, () => { - ui.missingFeature(messages.getMessage('popupBridgeUnreachable')); + ui.missingFeature('popupBridgeUnreachable'); snowflake.disable(); log('Could not connect to bridge.'); } @@ -165,7 +165,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific ui = new BadgeUI(); if (!Util.hasCookies()) { - ui.missingFeature(messages.getMessage('badgeCookiesOff')); + ui.missingFeature('badgeCookiesOff'); return; }

1 0