[tor-commits] [translation/bridgedb] Update translations for bridgedb

Tue Oct 13 15:45:06 UTC 2015

commit 4da95713438efb54f1ff6ac0d9d079e5d59973b1
Author: Translation commit bot <translation at torproject.org>
Date:   Tue Oct 13 15:45:04 2015 +0000

    Update translations for bridgedb
---
 nb/LC_MESSAGES/bridgedb.po |  344 ++++++++++++++++++++++----------------------
 sr/LC_MESSAGES/bridgedb.po |  338 +++++++++++++++++++++----------------------
 2 files changed, 343 insertions(+), 339 deletions(-)

diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 0e00bac..2e61082 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -4,23 +4,25 @@
 # 
 # Translators:
 # Allan NordhÃ¸y <epost at anotheragency.no>, 2014
-# Erik Matson <erik at norwenglish.net>, 2015
+# Erik Matson, 2015
 # Harald <haarektrans at gmail.com>, 2014
 # Kristian Andre Henriksen <kris.andre.h at gmail.com>, 2015
 # lateralus, 2013
+# PÃ¥l Fiksdal <plf715 at gmail.com>, 2015
 # Per Thorsheim <transifex at thorsheim.net>, 2015
 # thor574 <thor.hovden at gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 12:17+0000\n"
-"Last-Translator: Erik Matson <erik at norwenglish.net>\n"
-"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/projects/p/torproject/language/nb/)\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2015-10-13 15:27+0000\n"
+"Last-Translator: PÃ¥l Fiksdal <plf715 at gmail.com>\n"
+"Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -35,57 +37,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Dette var leit! Noe gikk galt med forespÃ¸rselen din."
+msgstr "Beklager! Noe gikk galt med forespÃ¸rselen din."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapporter en feil"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kildekode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Endringslogg"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Velg alle"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Vis QR kode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kode for dine brolinjer"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oisann!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Det oppsto en feil ved innhenting av din QR kode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Det er for tiden ingen tilgjengelige broer..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Steg %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Last ned %s Tor-nettleser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Steg %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hent %s broer %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Steg %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "NÃ¥ %s legg til broer til Tor-nettleser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sare gi meg noen broer!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Avanserte valg"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+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."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sa!"
+
+#. 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sT%silknytt broer"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[Dette er en automatisert melding; vennligst ikke svar.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Her er dine broer:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Du har gÃ¥tt over hastighetsbegrensningen. Vennligst ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre eposter i denne tidsperioden vil bli ignorert."
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "KOMMANDOer: (kombiner KOMMANDer to Ã¥ angi flere valg samtidig)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Velkommen til BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "NÃ¥vÃ¦rende stÃ¸ttede transport TYPEr:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Hei, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Hallo, lille venn!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "Offentlige nÃ¸kler"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +223,7 @@ msgstr "Denne e-posten ble laget med regnbuer, enhjÃ¸rninger og stjerneskudd for
 #. 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
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,7 +234,7 @@ msgid ""
 msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med Ã¥ tilslÃ¸re dine tilkoblinger til Tor-nettverket, noe som gjÃ¸r det\nvanskelig for noen som overvÃ¥ker din internett-trafikk Ã¥ fastsette hvorvidt du\nbruker Tor eller ei\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -119,7 +246,7 @@ msgstr "Noen broer med IPv6-adresser er ogsÃ¥ tilgjelgelige, dog er noen pluggba
 #. 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
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -128,20 +255,20 @@ msgid ""
 "\n"
 msgstr "Merk ogsÃ¥, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke hÃ¸res sÃ¥ tÃ¸ft ut, men de kan fremdeles\nbehjelpe omgÃ¥else av internettsensur i de fleste fall.\n\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Hva er broer?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s Broer %s er Tor-tilknyttninger som hjelper deg med Ã¥ omgÃ¥ sensur."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "Jeg trenger en alternativ mÃ¥te Ã¥ fÃ¥ broer pÃ¥!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +276,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "En annen mÃ¥te tilknytte seg broer er Ã¥ sende en e-post til %s. Merk at du mÃ¥ sende\ne-post fra en adresse tilhÃ¸rende en av fÃ¸lgende e-posttilbydere:\n%s, %s eller %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
@@ -162,48 +289,48 @@ msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
 #. 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
+#: bridgedb/strings.py:121
 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 "PrÃ¸v Ã¥ fÃ¥ med sÃ¥ mye info om dit tilfelle du kan, inkludert en liste over\nbroene og pluggbare transporter du prÃ¸vde Ã¥ bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor mÃ¥tte produsere, osv."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Her er dine bro-linjer:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "FÃ¥ broer!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "GjÃ¸r valg for brotype:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Trenger du IPv6-adresser?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Trenger du en %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Nettleseren din viser ikke bilder ordentlig."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Skriv inn bokstavene fra bildet ovenfor..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "Hvordan starte med bruk av dine broer"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,175 +339,50 @@ msgid ""
 msgstr "For Ã¥ sette opp broer i Tor Browser, fÃ¸rst gÃ¥ til %s Tor Browser download\nsiden %s fÃ¸lg sÃ¥ instruksene for nedlasting og start av Tor Browser."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "NÃ¥r 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk pÃ¥ 'oppsett' og fÃ¸lg\nveiviseren til den forespÃ¸r:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Sensurerer, eller blokkerer pÃ¥ annen mÃ¥te, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ sette opp nye broer, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
+msgstr "Velg 'Ja' og klikk sÃ¥ 'Neste'. For Ã¥ konfigurere de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde vÃ¦re klar til kamp! Hvis du fÃ¥r problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "Vis denne meldingen."
 
 #. 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:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Be om broer med \"vanilla\" fabrikkoppsett."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "EtterspÃ¸r IPv6-broer."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Be om en pluggbar transport etter TYPE."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "FÃ¥ kopi av BridgeDBs offentlige GnuPG-nÃ¸kkel."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporter en feil"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kildekode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Endringslogg"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Velg alle"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Vis QR kode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kode for dine brolinjer"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oisann!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Det oppsto en feil ved innhenting av din QR kode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for Ã¥ kopiere dine brolinjer over pÃ¥ mobile og andre enheter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Det er for tiden ingen tilgjengelige broer..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Kanskje du bÃ¸r prÃ¸ve %s gÃ¥ tilbake til %s og velge en annen brotype!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Steg %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Last ned %s Tor-nettleser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Steg %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hent %s broer %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Steg %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "NÃ¥ %s legg til broer til Tor-nettleser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sB%sare gi meg noen broer!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Avanserte valg"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nei"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%sa!"
-
-#. 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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sT%silknytt broer"
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 105597e..f1b0c85 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -5,19 +5,21 @@
 # Translators:
 # obj.petit.a, 2014
 # Ivan Radeljic <radeljicivan85 at gmail.com>, 2014-2015
+# Lidija <llazic.bgd at gmail.com>, 2015
 # Milenko Doder <milenko.doder at gmail.com>, 2015
 # obj.petit.a, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-10 09:32+0000\n"
-"Last-Translator: Milenko Doder <milenko.doder at gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/p/torproject/language/sr/)\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2015-10-13 15:42+0000\n"
+"Last-Translator: Lidija <llazic.bgd at gmail.com>\n"
+"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
@@ -32,57 +34,182 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
 msgstr "Ð˜Ð·Ð²Ð¸Ð½Ð¸Ñ‚Ðµ! ÐÐµÑˆÑ‚Ð¾ ÑÐµ Ð»Ð¾ÑˆÐµ Ð´ÐµÑÐ¸Ð»Ð¾ ÑÐ° Ð²Ð°ÑˆÐ¸Ð¼ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð¾Ð¼."
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ Ð³Ñ€ÐµÑˆÐºÑƒ."
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Ð˜Ð·Ð²Ð¾Ñ€Ð½Ð¸ ÐºÐ¾Ð´"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Promena loga"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ÐžÐ±ÐµÐ»ÐµÐ¶Ð¸ ÑÐ²Ðµ"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR ÐºÐ¾Ð´ Ð·Ð° Ð²Ð°ÑˆÐµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ"
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ð£Ñ…, ÑÑ‚Ñ€Ð°ÑˆÐ½Ð¾!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ð”Ð¾ÑˆÐ»Ð¾ Ñ˜Ðµ Ð´Ð¾ Ð³Ñ€ÐµÑˆÐºÐµ Ð¿Ñ€Ð¸ Ð½Ð°Ð±Ð°Ð²Ð»Ñ˜Ð°ÑšÑƒ Ð²Ð°ÑˆÐµÐ³ QR kÐ¾Ð´Ð°."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "QR ÐºÐ¾Ð´ ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð²Ð°ÑˆÐµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ. Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ñ˜ÐµÑ‚ Ð³Ð° ÑÐ° Ñ‡Ð¸Ñ‚Ð°Ñ›ÐµÐ¼ QR ÐºÐ¾Ð´Ð° Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¸ÑÐºÐ¾Ð¿Ð¸Ñ€Ð°Ð»Ð¸ Ð²Ð°ÑˆÐµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ Ð½Ð° Ð¼Ð¾Ð±Ð»Ð¸Ð½Ðµ ÐºÐ°Ð¾ Ð¸ Ð½Ð° Ð´Ñ€ÑƒÐ³Ðµ ÑƒÑ€ÐµÑ’Ð°Ñ˜Ðµ."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ÐœÐ¾Ð¶Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ñ‚Ñ€ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑƒÑˆÐ°Ñ‚Ðµ %s Ð´Ð° ÑÐµ Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ñƒ Ð²Ñ€ÑÑ‚Ñƒ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ÐšÐ¾Ñ€Ð°Ðº %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸Ñ‚Ðµ %s Ð¢Ð¾Ñ€ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ÐšÐ¾Ñ€Ð°Ðº %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ð”Ð¾Ð±Ð¸Ñ˜Ñ‚Ðµ %s Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ÐšÐ¾Ñ€Ð°Ðº %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ˜Ñ‚Ðµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ Ñƒ Ð¢Ð¾Ñ€ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ˜ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ†Ð¸Ñ˜Ðµ"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ÐÐµ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ð½ÐµÐ¼Ð°"
+
+#. 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."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÐ¢%sÐ¾!"
+
+#. 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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sÐ”%sÐ¾Ð±Ð¸Ñ˜Ñ‚Ðµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ"
+
+#: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
 msgstr "[ÐžÐ²Ð¾ Ñ˜Ðµ Ð°ÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ° Ð¿Ð¾Ñ€ÑƒÐºÐ°; Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð²Ð°Ñ Ð´Ð° Ð½Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ€Ð°Ñ‚Ðµ.]"
 
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
 msgid "Here are your bridges:"
 msgstr "Ð•Ð²Ð¾ Ð’Ð°ÑˆÐ¸Ñ… Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°:"
 
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
 #, python-format
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time between\n"
 "emails is %s hours. All further emails during this time period will be ignored."
 msgstr "Ð”Ð¾ÑÑ‚Ð¸Ð³Ð»Ð¸ ÑÑ‚Ðµ Ð²Ð°Ñˆ Ð»Ð¸Ð¼Ð¸Ñ‚. ÐœÐ¾Ð»Ð¸Ð¼, ÑƒÑÐ¿Ð¾Ñ€Ð¸Ñ‚Ðµ! ÐœÐ¸Ð½Ð¸Ð¼Ð°Ð»Ð½Ð¾ Ð²Ñ€ÐµÐ¼Ðµ Ð¸Ð·Ð¼ÐµÑ’Ñƒ\nÐµ-Ð¿Ð¾ÑˆÑ‚Ðµ Ñ˜Ðµ %s ÑÐ°Ñ‚Ð¸. Ð¡Ð²Ð° Ð½Ð°Ñ€ÐµÐ´Ð½Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ñ‚Ð¾ÐºÐ¾Ð¼ Ð¾Ð²Ð¾Ð³ Ð¿ÐµÑ€Ð¸Ð¾Ð´Ð° Ð±Ð¸Ñ›Ðµ Ð¸Ð³Ð½Ð¾Ñ€Ð¸ÑÐ°Ð½Ð°.  "
 
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
 msgstr "COMMANDs: (ÐºÐ¾Ð¼Ð±Ð¸Ð½ÑƒÑ˜Ñ‚Ðµ COMMANDs Ð´Ð° Ð¾Ð´Ñ€ÐµÐ´Ð¸Ñ‚Ðµ Ð²Ð¸ÑˆÐµÑÑ‚Ñ€ÑƒÐºÐµ Ð¾Ð¿Ñ†Ð¸Ñ˜Ðµ Ð¸ÑÑ‚Ð¾Ð²Ñ€ÐµÐ¼ÐµÐ½Ð¾)"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
 msgstr "Ð”Ð¾Ð±Ñ€Ð¾Ð´Ð¾ÑˆÐ»Ð¸ Ñƒ BridgeDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
 msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð½Ð¸ transport TYPEs:"
 
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
 msgstr "Ð—Ð´Ñ€Ð°Ð²Ð¾, %s!"
 
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
 msgid "Hello, friend!"
 msgstr "Ð—Ð´Ñ€Ð°Ð²Ð¾, Ð¿Ñ€Ð¸Ñ˜Ð°Ñ‚ÐµÑ™Ñƒ!"
 
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
 msgid "Public Keys"
 msgstr "ÐˆÐ°Ð²Ð½Ð¸ ÐºÑ™ÑƒÑ‡ÐµÐ²Ð¸"
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
 #. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
 #, python-format
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +220,7 @@ msgstr "ÐžÐ²Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ñ˜Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð° ÑÐ° Ð´ÑƒÐ³Ð°Ð¼Ð°, Ñ˜ÐµÐ´
 #. 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
+#: bridgedb/strings.py:72
 #, python-format
 msgid ""
 "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +231,7 @@ msgid ""
 msgstr "BridgeDB Ð¼Ð¾Ð¶Ðµ Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ‚Ð¸ Ð¼Ð¾ÑÑ‚Ð¾Ð²Ðµ ÑÐ° Ð²Ð¸ÑˆÐµ %s Ñ‚Ð¸Ð¿Ð¾Ð²Ð° Pluggable Transports %s,\nÑˆÑ‚Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾Ñ›Ð¸ Ð¿Ñ€Ð¸ÐºÑ€Ð¸Ð²Ð°ÑšÑƒ Ð²Ð°ÑˆÐ¸Ñ… ÐºÐ¾Ð½ÐµÐºÑ†Ð¸Ñ˜Ð° ÑÐ° Ð¢Ð¾Ñ€ ÐœÑ€ÐµÐ¶Ð¾Ð¼ Ð´Ð° Ð±Ð¸ Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ð¼Ðµ ÐºÐ¾\nÐ¿Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð° Ð²Ð°Ñˆ Ð¸Ð½Ñ‚ÐµÐ½ÐµÑ‚ ÑÐ°Ð¾Ð±Ñ€Ð°Ñ›Ð°Ñ˜ Ð±Ð¸Ð»Ð¾ Ñ‚ÐµÐ¶Ðµ Ð´Ð° ÑƒÑ‚Ð²Ñ€Ð´Ð¸ Ð´Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð¢Ð¾Ñ€.\n\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
 msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
@@ -116,7 +243,7 @@ msgstr "ÐÐµÐºÐ¸ Ð¼Ð¾ÑÑ‚Ð¾Ð²Ð¸ ÑÐ° IPv6 Ð°Ð´Ñ€ÐµÑÐ°Ð¼Ð° ÑÑƒ Ñ‚Ð°ÐºÐ¾Ñ’Ðµ Ð´
 #. 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
+#: bridgedb/strings.py:88
 #, python-format
 msgid ""
 "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +252,20 @@ msgid ""
 "\n"
 msgstr "ÐŸÐ¾Ñ€ÐµÐ´ Ñ‚Ð¾Ð³Ð°, BridgeDB Ð¸Ð¼Ð° Ð¿ÑƒÐ½Ð¾ Ð½Ð°Ñ˜Ð¾Ð±Ð¸Ñ‡Ð½Ð¸Ñ˜Ð¸Ñ… Ð¼Ð¾ÑÑ‚Ð¾Ð²Ð° %s Ð±ÐµÐ· Ð¸ÐºÐ°ÐºÐ²Ð¸Ñ…\nPluggable Transports %s ÑˆÑ‚Ð¾ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð·Ð²ÑƒÑ‡Ð¸ Ñ‚Ð¾Ð»Ð¸ÐºÐ¾ ÐºÑƒÐ», Ð°Ð»Ð¸ Ð¾Ð½Ð¸ Ð¸Ð¿Ð°Ðº\nÑƒ Ð¼Ð½Ð¾Ð³Ð¾ ÑÐ»ÑƒÑ‡Ð°Ñ˜ÐµÐ²Ð° Ð¼Ð¾Ð³Ñƒ Ð¿Ð¾Ð¼Ð¾Ñ›Ð¸ Ð´Ð° ÑÐµ Ð·Ð°Ð¾Ð±Ð¸Ñ’Ðµ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð°.\n"
 
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
 msgid "What are bridges?"
 msgstr "Ð¨Ñ‚Ð° ÑÑƒ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð¸?"
 
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
 msgstr "%s ÐŸÑ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð¸ %s ÑÑƒ Ð¢Ð¾Ñ€ Ð¿Ñ€ÐµÐ½Ð¾ÑÐ½Ð¸Ñ†Ð¸ ÐºÐ¾Ñ˜Ð¸ Ð’Ð°Ð¼ Ð¿Ð¾Ð¼Ð°Ð¶Ñƒ Ð´Ð° Ð·Ð°Ð¾Ð±Ð¸Ñ’ÐµÑ‚Ðµ Ñ†ÐµÐ½Ð·ÑƒÑ€Ñƒ."
 
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð°Ð½ Ð¼Ð¸ Ñ˜Ðµ Ð°Ð»Ñ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð°Ð½ Ð½Ð°Ñ‡Ð¸Ð½ Ð·Ð° Ð´Ð¾Ð±Ð¸Ñ˜Ð°ÑšÐµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°!"
 
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +273,12 @@ msgid ""
 "%s, %s or %s."
 msgstr "ÐˆÐ¾Ñˆ Ñ˜ÐµÐ´Ð°Ð½ Ð½Ð°Ñ‡Ð¸Ð½ Ð´Ð¾Ð±Ð¸Ñ˜Ð°ÑšÐ° Ð¼Ð¾ÑÑ‚Ð¾Ð²Ð° Ñ˜Ðµ Ð´Ð° ÑÐµ Ð¿Ð¾ÑˆÐ°Ñ™Ðµ Ð¸-Ð¼ÐµÑ˜Ð» Ð½Ð° %s. Ð£Ð·Ð¼Ð¸Ñ‚Ðµ Ñƒ Ð¾Ð±Ð·Ð¸Ñ€ Ð´Ð°\nÐ¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ðµ Ð¸-Ð¼ÐµÑ˜Ð» ÐºÐ¾Ñ€Ð¸ÑÑ‚ÐµÑ›Ð¸ Ð°Ð´Ñ€ÐµÑÑƒ Ñ˜ÐµÐ´Ð½Ð¾Ð³ Ð¾Ð´ ÑÐ»ÐµÐ´ÐµÑ›Ð¸Ñ… Ð¸-Ð¼ÐµÑ˜Ð» Ð¿Ñ€Ð¾Ð²Ð°Ñ˜Ð´ÐµÑ€Ð°.\n%s, %s Ð¸Ð»Ð¸ %s."
 
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
 msgstr "ÐœÐ¾Ñ˜Ð¸ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð¸ Ð½Ðµ Ñ€Ð°Ð´Ðµ! ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð½Ð° Ð¼Ð¸ Ñ˜Ðµ Ð¿Ð¾Ð¼Ð¾Ñ›!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
 msgstr "ÐÐºÐ¾ Ð’Ð°Ñˆ Ð¢Ð¾Ñ€ Ð½Ðµ Ñ€Ð°Ð´Ð¸, Ð¿Ð¾ÑˆÐ°Ñ™Ð¸Ñ‚Ðµ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½ÑÐºÑƒ Ð¿Ð¾ÑˆÑ‚Ñƒ %s."
@@ -159,48 +286,48 @@ msgstr "ÐÐºÐ¾ Ð’Ð°Ñˆ Ð¢Ð¾Ñ€ Ð½Ðµ Ñ€Ð°Ð´Ð¸, Ð¿Ð¾ÑˆÐ°Ñ™Ð¸Ñ‚Ðµ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ñ
 #. 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
+#: bridgedb/strings.py:121
 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 "Unesite Å¡to viÅ¡e informacija o vaÅ¡em sluÄaju, ukljuÄujuÄ‡i: spisak\nmostova i prikljuÄivih transporta koje ste pokuÅ¡ali da koristite, verziju\nvaÅ¡eg Tor Brauzera, bilo koju sliku koju vam je Tor izbacio, itd."
 
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
 msgstr "Evo vaÅ¡ih premoÅ¡Ä‡ivaÄa:"
 
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
 msgid "Get Bridges!"
 msgstr "Ð”Ð¾Ð±Ð¸Ñ˜Ñ‚Ðµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ!"
 
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
 msgid "Please select options for bridge type:"
 msgstr "ÐœÐ¾Ð»Ð¸Ð¼Ð¾ Ð’Ð°Ñ, Ð¸Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð¿Ñ†Ð¸Ñ˜Ðµ Ð·Ð° Ð²Ñ€ÑÑ‚Ñƒ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°:"
 
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
 msgid "Do you need IPv6 addresses?"
 msgstr "Ð”Ð° Ð»Ð¸ ÑÑƒ Ð’Ð°Ð¼ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð½Ðµ IPv6 Ð°Ð´Ñ€ÐµÑÐµ?"
 
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
 #, python-format
 msgid "Do you need a %s?"
 msgstr "Ð”Ð° Ð»Ð¸ Ð’Ð°Ð¼ Ñ‚Ñ€ÐµÐ±Ð° %s?"
 
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
 msgid "Your browser is not displaying images properly."
 msgstr "Ð’Ð°Ñˆ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ Ð½Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ ÑÐ»Ð¸ÐºÐµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¾."
 
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
 msgid "Enter the characters from the image above..."
 msgstr "Ð£Ð½ÐµÑÐ¸Ñ‚Ðµ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ ÑÐ° ÑÐ»Ð¸ÐºÐµ Ð¸Ð·Ð½Ð°Ð´..."
 
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
 msgid "How to start using your bridges"
 msgstr "ÐšÐ°ÐºÐ¾ Ð´Ð° Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ ÑÐ° ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐµÐ¼ Ð’Ð°ÑˆÐ¸Ñ… Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +336,21 @@ msgid ""
 msgstr "Da biste uneli mostove u Tor Brauzer, prvo idite na %s Tor Brauzer\ndownload stranicu %s , a onda sledite uputstva za preuzimanje i \nstartovanje Tor Brauzera."
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
 msgstr "ÐšÐ°Ð´Ð° ÑÐµ 'ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ðµ' Ð´Ð¸Ñ˜Ð°Ð»Ð¾Ð³ Ð¿Ð¾Ñ˜Ð°Ð²Ð¸, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ‚Ðµ 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð¸ÑˆÐ¸' Ð¸ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ¿ÑƒÑ‚ÑÑ‚Ð²Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ð¸Ñ‚Ð°Ñ˜Ñƒ:"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "Ð”Ð° Ð»Ð¸ Ð²Ð°Ñˆ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ ÑÐµÑ€Ð²Ð¸Ñ Ð¿Ñ€Ð¾Ð²Ð°Ñ˜Ð´ÐµÑ€ (Ð˜Ð¡ÐŸ) Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð° Ð¸Ð»Ð¸ Ð½Ð° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ñ˜Ð¸ Ð½Ð°Ñ‡Ð¸Ð½ Ñ†ÐµÐ½Ð·ÑƒÑ€Ð¸ÑˆÐµ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°ÑšÐµ Ð½Ð° Ð¢Ð¾Ñ€ Ð¼Ñ€ÐµÐ¶Ñƒ?"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
 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"
@@ -231,153 +358,28 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr "Selektujte 'Yes' i onda kliknite na 'Next'. Da biste konfigurisali vaÅ¡e nove mostove,\niskopirajte i pejstujte premoÅ¡Ä‡ivaÄe u polje za unos teksta. KonaÄno, kliknite na\n'Connect', i spremni ste za polazak! Ako budete imali problema, kliknite na 'Help'\ndugme u 'Tor Network Settings' Äarobnjaku da biste dobili dalju pomoÄ‡."
 
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
 msgid "Displays this message."
 msgstr "ÐŸÑ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ Ð¾Ð²Ñƒ ÑÐ»Ð¸ÐºÑƒ."
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: lib/bridgedb/strings.py:146
+#: bridgedb/strings.py:171
 msgid "Request vanilla bridges."
 msgstr "Zahtevati vanila mostove."
 
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
 msgid "Request IPv6 bridges."
 msgstr "Ð—Ð°Ñ‚Ñ€Ð°Ð¶Ð¸Ñ‚Ðµ IPv6 Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ."
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
 msgid "Request a Pluggable Transport by TYPE."
 msgstr "Zahtevati PrikljuÄivi Transport po TIPU."
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
 msgid "Get a copy of BridgeDB's public GnuPG key."
 msgstr "Ð”Ð¾Ð±Ð¸Ñ˜Ñ‚Ðµ ÐºÐ¾Ð¿Ð¸Ñ˜Ñƒ BridgeDB Ñ˜Ð°Ð²Ð½Ð¾Ð³ GnuPG ÐºÑ™ÑƒÑ‡Ð°."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ Ð³Ñ€ÐµÑˆÐºÑƒ."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Ð˜Ð·Ð²Ð¾Ñ€Ð½Ð¸ ÐºÐ¾Ð´"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Promena loga"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ÐžÐ±ÐµÐ»ÐµÐ¶Ð¸ ÑÐ²Ðµ"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kod za vaÅ¡e premoÅ¡Ä‡ivaÄe"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ð£Ñ…, ÑÑ‚Ñ€Ð°ÑˆÐ½Ð¾!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "DoÅ¡lo je do greÅ¡ke pri nabavljanju vaÅ¡eg QR koda."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "QR kod sadrÅ¾i vaÅ¡e premoÅ¡Ä‡ivaÄe. Skenirajte ga sa ÄitaÄem QR koda da biste iskopirali vaÅ¡e premoÅ¡Ä‡ivaÄe na mobilne kao i druge ureÄ‘aje."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "ÐœÐ¾Ð¶Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ñ‚Ñ€ÐµÐ±Ð°Ð»Ð¸ Ð´Ð° Ð¿Ð¾ÐºÑƒÑˆÐ°Ñ‚Ðµ %s Ð´Ð° ÑÐµ Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ %s Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ€ÐµÑ‚Ðµ Ð´Ñ€ÑƒÐ³Ñƒ Ð²Ñ€ÑÑ‚Ñƒ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ð°!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ÐšÐ¾Ñ€Ð°Ðº %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸Ñ‚Ðµ %s Ð¢Ð¾Ñ€ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ÐšÐ¾Ñ€Ð°Ðº %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ð”Ð¾Ð±Ð¸Ñ˜Ñ‚Ðµ %s Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ÐšÐ¾Ñ€Ð°Ðº %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð¡Ð°Ð´Ð° %s Ð´Ð¾Ð´Ð°Ñ˜Ñ‚Ðµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ Ñƒ Ð¢Ð¾Ñ€ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‡ %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ¡%sÐ°Ð¼Ð¾ Ð¼Ð¸ Ð´Ð°Ñ˜ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "ÐÐ°Ð¿Ñ€ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ†Ð¸Ñ˜Ðµ"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ÐÐµ"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Ð½ÐµÐ¼Ð°"
-
-#. 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÐ¢%sÐ¾!"
-
-#. 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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sÐ”%sÐ¾Ð±Ð¸Ñ˜Ñ‚Ðµ Ð¿Ñ€ÐµÐ¼Ð¾ÑˆÑ›Ð¸Ð²Ð°Ñ‡Ðµ"

