[tor-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 28885: notify users that update is downloading""
commit 4f79cf20b45acc657639f620d03f24b38f8e7bf1 Author: Georg Koppen Date: Mon Feb 25 07:45:02 2019 + Revert "Revert "Bug 28885: notify users that update is downloading"" This reverts commit 58a439dd4e6fc1734d60d7175caa1cb2f88fbbac. --- browser/app/profile/000-tor-browser.js | 1 + .../customizableui/content/panelUI.inc.xul | 1 + .../components/customizableui/content/panelUI.js | 28 ++ browser/components/nsBrowserGlue.js| 1 + .../themes/shared/customizableui/panelUI.inc.css | 1 + browser/themes/shared/toolbarbutton-icons.inc.css | 1 + toolkit/mozapps/update/UpdateListener.jsm | 23 ++ toolkit/mozapps/update/nsUpdateService.js | 28 ++ 8 files changed, 84 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 11027f4c9a3a..9f1e727ce724 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -20,6 +20,7 @@ pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); pref("app.update.badge", true); +pref("app.update.notifyDuringDownload", true); pref("extensions.hotfix.id", ""); // Bug 16837: Disable hotfix updates as they may cause compat issues #ifdef XP_WIN diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 5891556a6e5f..ee4f8351d02b 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -172,6 +172,7 @@ { @@ -120,6 +122,28 @@ const PanelUI = { } }, + _initUpdaterStrings() { +// If Torbutton is installed and enabled, replace the "Downloading update" +// string with one from torbutton.properties (to facilitate localization). +try { + let brands = Services.strings.createBundle( + "chrome://branding/locale/brand.properties"); + let stringArgs = [brands.GetStringFromName("brandShortName")]; + let torbuttonBundle = Services.strings.createBundle( +"chrome://torbutton/locale/torbutton.properties"); + let label = torbuttonBundle.formatStringFromName( + "updateDownloadingPanelUILabel", stringArgs, 1); + let attrName = "label-update-downloading"; + let elements = document.getElementsByClassName("panel-banner-item"); + for (let i = 0; i < elements.length; ++i) { +let elem = elements.item(i); +if (elem.hasAttribute(attrName)) { + elem.setAttribute(attrName, label); +} + } +} catch (e) {} + }, + _eventListenersAdded: false, _ensureEventListenersAdded() { if (this._eventListenersAdded) @@ -152,6 +176,7 @@ const PanelUI = { Services.obs.removeObserver(this, "fullscreen-nav-toolbox"); Services.obs.removeObserver(this, "appMenu-notifications"); +Services.obs.removeObserver(this, "show-update-progress"); window.removeEventListener("MozDOMFullscreen:Entered", this); window.removeEventListener("MozDOMFullscreen:Exited", this); @@ -252,6 +277,9 @@ const PanelUI = { this._notifications = AppMenuNotifications.notifications; this._updateNotifications(true); break; + case "show-update-progress": +openAboutDialog(); +break; } }, diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 0ec10a3337d4..e68817fd3c7c 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -187,6 +187,7 @@ const global = this; const listeners = { observers: { +"update-downloading": ["UpdateListener"], "update-staged": ["UpdateListener"], "update-downloaded": ["UpdateListener"], "update-available": ["UpdateListener"], diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 75946aa5f082..4cb2032a09d1 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -62,6 +62,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git
[tor-commits] [tor-browser/tor-browser-60.5.1esr-8.5-1] Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened""
commit 5a0ac465ad739e62dc0c2e9887a15f146e9415a8 Author: Georg Koppen Date: Mon Feb 25 07:45:23 2019 + Revert "Revert "Bug 29180: MAR download stalls when about dialog is opened"" This reverts commit fcc53d9fa4969850b4cd77951974ee6db73e827b. --- browser/base/content/aboutDialog-appUpdater.js | 17 +++- toolkit/mozapps/update/content/updates.js | 27 ++ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/browser/base/content/aboutDialog-appUpdater.js b/browser/base/content/aboutDialog-appUpdater.js index e81098a1e898..b732db6bee6b 100644 --- a/browser/base/content/aboutDialog-appUpdater.js +++ b/browser/base/content/aboutDialog-appUpdater.js @@ -318,11 +318,18 @@ appUpdater.prototype = this.update.QueryInterface(Ci.nsIWritablePropertyBag); this.update.setProperty("foregroundDownload", "true"); -this.aus.pauseDownload(); -let state = this.aus.downloadUpdate(this.update, false); -if (state == "failed") { - this.selectPanel("downloadFailed"); - return; +// If one is not already in progress, start a download. Previously, +// we would pause and restart an existing download in case there was +// a need to transition from a background download to a foreground one, +// but that caused Tor bug 29180. There is no difference between a +// foreground and background download unless the update manifest +// includes a backgroundInterval attribute. +if (!this.isDownloading) { + let state = this.aus.downloadUpdate(this.update, false); + if (state == "failed") { +this.selectPanel("downloadFailed"); +return; + } } this.setupDownloadingUI(); diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js index 5b6ae7cc6ba1..195265ff81f9 100644 --- a/toolkit/mozapps/update/content/updates.js +++ b/toolkit/mozapps/update/content/updates.js @@ -751,19 +751,22 @@ var gDownloadingPage = { gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag); gUpdates.update.setProperty("foregroundDownload", "true"); - // Pause any active background download and restart it as a foreground - // download. - aus.pauseDownload(); - var state = aus.downloadUpdate(gUpdates.update, false); - if (state == "failed") { -// We've tried as hard as we could to download a valid update - -// we fell back from a partial patch to a complete patch and even -// then we couldn't validate. Show a validation error with instructions -// on how to manually update. -this.cleanUp(); -gUpdates.wiz.goTo("errors"); -return; + // If it is not already in progress, start the download. See + // Tor bug 29180 as well as the longer comment in the startDownload() + // function within browser/base/content/aboutDialog-appUpdater.js. + if (!aus.isDownloading) { +var state = aus.downloadUpdate(gUpdates.update, false); +if (state == "failed") { + // We've tried as hard as we could to download a valid update - + // we fell back from a partial patch to a complete patch and even + // then we couldn't validate. Show a validation error with + // instructions on how to manually update. + this.cleanUp(); + gUpdates.wiz.goTo("errors"); + return; +} } + // Add this UI as a listener for active downloads aus.addDownloadListener(this); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties
commit 922433210971b21d1b5643d97098882275edfd54 Author: Translation commit bot Date: Sun Feb 24 23:50:05 2019 + Update translations for tor-launcher-properties --- ka/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties index 3914a2f46..6543d6eec 100644 --- a/ka/torlauncher.properties +++ b/ka/torlauncher.properties @@ -50,7 +50,7 @@ torlauncher.done=á¨áá¡á á£áááá£ááá torlauncher.forAssistance=ááá®ááá áááá¡áááá¡ ááá£áááá¨áá ááá %S torlauncher.forAssistance2=ááá®ááá áááá¡áááá¡ áá¬áááá %S -torlauncher.copiedNLogMessages=áá¡ááá¡ áá¦ááá ááá¡á á£áááá£ááá. %S Tor-áá¡ áá¦á ááªá®ááá¡ á©áááá¬áá ááá áááááá á¢áá¥á¡á¢á£á á áááá¥á¢áá á¨á áá ááá¤áá¡á¢áá¡ á¬áá ááá¨á á©áá¡áá¡ááááá. +torlauncher.copiedNLogMessages=áá¡ááá¡ áá¦ááá ááá¡á á£áááá£ááá. Tor-áá¡ áá¦á ááªá®ááá¡ %S á©áááá¬áá á áááááá á¢áá¥á¡á¢á£á á áááá¥á¢áá á¨á áá ááá¤áá¡á¢áá¡ á¬áá ááá¨á á©áá¡áá¡ááááá. torlauncher.bootstrapStatus.starting=ááá¨áááá torlauncher.bootstrapStatus.conn_pt=á®ááááá áááááá¨áá ááá ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
commit 874a0ac6be172d5957f67bfc15d43887a88063e1 Author: Translation commit bot Date: Sun Feb 24 23:50:11 2019 + Update translations for tor-launcher-properties_completed --- ka/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties index 3914a2f46..6543d6eec 100644 --- a/ka/torlauncher.properties +++ b/ka/torlauncher.properties @@ -50,7 +50,7 @@ torlauncher.done=á¨áá¡á á£áááá£ááá torlauncher.forAssistance=ááá®ááá áááá¡áááá¡ ááá£áááá¨áá ááá %S torlauncher.forAssistance2=ááá®ááá áááá¡áááá¡ áá¬áááá %S -torlauncher.copiedNLogMessages=áá¡ááá¡ áá¦ááá ááá¡á á£áááá£ááá. %S Tor-áá¡ áá¦á ááªá®ááá¡ á©áááá¬áá ááá áááááá á¢áá¥á¡á¢á£á á áááá¥á¢áá á¨á áá ááá¤áá¡á¢áá¡ á¬áá ááá¨á á©áá¡áá¡ááááá. +torlauncher.copiedNLogMessages=áá¡ááá¡ áá¦ááá ááá¡á á£áááá£ááá. Tor-áá¡ áá¦á ááªá®ááá¡ %S á©áááá¬áá á áááááá á¢áá¥á¡á¢á£á á áááá¥á¢áá á¨á áá ááá¤áá¡á¢áá¡ á¬áá ááá¨á á©áá¡áá¡ááááá. torlauncher.bootstrapStatus.starting=ááá¨áááá torlauncher.bootstrapStatus.conn_pt=á®ááááá áááááá¨áá ááá ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
commit bba6af4bd1eb8ac823473b9fcdf384daac0a77f7 Author: Translation commit bot Date: Sun Feb 24 23:48:55 2019 + Update translations for torbutton-torbuttonproperties_completed --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index f5c6b9129..e6750b077 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = ááááááªááá torbutton.circuit_display.tor_bridge = á®ááá torbutton.circuit_display.unknown_country = á£áªáááá á¥ááá§ááá torbutton.circuit_display.guard = ááªáááá -torbutton.circuit_display.guard_note = áá¥áááá [Guard] ááááá«á á¨áá¡áá«ááá áá á¨áááªááááá¡. +torbutton.circuit_display.guard_note = áá¥áááá [ááªáááá] ááááá«á á¨áá¡áá«ááá áá á¨áááªááááá¡. torbutton.circuit_display.learn_more = áá®áááá áá áªááá torbutton.content_sizer.margin_tooltip = Tor-áá áá£ááá á áááá¢ááá¡ áááááá ááá¡ áááááááá, á áá áá¥áááá á¤ááá¯á áá¡ á¡ááááá áá á¡áááá¦áá áááááááá ááááá á©áá£áá áá á¨áá¡ááá©áááá áá§áá¡, á á᪠á¨áá£ááªáá ááá¡ á¡á®áááá¡, ááá¢áá ááá¢á¨á áá¥áááá áááááá¡ á¨áá¡áá«ááááááááá¡. torbutton.panel.tooltip.disabled = áááááááá Tor-áá¡ á©áá¡áá ááááá ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit a8925c6a37fcd3b7c8b408a908e4392e43818c6b Author: Translation commit bot Date: Sun Feb 24 23:48:47 2019 + Update translations for torbutton-torbuttonproperties --- ka/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.properties b/ka/torbutton.properties index f5c6b9129..e6750b077 100644 --- a/ka/torbutton.properties +++ b/ka/torbutton.properties @@ -6,7 +6,7 @@ torbutton.circuit_display.relay = ááááááªááá torbutton.circuit_display.tor_bridge = á®ááá torbutton.circuit_display.unknown_country = á£áªáááá á¥ááá§ááá torbutton.circuit_display.guard = ááªáááá -torbutton.circuit_display.guard_note = áá¥áááá [Guard] ááááá«á á¨áá¡áá«ááá áá á¨áááªááááá¡. +torbutton.circuit_display.guard_note = áá¥áááá [ááªáááá] ááááá«á á¨áá¡áá«ááá áá á¨áááªááááá¡. torbutton.circuit_display.learn_more = áá®áááá áá áªááá torbutton.content_sizer.margin_tooltip = Tor-áá áá£ááá á áááá¢ááá¡ áááááá ááá¡ áááááááá, á áá áá¥áááá á¤ááá¯á áá¡ á¡ááááá áá á¡áááá¦áá áááááááá ááááá á©áá£áá áá á¨áá¡ááá©áááá áá§áá¡, á á᪠á¨áá£ááªáá ááá¡ á¡á®áááá¡, ááá¢áá ááá¢á¨á áá¥áááá áááááá¡ á¨áá¡áá«ááááááááá¡. torbutton.panel.tooltip.disabled = áááááááá Tor-áá¡ á©áá¡áá ááááá ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit f2b7834905d9891405ea8ae4ac1d675de53ae8fd Author: Translation commit bot Date: Sun Feb 24 22:45:56 2019 + Update translations for liveusb-creator --- he/he.po | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/he/he.po b/he/he.po index ea3c9b143..33922ea61 100644 --- a/he/he.po +++ b/he/he.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-23 13:30+0100\n" -"PO-Revision-Date: 2019-02-23 13:05+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-24 22:37+\n" +"Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -316,7 +316,7 @@ msgstr "×תק×× Tails" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "××תק×× Tails ××××©× ×Ö¾Debian" #: ../tails_installer/gui.py:443 msgid "" @@ -325,7 +325,7 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "See the manual upgrade instructions" -msgstr "" +msgstr "××× ××תק×× ×ת Tails ××פס, ×שת×ש ××××¡×§× GNOME ××ק××.\nר×× ×ת ××ר××ת ×××ª×§× ×\n\n××× ×ש××¨× ×ת Tails, ×צע ש×ר×× ××××××× ×× Tails ×× ×©×ר×× ××× × ×× Debian ×¢\"× ×©×××ש ××××¡× USB ×©× ×.\nר×× ×ת ××ר××ת ×ש×ר×× ×××× ×" #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -486,16 +486,16 @@ msgstr "×× ××× × ××ª× ××שת×ש ×ק×××¥ ×× ××ר. ×××× ×× msgid "%(filename)s selected" msgstr "%(filename)s × ××ר" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "×× ××× × ××ª× ××צ×× LiveOS ×¢× ISO" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "×× ××× ×××× ×× ×ש ××ª×§× ×©× ××ש ×שת××¢: %s" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -503,29 +503,29 @@ msgid "" "%s" msgstr "××××ª× ×©×××× ×××צ××¢ `%s`.\n%s\n%s" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "'%s' ××× × ×§×××" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "'%s' ××× × ×¡×פר×××" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "×××× ×¢× '%(filename)s'" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "××××ª× ×©×××× ×××צ××¢ `%s`.%s\n%s" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr "×× ××× ×××× ×פת×× ××ª×§× ×¢××ר ×ת×××." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 2249eb794de38713f6c1887237df6354e30773bc Author: Translation commit bot Date: Sun Feb 24 22:46:03 2019 + Update translations for liveusb-creator_completed --- he/he.po | 189 ++- 1 file changed, 101 insertions(+), 88 deletions(-) diff --git a/he/he.po b/he/he.po index efffa73c4..33922ea61 100644 --- a/he/he.po +++ b/he/he.po @@ -5,7 +5,7 @@ # Translators: # aharon, 2012 # Dvir Rosen , 2014 -# ION, 2017-2018 +# ION, 2017-2019 # Johnny Diralenzo, 2015 # Kunda, 2014 # Vladi Pryadko , 2013 @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-17 13:11+0200\n" -"PO-Revision-Date: 2018-10-19 16:32+\n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-24 22:37+\n" "Last-Translator: ION\n" "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n" "MIME-Version: 1.0\n" @@ -85,194 +85,194 @@ msgstr "×× ××× × ××ª× ××עת×ק ×ת %(infile)s ×× %(outfile)s : msgid "Removing existing Live OS" msgstr "×ס×ר ×ער×ת ×פע×× ××× ×§×××ת" -#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456 +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "×× ××× × ××ª× ××©× ×ת ×רש××ת %(file)s: %(message)s" -#: ../tails_installer/creator.py:449 +#: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "×× ××× × ××ª× ××ס×ר ק×××¥ ××ער×ת ××פע×× ×××× ×ק×××ת: %(message)s" -#: ../tails_installer/creator.py:462 +#: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "×× ××× × ××ª× ××ס×ר ת×ק××× ××ער×ת ××פע×× ×××× ×ק×××ת: %(message)s" -#: ../tails_installer/creator.py:510 +#: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" msgstr "×× × ××ª× ××צ×× ×ת ×××ª×§× %s" -#: ../tails_installer/creator.py:711 +#: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "×× ××× × ××ª× ××ת×× ×¢× %(device)s, ××××." -#: ../tails_installer/creator.py:741 +#: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "×ספר ×××צ×ת ×©× ××ª×§× ××××¨× %(device)s ××צ××ת. ×× ×××× ×××ª× ××צ××ת ××¤× × ×ת××ת ת×××× ×××ª×§× ×." -#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008 +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "×ער×ת ק×צ×× ×××ª× ××××¢×. ×××ª×§× ×©×× ×¦×¨×× ××××ת ×ת×ס×ר ×××ש." -#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011 +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 #, python-format msgid "Unsupported filesystem: %s" msgstr "×ער×ת ק×צ×× ×××ª× × ×ª××ת: %s" -#: ../tails_installer/creator.py:805 +#: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "×ר××ת GLib ×××ª× ××××¢× ×עת × ×ס××× ××צ×× ×תק×: %(message)s" -#: ../tails_installer/creator.py:810 +#: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" msgstr "×× ××× × ××ª× ××צ×× ××ש×ר: %(message)s" -#: ../tails_installer/creator.py:815 +#: ../tails_installer/creator.py:817 msgid "No mount points found" msgstr "×× × ×צ×× × ×§×××ת ×צ××" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:828 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "××× ×ס unmount_device ×¢××ר '%(device)s'" -#: ../tails_installer/creator.py:836 +#: ../tails_installer/creator.py:838 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "×××× ×צ×ת ×ער××ת ק×צ×× ×××צ××ת ×¢× '%(device)s'" -#: ../tails_installer/creator.py:840 +#: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "×××× ×צ×ת '%(udi)s' ×¢× '%(device)s'" -#: ../tails_installer/creator.py:851 +#: ../tails_installer/creator.py:853 #, python-format msgid "Mount %s exists after unmounting" msgstr "×צ×ת %s ק×××ת ×××ר ××××× ×צ××" -#: ../tails_installer/creator.py:864 +#: ../tails_installer/creator.py:866 #, python-format
[tor-commits] [torspec/master] Add version 3 HSFETCH to control-spec.txt
commit 34518e19b796281deeaf0aeb65c42f91df967e9f Author: Neel Chauhan Date: Mon Jan 14 14:20:21 2019 -0500 Add version 3 HSFETCH to control-spec.txt --- control-spec.txt | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 6b63679..dce1c0e 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1537,14 +1537,18 @@ "HSFETCH" SP (HSAddress / "v" Version "-" DescId) *[SP "SERVER=" Server] CRLF -HSAddress = 16*Base32Character -Version = "2" +HSAddress = 16*Base32Character / 56*Base32Character +Version = "2" / "3" DescId = 32*Base32Character Server = LongName This command launches hidden service descriptor fetch(es) for the given HSAddress or DescId. + HSAddress can be version 2 or version 3 addresses. DescIDs can only be + version 2 IDs. Version 2 addresses consist of 16*Base32Character and + version 3 addresses consist of 56*Base32Character. + If a DescId is specified, at least one Server MUST also be provided, otherwise a 512 error is returned. If no DescId and Server(s) are specified, it behaves like a normal Tor client descriptor fetch. If one or more @@ -1570,7 +1574,11 @@ C: HSFETCH ajkhdsfuygaesfaa S: 250 OK + C: HSFETCH vww6ybal4bd7szmgncyruucpgfkqahzddi37ktceo3ah7ngmcopnpyyd + S: 250 OK + [HSFETCH was added in Tor 0.2.7.1-alpha] + [HS v3 support added 0.4.1.1-alpha] 3.27. ADD_ONION ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/646'
commit 69238ca2da923c8a50d5c1007f3e702eea163b50 Merge: 34601105a c985940de Author: Nick Mathewson Date: Sun Feb 24 17:17:16 2019 -0500 Merge remote-tracking branch 'tor-github/pr/646' changes/ticket25417 | 4 src/feature/control/control.c | 26 -- src/feature/hs/hs_client.c| 18 ++ src/feature/hs/hs_client.h| 4 src/feature/hs/hs_control.c | 14 ++ src/feature/hs/hs_control.h | 4 6 files changed, 64 insertions(+), 6 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/52'
commit 32002ec49235ebf925e5da8699e148f0367d4bb6 Merge: 698d630 34518e1 Author: Nick Mathewson Date: Sun Feb 24 17:19:03 2019 -0500 Merge remote-tracking branch 'tor-github/pr/52' control-spec.txt | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add version 3 onion service support to HSFETCH
commit c985940de9ec743cbb3e9a3e32fd482bd859c9ed Author: Neel Chauhan Date: Mon Jan 14 14:09:53 2019 -0500 Add version 3 onion service support to HSFETCH --- changes/ticket25417 | 4 src/feature/control/control.c | 26 -- src/feature/hs/hs_client.c| 18 ++ src/feature/hs/hs_client.h| 4 src/feature/hs/hs_control.c | 14 ++ src/feature/hs/hs_control.h | 4 6 files changed, 64 insertions(+), 6 deletions(-) diff --git a/changes/ticket25417 b/changes/ticket25417 new file mode 100644 index 0..41f2acc98 --- /dev/null +++ b/changes/ticket25417 @@ -0,0 +1,4 @@ + o Minor features (controller): +- Add onion service version 3 support to HSFETCH. Previously, only + version 2 onion services were supported. Closes ticket 25417. + Patch by Neel Chauhan diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 170037e06..d7299a4cf 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -4426,6 +4426,8 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, static const char *v2_str = "v2-"; const size_t v2_str_len = strlen(v2_str); rend_data_t *rend_query = NULL; + ed25519_public_key_t v3_pk; + uint32_t version; /* Make sure we have at least one argument, the HSAddress. */ args = getargs_helper(hsfetch_command, conn, body, 1, -1); @@ -4438,6 +4440,7 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* Test if it's an HS address without the .onion part. */ if (rend_valid_v2_service_id(arg1)) { hsaddress = arg1; +version = HS_VERSION_TWO; } else if (strcmpstart(arg1, v2_str) == 0 && rend_valid_descriptor_id(arg1 + v2_str_len) && base32_decode(digest, sizeof(digest), arg1 + v2_str_len, @@ -4445,6 +4448,11 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* We have a well formed version 2 descriptor ID. Keep the decoded value * of the id. */ desc_id = digest; +version = HS_VERSION_TWO; + } else if (hs_address_is_valid(arg1)) { +hsaddress = arg1; +version = HS_VERSION_THREE; +hs_parse_address(hsaddress, _pk, NULL, NULL); } else { connection_printf_to_buf(conn, "513 Invalid argument \"%s\"\r\n", arg1); @@ -4481,11 +4489,13 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, } } - rend_query = rend_data_client_create(hsaddress, desc_id, NULL, - REND_NO_AUTH); - if (rend_query == NULL) { -connection_printf_to_buf(conn, "551 Error creating the HS query\r\n"); -goto done; + if (version == HS_VERSION_TWO) { +rend_query = rend_data_client_create(hsaddress, desc_id, NULL, + REND_NO_AUTH); +if (rend_query == NULL) { + connection_printf_to_buf(conn, "551 Error creating the HS query\r\n"); + goto done; +} } /* Using a descriptor ID, we force the user to provide at least one @@ -4504,7 +4514,11 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* Trigger the fetch using the built rend query and possibly a list of HS * directory to use. This function ignores the client cache thus this will * always send a fetch command. */ - rend_client_fetch_v2_desc(rend_query, hsdirs); + if (version == HS_VERSION_TWO) { +rend_client_fetch_v2_desc(rend_query, hsdirs); + } else if (version == HS_VERSION_THREE) { +hs_control_hsfetch_command(_pk, hsdirs); + } done: SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 5fded92fe..7dc856ae5 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -459,6 +459,24 @@ fetch_v3_desc, (const ed25519_public_key_t *onion_identity_pk)) return directory_launch_v3_desc_fetch(onion_identity_pk, hsdir_rs); } +/* With a given onion_identity_pk, fetch its descriptor. If + * hsdirs is specified, use the directory servers specified in the list. + * Else, use a random server. */ +void +hs_client_launch_v3_desc_fetch(const ed25519_public_key_t *onion_identity_pk, + const smartlist_t *hsdirs) +{ + tor_assert(onion_identity_pk); + + if (hsdirs != NULL) { +SMARTLIST_FOREACH_BEGIN(hsdirs, const routerstatus_t *, hsdir) { + directory_launch_v3_desc_fetch(onion_identity_pk, hsdir); +} SMARTLIST_FOREACH_END(hsdir); + } else { +fetch_v3_desc(onion_identity_pk); + } +} + /* Make sure that the given v3 origin circuit circ is a valid correct * introduction circuit. This will BUG() on any problems and hard assert if * the anonymity of the circuit is not ok. Return 0 on success else -1 where diff --git a/src/feature/hs/hs_client.h b/src/feature/hs/hs_client.h index f6fb167ea..47c525242 100644 --- a/src/feature/hs/hs_client.h +++
[tor-commits] [tor/master] Merge branch 'ticket29065_squashed'
commit 34601105a39236cf6b21c9fe2ba78733c7788ff3 Merge: f229a3368 b7dced893 Author: Nick Mathewson Date: Sun Feb 24 17:02:35 2019 -0500 Merge branch 'ticket29065_squashed' changes/ticket29065| 3 +++ src/test/test_switch_id.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix shellcheck SC2006 warnings in test_switch_id.sh
commit b7dced893a7de1c0ba303905f69022fee7d05fc9 Author: rl1987 Date: Thu Feb 7 17:05:14 2019 +0200 Fix shellcheck SC2006 warnings in test_switch_id.sh --- changes/ticket29065| 3 +++ src/test/test_switch_id.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/ticket29065 b/changes/ticket29065 new file mode 100644 index 0..edf00ac99 --- /dev/null +++ b/changes/ticket29065 @@ -0,0 +1,3 @@ + o Code simplification and refactoring (shell scripts): +- Cleanup test_switch_id.sh to silence shellcheck warnings. Closes + ticket 29065. diff --git a/src/test/test_switch_id.sh b/src/test/test_switch_id.sh index 79c44f2eb..b13bf7602 100755 --- a/src/test/test_switch_id.sh +++ b/src/test/test_switch_id.sh @@ -1,11 +1,11 @@ #!/bin/sh -if test "`id -u`" != '0'; then +if test "$(id -u)" != '0'; then echo "This test only works when run as root. Skipping." >&2 exit 77 fi -if test "`id -u nobody`" = ""; then +if test "$(id -u nobody)" = ""; then echo "This test requires that your system have a 'nobody' user. Sorry." >&2 exit 1 fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit c17b2a2207cb5ea93edcc2ca52109ccaba5c2685 Author: Translation commit bot Date: Sun Feb 24 19:45:57 2019 + Update translations for liveusb-creator --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index be9850fae..d104e6e61 100644 --- a/da/da.po +++ b/da/da.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-24 07:24+0100\n" -"PO-Revision-Date: 2019-02-24 19:15+\n" +"PO-Revision-Date: 2019-02-24 19:20+\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -328,7 +328,7 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "See the manual upgrade instructions" -msgstr "" +msgstr "Brug i stedet GNOME Diske for at installere Tails fra bunden.\nSe instruktionerne til installation\n\nOpgrader Tails ved at foretage en automatisk opgradering fra Tails eller en manual opgradering fra Debian med en anden USB-pen.\nSe instruktionerne til manuel opgradering" #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit f05ad28852042d428b0cc9bd865b3ee730389eab Author: Translation commit bot Date: Sun Feb 24 19:46:04 2019 + Update translations for liveusb-creator_completed --- da/da.po | 33 ++--- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/da/da.po b/da/da.po index 792efc5bb..d104e6e61 100644 --- a/da/da.po +++ b/da/da.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-05 20:34+\n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-24 19:20+\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -318,14 +318,17 @@ msgid "Tails Installer" msgstr "Tails-installationsprogram" #: ../tails_installer/gui.py:441 -msgid "Tails Installer is deprecated" -msgstr "Tails-installationsprogram er udgået" +msgid "Tails Installer is deprecated in Debian" +msgstr "Tails-installationsprogram er udgået i Debian" #: ../tails_installer/gui.py:443 msgid "" -"To install a new Tails, see the installation documentation.\n" -"To upgrade an existing Tails, see the upgrade documentation." -msgstr "Se installation-dokumentationen for at installere en ny Tails.\nSe opgrader-dokumentationen for at opgradere en eksisterende Tails." +"To install Tails from scratch, use GNOME Disks instead.\n" +"See the installation instructions\n" +"\n" +"To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" +"See the manual upgrade instructions" +msgstr "Brug i stedet GNOME Diske for at installere Tails fra bunden.\nSe instruktionerne til installation\n\nOpgrader Tails ved at foretage en automatisk opgradering fra Tails eller en manual opgradering fra Debian med en anden USB-pen.\nSe instruktionerne til manuel opgradering" #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -486,16 +489,16 @@ msgstr "Kan ikke bruge den valgte fil. Prøv i stedet at flytte din ISO til rode msgid "%(filename)s selected" msgstr "%(filename)s valgt" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "Kan ikke finde LiveOS på ISO" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "Kunne ikke gætte underliggende blokenhed: %s" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -503,29 +506,29 @@ msgid "" "%s" msgstr "Der opstod et problem ved eksekvering af `%s`.\n%s\n%s" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "'%s' findes ikke" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "'%s' er ikke en mappe" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "Springer '%(filename)s' over" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "Der opstod et problem ved eksekvering af `%s`.%s\n%s" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr "Kunne ikke åbne enhed til skrivning." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit d02989490191deb3db5773c566ae7eda376ab4bc Author: Translation commit bot Date: Sun Feb 24 19:15:56 2019 + Update translations for liveusb-creator --- da/da.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/da/da.po b/da/da.po index 41372dce0..be9850fae 100644 --- a/da/da.po +++ b/da/da.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-23 13:30+0100\n" -"PO-Revision-Date: 2019-02-23 13:05+\n" -"Last-Translator: carolyn \n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-24 19:15+\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -319,7 +319,7 @@ msgstr "Tails-installationsprogram" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "Tails-installationsprogram er udgået i Debian" #: ../tails_installer/gui.py:443 msgid "" @@ -489,16 +489,16 @@ msgstr "Kan ikke bruge den valgte fil. Prøv i stedet at flytte din ISO til rode msgid "%(filename)s selected" msgstr "%(filename)s valgt" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "Kan ikke finde LiveOS på ISO" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "Kunne ikke gætte underliggende blokenhed: %s" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -506,29 +506,29 @@ msgid "" "%s" msgstr "Der opstod et problem ved eksekvering af `%s`.\n%s\n%s" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "'%s' findes ikke" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "'%s' er ikke en mappe" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "Springer '%(filename)s' over" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "Der opstod et problem ved eksekvering af `%s`.%s\n%s" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr "Kunne ikke åbne enhed til skrivning." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
commit 6b05114fcf6aab0264cddcdc2001cd815f1bff44 Author: Translation commit bot Date: Sun Feb 24 12:16:12 2019 + Update translations for liveusb-creator_completed --- de/de.po | 172 ++- fr/fr.po | 20 +--- 2 files changed, 105 insertions(+), 87 deletions(-) diff --git a/de/de.po b/de/de.po index 94bfc0f22..27c713733 100644 --- a/de/de.po +++ b/de/de.po @@ -13,6 +13,7 @@ # Christoph Engler , 2015 # trantor , 2014 # tbull , 2009 +# Curtis Baltimore , 2019 # Emilio Salano , 2016 # Ettore Atalan , 2015,2017-2018 # gerhard , 2013 @@ -46,9 +47,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-17 13:11+0200\n" -"PO-Revision-Date: 2018-10-17 19:56+\n" -"Last-Translator: Ettore Atalan \n" +"POT-Creation-Date: 2019-02-23 13:30+0100\n" +"PO-Revision-Date: 2019-02-24 11:54+\n" +"Last-Translator: Curtis Baltimore \n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -115,194 +116,194 @@ msgstr "%(infile)s konnten nicht nach %(outfile)s kopiert werden: %(message)s" msgid "Removing existing Live OS" msgstr "Entferne bestehendes Live-OS" -#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:456 +#: ../tails_installer/creator.py:444 ../tails_installer/creator.py:457 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Berechtigungen von %(file)s konnten nicht geändert werden: %(message)s" -#: ../tails_installer/creator.py:449 +#: ../tails_installer/creator.py:450 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Datei einer älteren Live-System-Version konnte nicht entfernt werden: %(message)s" -#: ../tails_installer/creator.py:462 +#: ../tails_installer/creator.py:464 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Ordner einer älteren Live-System-Version konnte nicht entfernt werden: %(message)s" -#: ../tails_installer/creator.py:510 +#: ../tails_installer/creator.py:512 #, python-format msgid "Cannot find device %s" msgstr "Kann Gerät %s nicht finden" -#: ../tails_installer/creator.py:711 +#: ../tails_installer/creator.py:713 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Auf %(device)s kann nicht geschrieben werden. Ãberspringe." -#: ../tails_installer/creator.py:741 +#: ../tails_installer/creator.py:743 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Einige Partitionen des Ziellaufwerks %(device)s sind eingehängt. Sie werden ausgehängt, bevor die Installation beginnt." -#: ../tails_installer/creator.py:784 ../tails_installer/creator.py:1008 +#: ../tails_installer/creator.py:786 ../tails_installer/creator.py:1010 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Unbekanntes Dateisystem. Eventuell muss das Speichermedium neu formatiert werden." -#: ../tails_installer/creator.py:787 ../tails_installer/creator.py:1011 +#: ../tails_installer/creator.py:789 ../tails_installer/creator.py:1013 #, python-format msgid "Unsupported filesystem: %s" msgstr "Nicht unterstütztes Dateisystem: %s" -#: ../tails_installer/creator.py:805 +#: ../tails_installer/creator.py:807 #, python-format msgid "Unknown GLib exception while trying to mount device: %(message)s" msgstr "Unbekannte GLib-Ausnahme beim Versuch das Gerät einzuhängen: %(message)s" -#: ../tails_installer/creator.py:810 +#: ../tails_installer/creator.py:812 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Speichermedium konnte nicht eingehängt werden: %(message)s" -#: ../tails_installer/creator.py:815 +#: ../tails_installer/creator.py:817 msgid "No mount points found" msgstr "Keine Einhängepunkte gefunden" -#: ../tails_installer/creator.py:826 +#: ../tails_installer/creator.py:828 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "unmount_device für »%(device)s«" -#: ../tails_installer/creator.py:836 +#: ../tails_installer/creator.py:838 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Eingehängtes Dateisystem auf %(device)s wird ausgehängt" -#: ../tails_installer/creator.py:840 +#: ../tails_installer/creator.py:842 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "'%(udi)s' auf '%(device)s' wird ausgehängt" -#: ../tails_installer/creator.py:851 +#: ../tails_installer/creator.py:853 #, python-format msgid "Mount %s exists after unmounting" msgstr "Mount %s existiert noch nach dem Aushängen" -#: ../tails_installer/creator.py:864 +#: ../tails_installer/creator.py:866 #, python-format msgid "Partitioning device %(device)s" msgstr
[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator
commit 2f6f059f7ce7876e188109e85ea49ca542800678 Author: Translation commit bot Date: Sun Feb 24 12:16:04 2019 + Update translations for liveusb-creator --- de/de.po | 8 fr/fr.po | 9 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/de/de.po b/de/de.po index 03f68..27c713733 100644 --- a/de/de.po +++ b/de/de.po @@ -48,8 +48,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-23 13:30+0100\n" -"PO-Revision-Date: 2019-02-23 13:05+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-02-24 11:54+\n" +"Last-Translator: Curtis Baltimore \n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,7 +347,7 @@ msgstr "Tails-Installationsprogramm" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "Tails Installer ist in Debian veraltet." #: ../tails_installer/gui.py:443 msgid "" @@ -356,7 +356,7 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "See the manual upgrade instructions" -msgstr "" +msgstr "Um Tails von Grund auf neu zu installieren, verwende stattdessen GNOME-Disks.\nSiehe Installationsanleitung\n\nUm Tails zu aktualisieren, führe ein automatisches Upgrade von Tails oder ein manuelles Upgrade von Debian mit einem zweiten USB-Stick durch.\nSiehe die manuellen Upgrade-Anweisungen." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" diff --git a/fr/fr.po b/fr/fr.po index 49a5d0d88..fcc564239 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -11,6 +11,7 @@ # BitingBird , 2015 # Charles-Antoine Couret, 2009 # Charles-Antoine Couret , 2009 +# Curtis Baltimore , 2019 # Emmanuel Simond , 2014 # Eric lassauge , 2010 # AO , 2017-2018 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-23 13:30+0100\n" -"PO-Revision-Date: 2019-02-23 13:05+\n" -"Last-Translator: carolyn \n" +"PO-Revision-Date: 2019-02-24 12:09+\n" +"Last-Translator: Curtis Baltimore \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -329,7 +330,7 @@ msgstr "Programme dâinstallation de Tails" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "L'installateur Tails est déconseillé dans Debian" #: ../tails_installer/gui.py:443 msgid "" @@ -338,7 +339,7 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "See the manual upgrade instructions" -msgstr "" +msgstr "Pour installer Tails à partir de zéro, utilisez plutôt des disques GNOME.\nVoir les instructions d'installation\n\nPour faire la mise-à -jour de Tails, faites une mise à jour automatique de Tails ou une mise à jour manuelle de Debian en utilisant une seconde USB stick.\nVoir les instructions de mise-à -jour dans le guide d'utilisation" #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits