November 2015 - tor-commits - lists.torproject.org

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit 68ce27f935fd82920195646b45adb4bc4b5c2ccc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 11:15:37 2015 +0000 Update translations for mat-gui --- ml.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ml.po b/ml.po index 383495c..a08f807 100644 --- a/ml.po +++ b/ml.po @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-… [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit f9c3370fe700be2233305169b67df6b26a2f5d0b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 11:15:18 2015 +0000 Update translations for https_everywhere --- ml/https-everywhere.dtd | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ml/https-everywhere.dtd b/ml/https-everywhere.dtd index 9ff2ecb..54d7821 100644 --- a/ml/https-everywhere.dtd +++ b/ml/https-everywhere.dtd @@ -1,8 +1,8 @@ -<!… [View More]ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.title "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് കുറിച്ച്"> +<!ENTITY https-everywhere.about.ext_name "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ്"> <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by "Created by"> +<!ENTITY https-everywhere.about.created_by "ഉണ്ടാക്കിയത്"> <!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> <!ENTITY https-everywhere.about.thanks "Thanks to"> <!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.about.or "or"> <!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് കുറിച്ച്"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് പ്രാപ്തമാക്കുക"> <!ENTITY https-everywhere.menu.globalDisable "എല്ലായിടത്തും എച്ച്ടിടിപിഎസ് പ്രവര്‍ത്തന രഹിതമാക്കുക"> @@ -20,31 +20,31 @@ <!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere Preferences"> -<!ENTITY https-everywhere.prefs.enable_all "Enable All"> -<!ENTITY https-everywhere.prefs.disable_all "Disable All"> +<!ENTITY https-everywhere.prefs.enable_all "എല്ലാം പ്രാപ്തമാക്കുക"> +<!ENTITY https-everywhere.prefs.disable_all "എല്ലാം അപ്രാപ്തമാക്കുക"> <!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> -<!ENTITY https-everywhere.prefs.search "Search"> +<!ENTITY https-everywhere.prefs.search "തിരച്ചിൽ"> <!ENTITY https-everywhere.prefs.site "Site"> -<!ENTITY https-everywhere.prefs.notes "Notes"> +<!ENTITY https-everywhere.prefs.notes "കുറിപ്പുകൾ"> <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> -<!ENTITY https-everywhere.prefs.enabled "Enabled"> +<!ENTITY https-everywhere.prefs.enabled "പ്രാപ്തമാക്കി"> <!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> <!ENTITY https-everywhere.prefs.here_link "here"> <!ENTITY https-everywhere.prefs.toggle "Toggle"> -<!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> -<!ENTITY https-everywhere.prefs.view_xml_source "View XML Source"> +<!ENTITY https-everywhere.prefs.reset_default "സ്വതേ പുനഃസജ്ജമാക്കുക"> +<!ENTITY https-everywhere.prefs.view_xml_source "എക്സ്എംഎൽ സൌരസ് കാണുക"> -<!ENTITY https-everywhere.source.downloading "Downloading"> -<!ENTITY https-everywhere.source.filename "Filename"> -<!ENTITY https-everywhere.source.unable_to_download "Unable to download source."> +<!ENTITY https-everywhere.source.downloading "ഡൗൺലോഡുചെയ്യുന്നു"> +<!ENTITY https-everywhere.source.filename "ഫയലിന്റെ പേര്"> +<!ENTITY https-everywhere.source.unable_to_download "സൌരസ് ഡൌൺലോഡ് ചെയ്യാൻ കഴിയുന്നില്ല."> <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> <!ENTITY https-everywhere.popup.paragraph1 "Oops. You were using the stable version of HTTPS Everywhere, but we might have accidentally upgraded you to the development version in our last release."> -<!ENTITY https-everywhere.popup.paragraph2 "Would you like to go back to stable?"> +<!ENTITY https-everywhere.popup.paragraph2 "നിങ്ങൾ തിരികെ സ്ഥിരതയുള്ള പതിപ്പിലേക്ക് പോകാൻ ആഗ്രഹിക്കുന്നുണ്ടോ?"> <!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere(a)eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere."> -<!ENTITY https-everywhere.popup.keep "Keep me on the development version"> -<!ENTITY https-everywhere.popup.revert "Download the latest stable version"> +<!ENTITY https-everywhere.popup.keep "വികസന പതിപ്പിൽ എന്നെ നിലനിർത്തുക"> +<!ENTITY https-everywhere.popup.revert "പുതിയ സ്ഥിരതയുള്ള പതിപ്പ് ഡൗൺലോഡ്"> <!ENTITY https-everywhere.ruleset-tests.status_title "HTTPS Everywhere Ruleset Tests"> <!ENTITY https-everywhere.ruleset-tests.status_cancel_button "Cancel"> -<!ENTITY https-everywhere.ruleset-tests.status_start_button "Start"> +<!ENTITY https-everywhere.ruleset-tests.status_start_button "ആരംഭിക്കുക"> [View Less]

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit 9e96ca6fa8983562355754cbf023eb38269cb96f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 11:15:11 2015 +0000 Update translations for whisperback --- ml/ml.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ml/ml.po b/ml/ml.po index 12909c7..19a3c17 100644 --- a/ml/ml.po +++ b/ml/ml.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/… [View More]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit 479b4762f9aafb5e8e68f8b05c90c5ac3519c6b0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 10:45:53 2015 +0000 Update translations for torbutton-torbuttondtd --- ml/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ml/torbutton.dtd b/ml/torbutton.dtd index 927d1b9..184e7b8 100644 --- a/ml/torbutton.dtd +++ b/ml/torbutton.dtd @@ -32,7 +32,7 @@ <!ENTITY torbutton.context_menu.preferences.key "P"> <!… [View More]

1 0

[tor-messenger-build/master] Rebase patches
by arlo＠torproject.org 08 Nov '15

08 Nov '15

commit 392518c6da62a2aab39c33725983b7667f28262b Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 7 19:43:38 2015 -0800 Rebase patches --- projects/instantbird/trac-16476.patch | 31 +++++++++++++++---------------- projects/instantbird/trac-17552.patch | 18 +++++++++--------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/projects/instantbird/trac-16476.patch b/projects/instantbird/trac-16476.patch index 96eabb4..720a470 100644 --- a/projects/… [View More]instantbird/trac-16476.patch +++ b/projects/instantbird/trac-16476.patch @@ -1,38 +1,37 @@ # HG changeset patch # User aleth <aleth(a)instantbird.org> -# Date 1446853955 -3600 -# Sat Nov 07 00:52:35 2015 +0100 -# Node ID 1f09dc616d2e058779753327637b85f6dcc0bbf1 -# Parent 073468887b0faecb810a6e4463a2806924fead81 +# Date 1446954539 28800 +# Sat Nov 07 19:48:59 2015 -0800 +# Branch GECKO410b1_2015090809_RELBRANCH +# Node ID 47ab76be5ae63ddaef16a424243ed3acc403f94f +# Parent 492c769c46c9ea9e54fab00d6f0310afd100885a Bug 1222238 - Avoid hang in proxy preferences pane. r=clokep diff --git a/im/content/preferences/messagestyle.js b/im/content/preferences/messagestyle.js --- a/im/content/preferences/messagestyle.js +++ b/im/content/preferences/messagestyle.js -@@ -169,22 +169,20 @@ var previewObserver = { +@@ -166,16 +166,24 @@ var previewObserver = { + this.browser._theme = this.theme; + Services.obs.addObserver(this, "conversation-loaded", false); + }, observe: function(aSubject, aTopic, aData) { if (aTopic != "conversation-loaded" || aSubject != this.browser) return; - // We want to avoid the convbrowser trying to scroll to the last - // added message, as that causes the entire pref pane to jump up - // (bug 1179943). Therefore, we override the method convbrowser -- // uses to determine if there are further messages pending to be -- // added. The +1 ensures no scroll occurs after we add the last -- // message here. -- this.browser._autoScrollEnabled = false; -- this.browser.getPendingMessagesCount = -- () => previewObserver.conv.messages.length + 1; ++ // We want to avoid the convbrowser trying to scroll to the last ++ // added message, as that causes the entire pref pane to jump up ++ // (bug 1179943). Therefore, we override the method convbrowser + // uses to determine if it should scroll, as well as its + // mirror in the contentWindow (that messagestyle JS can call). + this.browser.autoScrollEnabled = () => false; + this.browser.contentWindow.autoScrollEnabled = () => false; - ++ // Display all queued messages. Use a timeout so that message text // modifiers can be added with observers for this notification. setTimeout(function() { - for (let message of previewObserver.conv.messages) + for each (let message in previewObserver.conv.messages) aSubject.appendMessage(message, false); }, 0); + Services.obs.removeObserver(this, "conversation-loaded"); diff --git a/projects/instantbird/trac-17552.patch b/projects/instantbird/trac-17552.patch index f4ff411..442bbe9 100644 --- a/projects/instantbird/trac-17552.patch +++ b/projects/instantbird/trac-17552.patch @@ -1,15 +1,15 @@ # HG changeset patch # User Arlo Breault <arlolra(a)gmail.com> -# Date 1446859847 28800 -# Fri Nov 06 17:30:47 2015 -0800 -# Node ID b9b0e61d9a2d5092d45b309feb4ae526ae00519c -# Parent 073468887b0faecb810a6e4463a2806924fead81 +# Date 1446953889 28800 +# Sat Nov 07 19:38:09 2015 -0800 +# Node ID a42c96a62dee7a73910de738a9809d8247aede8c +# Parent 492c769c46c9ea9e54fab00d6f0310afd100885a Ensure isMuc when attempting a subject change diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm -@@ -1718,16 +1718,17 @@ var XMPPAccountPrototype = { +@@ -1343,16 +1343,17 @@ const XMPPAccountPrototype = { return null; }, @@ -21,13 +21,13 @@ diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm + let isMuc = this._mucs.has(norm); let type = aStanza.attributes["type"]; - let x = aStanza.getElement(["x"]); let body; let b = aStanza.getElement(["body"]); if (b) { // If there's a <body> child we have more than just typing notifications. // Prefer HTML (in <html><body>) and use plain text (<body>) as fallback. -@@ -1738,17 +1739,21 @@ var XMPPAccountPrototype = { + let htmlBody = aStanza.getElement(["html", "body"]); +@@ -1362,17 +1363,21 @@ const XMPPAccountPrototype = { // Even if the message is in plain text, the prplIMessage // should contain a string that's correctly escaped for // insertion in an HTML document. @@ -50,7 +50,7 @@ diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm // before 15.06. let muc = this._mucs.get(norm); let nick = this._parseJID(from).resource; -@@ -1763,18 +1768,18 @@ var XMPPAccountPrototype = { +@@ -1386,18 +1391,18 @@ const XMPPAccountPrototype = { let delay = aStanza.getElement(["delay"]); if (delay && delay.uri == Stanza.NS.delay) { if (delay.attributes["stamp"]) @@ -71,7 +71,7 @@ diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm return; } -@@ -1840,17 +1845,17 @@ var XMPPAccountPrototype = { +@@ -1454,17 +1459,17 @@ const XMPPAccountPrototype = { if (state) { this.DEBUG(state); if (state == "composing") [View Less]

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit 7735cbc9dee55f552c39e2ddd813cdffa97a0a3f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 01:15:43 2015 +0000 Update translations for liveusb-creator_completed --- ru/ru.po | 140 ++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 64 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 2eaebcc..be23a37 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -4,6 +4,7 @@ # # Translators: # Анатолий Гуськов <… [View More]anatoliy.guskov(a)gmail.com>, 2009 +# Antony A. Tolmachev <a.tolmachev(a)richart-consalt.ru>, 2015 # Den Arefyev <>, 2012 # Evgrafov Denis <stereodenis(a)gmail.com>, 2014 # Eugene, 2013 @@ -16,13 +17,14 @@ # Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>, 2015 # vlasok <vlasok1987(a)yandex.ru>, 2012 # Yulia <ypoyarko(a)redhat.com>, 2009 +# Кирсанов Тимур Михаилович <asassson(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-04 10:45+0200\n" -"PO-Revision-Date: 2015-08-10 12:09+0000\n" -"Last-Translator: Ivan\n" +"POT-Creation-Date: 2015-11-02 21:23+0100\n" +"PO-Revision-Date: 2015-11-08 01:01+0000\n" +"Last-Translator: Кирсанов Тимур Михаилович <asassson(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +40,7 @@ msgstr "\"Клонирование & Установка\"" msgid "\"Install from ISO\"" msgstr "\"Установка с ISO\"" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153 #, python-format msgid "%(distribution)s Installer" msgstr "Установщик %(distribution)s" @@ -63,51 +65,61 @@ msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" msgid "%s already bootable" msgstr "%s уже загрузочный" -#: ../liveusb/launcher_ui.py:156 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Нужна помощь? Изучите </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">документацию</span></a><span style=\" font-size:11pt;\">.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:151 -msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Копировать запущенную Tails на USB брелок или карту SD. Все данные на носителе будут удалены.</span></p></body></html>" - -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Копировать запущенную Tails на ранее созданный носитель Tails. Другие разделы на носителе будут сохранены.</span></p></body></html>" +"</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a>.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Нужна помощь? Прочитайте <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">документацию</span></a>.</p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" -"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" -"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" -"p, li { white-space: pre-wrap; }\n" -"</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:11pt;\">Обновить ранее созданный носитель Tails, используя новый образ ISO.</span></p></body></html>" +"<ul>\n" +"<li>Install Tails on another USB stick by copying the Tails system that you are currently using..</li>\n" +"\n" +"<li>The USB stick that you install on is formatted and all data is lost.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Установить Tails на другую флэшку копированием ОС Tails, которую Вы уже используете..</li>\n\n<li>Целевой накопитель будет отформатирован и все данные на нем стерты</li>\n\n<li>Текущее используемое Вами зашифрованное хранилище на флэшке с ОС Tails не скопировано.</li>\n\n</ul>" + +#: ../liveusb/launcher_ui.py:157 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the same version of Tails that you are currently using.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Обновите версию другой флешки Tails до ныне используемой вами версии Tails.</li>\n\n<li>Зашифрованное постоянное хранилище обновляемой Флешки Tails будет сохранено.</li>\n\n<li>Зашифрованное постоянное хранилище ныне используемой Флешки Tails не скопировано.</li>\n\n\n</ul>" + +#: ../liveusb/launcher_ui.py:159 +msgid "" +"<ul>\n" +"<li>Upgrade another Tails USB stick to the version of an ISO image.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you upgrade is preserved.</li>\n" +"\n" +"<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" +"\n" +"</ul>" +msgstr "<ul>\n<li>Обновить другую флешку Tails до верисии ISO образа.</li>\n\n<li>Зашифрованное постоянное хранилище обновляемой Флешки Tails сохранено.</li>\n\n<li>Зашифрованное постоянное хранилище ныне используемой Флешки Tails не скопировано.</li>\n\n</ul>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:161 msgid "Alt+B" msgstr "Alt+B" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:160 msgid "Browse" msgstr "Просмотр" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:167 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -129,20 +141,6 @@ msgstr "Невозможно найти" msgid "Cannot find device %s" msgstr "Устройство %s не найдено" -#: ../liveusb/launcher_ui.py:150 -msgid "" -"Clone\n" -"&&\n" -"Install" -msgstr "Клонировать\n&&\nУстановить" - -#: ../liveusb/launcher_ui.py:152 -msgid "" -"Clone\n" -"&&\n" -"Upgrade" -msgstr "Клонировать\n&&\nОбновить" - #: ../liveusb/creator.py:417 #, python-format msgid "Creating %sMB persistent overlay" @@ -153,7 +151,7 @@ msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Устройство пока не примонтировано, поэтому нельзя определить количество свободного места." -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:164 #, python-format msgid "Download %(distribution)s" msgstr "Загрузка %(distribution)s" @@ -213,13 +211,19 @@ msgstr "Проверка контрольной суммы MD5 ISO-файла п msgid "ISO MD5 checksum verification failed" msgstr "Проверка контрольной суммы MD5 ISO-файла не пройдена" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:163 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Если вы не выберете существующий Live ISO, выбранные релиз будет загружен для вас." -#: ../liveusb/dialog.py:165 +#: ../liveusb/launcher_ui.py:154 +msgid "" +"Install\n" +"by cloning" +msgstr "Установить\nклонированием" + +#: ../liveusb/dialog.py:172 msgid "Install Tails" msgstr "Установить Tails" @@ -301,7 +305,7 @@ msgstr "Разметка устройства %(device)s" msgid "Persistent Storage" msgstr "Постоянное хранилище" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:168 msgid "Persistent Storage (0 MB)" msgstr "Постоянное хранилище (0 MB)" @@ -355,7 +359,7 @@ msgstr "Тип источника не поддерживает проверку msgid "Synchronizing data on disk..." msgstr "Сихронизирую данные на диске..." -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:166 msgid "Target Device" msgstr "Целевое устройство" @@ -379,14 +383,14 @@ msgid "" "A more detailed error log has been written to '%(filename)s'." msgstr "Ошибка выполнения команды: `%(command)s`.⏎\nПодробный журнал ошибок сохранён в '%(filename)s'." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:158 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "Кнопка просмотра существующего ISO файла живой системы, который Вы скачали до этого. Если Вы его не выберите, то релиз будет скачан автоматически." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:171 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -394,19 +398,19 @@ msgid "" "installing the bootloader." msgstr "Кнопка запуска создания LiveUSB. Это может привести к скачиванию релиза (если не выбран один из имеющихся), распаковке ISO на USB-устройство, созданию постоянного хранилища и установке загрузчика." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:165 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "Это USB-накопитель на который вы собираетесь установить Live-систему. Устройство должно быть отформатировано в FAT." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:170 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Это прогресс-бар, который показывает как долго остается до завершения установки LiveUSB." -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:169 msgid "This is the status console, where all messages get written to." msgstr "Это консоль состояния, куда пишутся все сообщения." @@ -535,11 +539,19 @@ msgstr "Неподдерживаемая файловая система: %s\nП msgid "Updating properties of system partition %(system_partition)s" msgstr "Обновление свойств системного раздела %(system_partition)s" -#: ../liveusb/launcher_ui.py:154 -msgid "Upgrade from ISO" -msgstr "Обновить из ISO" +#: ../liveusb/launcher_ui.py:156 +msgid "" +"Upgrade\n" +"by cloning" +msgstr "Обновить\nклонированием" + +#: ../liveusb/launcher_ui.py:158 +msgid "" +"Upgrade\n" +"from ISO" +msgstr "Обновить\nс ISO-образа" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:159 msgid "Use existing Live system ISO" msgstr "Использовать существующий Live ISO" @@ -605,6 +617,6 @@ msgstr "Вы можете попробовать продолжить загру msgid "You must run this application as root" msgstr "Нужно запускать это приложение из-под root" -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:162 msgid "or" msgstr "или" [View Less]

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit e78e02a24661bd5e6f6b3b0b4f8bcb1a5ea8277f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 01:15:36 2015 +0000 Update translations for liveusb-creator --- ru/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 8751b39..be23a37 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 … [View More]21:23+0100\n" -"PO-Revision-Date: 2015-11-08 00:43+0000\n" +"PO-Revision-Date: 2015-11-08 01:01+0000\n" "Last-Translator: Кирсанов Тимур Михаилович <asassson(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ msgid "" "\n" "\n" "</ul>" -msgstr "<ul>\n<li>Обновите версию другой флешки Tails до ныне используемой вами версии Tails.</li>\n\n<li>Зашифрованное постоянное хранилище Флешки Tails будет сохранено при обновлении.</li>\n\n<li>Зашифрованное постоянное хранилище ныне используемой Флешки Tails не скопировано.</li>\n\n\n</ul>" +msgstr "<ul>\n<li>Обновите версию другой флешки Tails до ныне используемой вами версии Tails.</li>\n\n<li>Зашифрованное постоянное хранилище обновляемой Флешки Tails будет сохранено.</li>\n\n<li>Зашифрованное постоянное хранилище ныне используемой Флешки Tails не скопировано.</li>\n\n\n</ul>" #: ../liveusb/launcher_ui.py:159 msgid "" @@ -109,7 +109,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>Обновить другую флешку Tails до верисии ISO образа.</li>\n\n<li>Зашифрованное постоянное хранилище обновляемой Флешки Tails сохранено.</li>\n\n<li>Зашифрованное постоянное хранилище ныне используемой Флешки Tails не скопировано.</li>\n\n</ul>" #: ../liveusb/dialog.py:161 msgid "Alt+B" [View Less]

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit a3c5d4f2c55ebc8a47955d033a8f1e1939fd175a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 00:45:25 2015 +0000 Update translations for liveusb-creator --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index 94348f1..8751b39 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -17,13 +17,14 @@ # Vladimir.Serykh <Vladimir.Serykh(a)extenza-studio.ru>, 2015 # vlasok <vlasok1987(a)yandex.ru… [View More]

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit b8cd6ebabd0092052703f8fdec666770c1a026d6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 00:45:21 2015 +0000 Update translations for https_everywhere_completed --- ru/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index e7cc04b..5990746 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -… [View More]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 08 Nov '15

08 Nov '15

commit 173548e484982375289a5f1bc7a18725b918d563 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 8 00:45:15 2015 +0000 Update translations for https_everywhere --- ru/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/https-everywhere.properties b/ru/https-everywhere.properties index e7cc04b..5990746 100644 --- a/ru/https-everywhere.properties +++ b/ru/https-everywhere.properties @@ -1,8 +1,8 @@… [View More]

1 0