June 2014 - tor-commits - lists.torproject.org

[tor-launcher/master] Bug 11471: Text does not fit the dialog size.
by brade＠torproject.org 30 Jun '14

30 Jun '14

commit c1f170510a8b8a9ad79b181f412c4355e9312056 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 11:22:59 2014 -0400 Bug 11471: Text does not fit the dialog size. This is a partial fix (network settings wizard only). Also fixed a nuisance: the torWarning CSS class was being added more than once to the "Copy Tor Log To Clipboard" button. --- src/chrome/content/network-settings.js | 66 +++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index c6b6cf2..2f1d619 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -177,10 +177,50 @@ function initDialog() showPanel(); } + // Resize this window to fit content. sizeToContent() alone will not do + // the job (it has many limitations and it is buggy). + sizeToContent(); + let w = maxWidthOfContent(); + if (w) + { + let windowFrameWidth = window.outerWidth - window.innerWidth; + w += windowFrameWidth; + + if (w > window.outerWidth) + window.resizeTo(w, window.outerHeight); + } + TorLauncherLogger.log(2, "initDialog done"); } +// For now, we assume that the wizard buttons are the widest portion. +// TODO: return a value for the settings dialog (non-wizard case). +function maxWidthOfContent() +{ + let haveWizard = (getWizard() != null); + if (!haveWizard) + return undefined; + + // Show all buttons so we can get an accurate width measurement. + // They will be hidden, as necessary, by the wizard. + let buttons = "back,next,cancel,extra2,help".split(','); + for (let i = 0; i < buttons.length; ++i) + showOrHideButton(buttons[i], true, false); + + let btn = document.documentElement.getButton("cancel"); + let btnContainer = btn.parentElement; + + const kWarningIconWidth = 20; // skin/warning.png is 16 plus some margin + let r = btnContainer.getBoundingClientRect(); + + // Hide copy log button if appropriate. + restoreCopyLogVisibility(); + + return Math.ceil((2 * r.left) + r.width + kWarningIconWidth); +} + + function getWizard() { var elem = document.getElementById("TorNetworkSettings"); @@ -434,13 +474,31 @@ function showCopyLogButton(aHaveErrorOrWarning) if (aHaveErrorOrWarning) { var clz = copyLogBtn.getAttribute("class"); - copyLogBtn.setAttribute("class", clz ? clz + " torWarning" - : "torWarning"); + if (!clz) + copyLogBtn.setAttribute("class", "torWarning"); + else if (clz.indexOf("torWarning") < 0) + copyLogBtn.setAttribute("class", clz + " torWarning"); } } } +function restoreCopyLogVisibility() +{ + if (!getWizard()) + return; + + var copyLogBtn = document.documentElement.getButton("extra2"); + if (!copyLogBtn) + return; + + if (copyLogBtn.hasAttribute("wizardCanCopyLog")) + copyLogBtn.removeAttribute("hidden"); + else + copyLogBtn.setAttribute("hidden", true); +} + + function showOrHideButton(aID, aShow, aFocus) { var btn = setButtonAttr(aID, "hidden", !aShow); @@ -649,9 +707,7 @@ function closeHelp() { showOrHideButton("cancel", true, false); showOrHideButton("back", true, false); - var copyLogBtn = document.documentElement.getButton("extra2"); - if (copyLogBtn && copyLogBtn.hasAttribute("wizardCanCopyLog")) - copyLogBtn.removeAttribute("hidden"); + restoreCopyLogVisibility(); restoreButtonLabel("next"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance)

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit 8a333854b0deb1c2fe5ff265aa56ce68a0da48b2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:46:03 2014 +0000 Update translations for tor-and-https_completed --- nn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn.po b/nn.po index 68254f0..9b8cbe1 100644 --- a/nn.po +++ b/nn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-30 15:13+0000\n" +"PO-Revision-Date: 2014-06-30 15:24+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit fc9b257d725ca5983b6933ac8a9cde150a546b72 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:46:01 2014 +0000 Update translations for tor-and-https --- nn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn.po b/nn.po index 68254f0..9b8cbe1 100644 --- a/nn.po +++ b/nn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-30 15:13+0000\n" +"PO-Revision-Date: 2014-06-30 15:24+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit 3aedbb18871846d2399ba289c1a32b0b1ea48ee7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:44 2014 +0000 Update translations for tails-misc --- nn.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/nn.po b/nn.po index c42cb78..e66ba8b 100644 --- a/nn.po +++ b/nn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-08 19:08+0200\n" +"PO-Revision-Date: 2014-06-30 15:41+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,11 +50,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" -msgstr "" +msgstr "Avslutt" #: config/chroot_local-includes/usr/local/bin/gpgApplet:141 msgid "About" -msgstr "" +msgstr "Om" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" @@ -95,25 +96,25 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" -msgstr "Name" +msgstr "Namn" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "Nøkkel-ID" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" -msgstr "" +msgstr "Status" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "Fingeravrykk:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Brukar-ID:" +msgstr[1] "Brukar-IDar:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" @@ -121,7 +122,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Vel mottakarar:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" @@ -139,11 +140,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" -msgstr "" +msgstr "Vel nøklar" #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid "Do you trust these keys?" -msgstr "" +msgstr "Stolar du på desse nøklane?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:"

1 0

[translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit eeb27d22c96381d71168b3e20582471cfdd6daca Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:40 2014 +0000 Update translations for tor-launcher-progress_completed --- nn/progress.dtd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nn/progress.dtd b/nn/progress.dtd new file mode 100644 index 0000000..90fe3e6 --- /dev/null +++ b/nn/progress.dtd @@ -0,0 +1,4 @@ +<!ENTITY torprogress.dialog.title "Tor-status"> +<!ENTITY torprogress.openSettings "Opne innstillingar"> +<!ENTITY torprogress.heading "Koplar til Tor-nettverket"> +<!ENTITY torprogress.pleaseWait "Gjer vel og vent medan me opprettar samband med Tor-nettverket.">

1 0

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit 9792f9725d8a306a6fc67723a2a8371cbf709179 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:37 2014 +0000 Update translations for tor-launcher-progress --- nn/progress.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nn/progress.dtd b/nn/progress.dtd index ebd9cef..90fe3e6 100644 --- a/nn/progress.dtd +++ b/nn/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "Tor-status"> +<!ENTITY torprogress.openSettings "Opne innstillingar"> +<!ENTITY torprogress.heading "Koplar til Tor-nettverket"> +<!ENTITY torprogress.pleaseWait "Gjer vel og vent medan me opprettar samband med Tor-nettverket.">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit 5cbdd4f9ba853acec38f5b5b0f47d0a033df13ed Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:34 2014 +0000 Update translations for tor-launcher-properties --- nn/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/torlauncher.properties b/nn/torlauncher.properties index 8d77b2e..dff0859 100644 --- a/nn/torlauncher.properties +++ b/nn/torlauncher.properties @@ -31,7 +31,7 @@ torlauncher.recommended_bridge=(tilrådd) torlauncher.connect=Connect torlauncher.quit=Quit -torlauncher.quit_win=Exit +torlauncher.quit_win=Avslutt torlauncher.done=Done torlauncher.forAssistance=For assistance, contact %S @@ -43,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Koplar til Tor-nettverket torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network!

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit de59c3447dd03706a6c23fe3aaf72285971db5a1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:30 2014 +0000 Update translations for mat-gui --- nn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn.po b/nn.po index 0df74ed..fa4107f 100644 --- a/nn.po +++ b/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-04-29 01:20+0000\n" +"PO-Revision-Date: 2014-06-30 15:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit b486083c3c96b1f37f67a024cc3e773c312b2f0b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:12 2014 +0000 Update translations for whisperback --- nn/nn.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 74db4af..0678018 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-09-17 13:13+0000\n" -"Last-Translator: Tor Project <support-team-private(a)lists.torproject.org>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-03-17 17:40+0100\n" +"PO-Revision-Date: 2014-06-30 15:41+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,16 +46,16 @@ msgstr "" #: ../whisperBack/gui.py:220 msgid "Sending mail..." -msgstr "" +msgstr "Sender e-post " #: ../whisperBack/gui.py:221 msgid "Sending mail" -msgstr "" +msgstr "Sender e-post" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "" +msgstr "Dette kan ta ei stund " #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." @@ -135,7 +136,7 @@ msgstr "" #: ../data/whisperback.ui.h:3 msgid "https://tails.boum.org/" -msgstr "" +msgstr "https://tails.boum.org/" #: ../data/whisperback.ui.h:4 msgid "" @@ -164,7 +165,7 @@ msgstr "" #: ../data/whisperback.ui.h:22 msgid "Summary" -msgstr "" +msgstr "Oppsummering" #: ../data/whisperback.ui.h:23 msgid "Bug description" @@ -176,7 +177,7 @@ msgstr "" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "" +msgstr "valfri PGP-nøkkel" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" @@ -184,7 +185,7 @@ msgstr "" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "" +msgstr "overskrifter" #: ../data/whisperback.ui.h:28 msgid "debugging info" @@ -192,8 +193,8 @@ msgstr "" #: ../data/whisperback.ui.h:29 msgid "Help" -msgstr "Help" +msgstr "Hjelp" #: ../data/whisperback.ui.h:30 msgid "Send" -msgstr "" +msgstr "Send"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 30 Jun '14

30 Jun '14

commit 503e513583010ece859013503d310ed0a5d50323 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 15:45:02 2014 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 163 +++++++++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 69 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index fb6c62e..f490959 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-17 09:08+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-30 15:31+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,29 +21,26 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Orsak! Noko gjekk gale med førespurnaden din." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[Dette er ei automatisk melding; gjer vel og ikkje svar.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "Her er bruene dine:" #: lib/bridgedb/strings.py:22 #, python-format @@ -56,39 +54,44 @@ msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" msgstr "" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." msgstr "" -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -98,14 +101,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -114,20 +123,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "" +msgstr "Kva er bruer?" -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Eg treng ein alternativ måte å få bruer på!" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -135,75 +144,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Brua mi verkar ikkje! Eg treng hjelp!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "" -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Treng du IPv6-adresser?" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Treng du %s?" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "" +msgstr "Korleis starta å bruka bruer" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -211,34 +228,39 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "" +msgstr "Rapporter feil" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "Kjeldekode" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" @@ -248,15 +270,19 @@ msgstr "" msgid "Contact" msgstr "" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -266,27 +292,27 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Steg %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Last ned %s Tor-nettlesaren %s" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Steg %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Hent %s bruer %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Steg %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format @@ -297,28 +323,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "Avanserte innstillingar" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "" -#: lib/bridgedb/templates/options.html:90 +#: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "ingen" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -326,7 +351,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0