Updated translations

diff --git a/po/cs.po b/po/cs.po
index 445defbc0c78f7d5d6cc3ad4ba676ff015dfbbd3..bde983f97fa7dec435681a0b2b8854503c1e68f5 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,161 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-29 21:06+0100\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2017-01-29 21:33+0100\n"
+"Last-Translator: Marek Suchánek <marek.suchanek@protonmail.com>\n"
 "Language-Team: \n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
-"Last-Translator: Marek Suchánek <marek.suchanek@protonmail.com>\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"Language: cs\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Spouštěč prohlížeče Tor"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr "Vytvořil Micah Lee pod licencí MIT"
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Chyba při vytváření {0}"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "Do {0} není možné zapisovat"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Nelze vytvořit adresář {0}"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "Vytváří se domovská složka GnuGPG"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr "Selhal import klíče s otiskem: %s."
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr "Ne všechny klíče byly importovány úspěšně!"
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr "Stahování přes Tor"
-
-#: launcher.py:77
-msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr "Chybí balíček python-txsocksx, stahování se neuskuteční přes tor"
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
 msgstr "Poprvé se stahuje a instaluje Prohlížeč Tor."
 
-#: launcher.py:89
+#: launcher.py:85
+#, fuzzy
 msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 "Vaše verze Prohlížeče Tor je zastaralá. Stáhne se a nainstaluje nejnovější "
 "verze."
 
-#: launcher.py:114
+#: launcher.py:100
+msgid "Downloading over Tor"
+msgstr "Stahování přes Tor"
+
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Prohlížeč Tor"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr "Spustit"
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Stahuje se"
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr "Nejnovější verze: {}"
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr "Chyba při zjišťování verze Prohlížeče Tor."
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Ověřuje se podpis"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Extrahuje se"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Běží"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr "Stahování se spouští znovu"
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Staženo"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Instaluje se"
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr "Spouštěč prohlížeče Tor nerozumí formátu souboru {0}"
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+"Verze prohlížeče Tor, kterou máte nainstalovanou, je ranější, než by měla "
+"být, což může značit útok!"
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Znovu se stahuje balík Prohlížeče Tor."
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Chyba stahování:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr "Používáte právě nevýchozí zrcadlo"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr "Přejete si přepnout zpět na výchozí?"
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr "Přejete si místo toho zkusit anglickou verzi Prohlížeče Tor?"
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Staženo"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr "Chyba při vyhledávání DNS"
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
-"Certifikát SSL získaný od https://www.torproject.org je neplatný! Možná je "
-"na vás veden útok."
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr "Zkusit stahování znovu pomocí Toru?"
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
-msgstr "Chyba při připojování k Toru na {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
+msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -176,97 +210,89 @@ msgstr ""
 "\n"
 "Jste připojeni k internetu?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"SELHALO OVĚŘENÍ PODPISU!\n"
-"\n"
-"Možná je na vás veden útok, anebo může jít pouze o síťovou závadu. Pro nové "
-"stažení klikněte na Spustit."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Instaluje se"
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr "Spouštěč prohlížeče Tor nerozumí formátu souboru {0}"
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-"Verze prohlížeče Tor, kterou máte nainstalovanou, je ranější, než by měla "
-"být, což může značit útok!"
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr "Chybí balíček python-pygame, zvuk modemu není dostupný."
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Znovu se stahuje balík Prohlížeče Tor."
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr "Nastavení Spouštěče prohlížeče Tor"
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr "Stáhnout přes systémový Tor"
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-"Tato možnost je dostupná, pouze pokud se používá systémová instalace Toru."
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr "Tato možnost vyžaduje balíček python-txsocksx."
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr "Přehrávat zvuk modemu, jelikož je Tor pomalý :]"
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr "Tato možnost vyžaduje nainstalovaný python-pygame"
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr "Vynutit stažení anglické verze Prohlížeče Tor"
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr "Server Toru"
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr "Stav: Nainstalováno"
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr "Stav: Nenainstalováno"
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
-msgstr "Přeinstalovat Prohlížeč Tor"
-
-#: settings.py:151
+#: settings.py:87
 msgid "Install Tor Browser"
 msgstr "Nainstalovat Prohlížeč Tor"
 
-#: settings.py:162
+#: settings.py:92
+msgid "Reinstall Tor Browser"
+msgstr "Přeinstalovat Prohlížeč Tor"
+
+#: settings.py:115
 msgid "Mirror"
 msgstr "Zrcadlo"
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+#, fuzzy
+msgid "Save && Exit"
 msgstr "Uložit a ukončit"
+
+#~ msgid ""
+#~ "The python-txsocksx package is missing, downloads will not happen over tor"
+#~ msgstr "Chybí balíček python-txsocksx, stahování se neuskuteční přes tor"
+
+#~ msgid "DNS Lookup Error"
+#~ msgstr "Chyba při vyhledávání DNS"
+
+#~ msgid ""
+#~ "The SSL certificate served by https://www.torproject.org is invalid! You "
+#~ "may be under attack."
+#~ msgstr ""
+#~ "Certifikát SSL získaný od https://www.torproject.org je neplatný! Možná "
+#~ "je na vás veden útok."
+
+#~ msgid "Error connecting to Tor at {0}"
+#~ msgstr "Chyba při připojování k Toru na {0}"
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "SELHALO OVĚŘENÍ PODPISU!\n"
+#~ "\n"
+#~ "Možná je na vás veden útok, anebo může jít pouze o síťovou závadu. Pro "
+#~ "nové stažení klikněte na Spustit."
+
+#~ msgid ""
+#~ "The python-pygame package is missing, the modem sound is unavailable."
+#~ msgstr "Chybí balíček python-pygame, zvuk modemu není dostupný."
+
+#~ msgid ""
+#~ "This option is only available when using a system wide Tor installation."
+#~ msgstr ""
+#~ "Tato možnost je dostupná, pouze pokud se používá systémová instalace Toru."
+
+#~ msgid "This option requires the python-txsocksx package."
+#~ msgstr "Tato možnost vyžaduje balíček python-txsocksx."
+
+#~ msgid "Play modem sound, because Tor is slow :]"
+#~ msgstr "Přehrávat zvuk modemu, jelikož je Tor pomalý :]"
+
+#~ msgid "This option requires python-pygame to be installed"
+#~ msgstr "Tato možnost vyžaduje nainstalovaný python-pygame"

diff --git a/po/fr.po b/po/fr.po
index f3ceb49873c1931e0422685aeb7ca85dab54c401..740d18a013ca1f3f05ffb06dba39cf3ab0f93d65 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:16+0400\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2016-12-02 15:16+0400\n"
 "Last-Translator: Andrey Kunitsyn <contact@libnaru.so>\n"
 "Language-Team: French\n"
@@ -18,150 +18,179 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Tor Browser Launcher"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr ""
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr ""
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Erreur lors de la création de {0}"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "Impossible d'écrire {0}"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Impossible de créer le dossier {0}"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "Creation du dossier GnuPG"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr ""
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr ""
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr ""
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
+msgstr "Téléchargement du Tor Browser Bundle une nouvelle fois."
 
-#: launcher.py:77
+#: launcher.py:85
 msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr ""
-"Le paquet python-txsocks est manquant, les téléchargements ne se feront pas "
-"sur Tor."
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 
-#: launcher.py:89
-msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+#: launcher.py:100
+msgid "Downloading over Tor"
 msgstr ""
 
-#: launcher.py:114
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Tor Browser"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr "Démarrer"
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr "Annuler"
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr ""
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr ""
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Vérification de la signature"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Décompression"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Exécution"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr "Télécharger à nouveau"
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Téléchargé"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Installation en cours"
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr "Tor Browser Launcher ne comprend pas le format du fichier {0}"
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Téléchargement du Tor Browser Bundle une nouvelle fois."
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Erreur de téléchargement:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr "Vous utilisez actuellement un miroir non-défaut"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr "Voulez-vous revenir à la valeur par défaut?"
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr ""
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Téléchargé"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr "Erreur de type DNS Lookup"
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
-"Le certificat SSL servi par https://www.torproject.org n'est pas valide! "
-"Vous pouvez être l'objet d'une attaques."
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr "Essayez le télécharger à nouveau l'utilisation de Tor?"
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
 msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -176,98 +205,90 @@ msgstr ""
 "\n"
 "Êtes-vous connecté à l'Internet?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"LA VÉRICATION DE LA SIGNATURE A ÉCHOUÉE\n"
-"\n"
-"Vous pourriez être l'objet d'une attaque, ou il ce peut être un problème de "
-"réseau. Click Start try the download again."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Installation en cours"
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr "Tor Browser Launcher ne comprend pas le format du fichier {0}"
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr ""
-"Le paquet python-pygame est manquant, le sound de modem est indisponible."
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Téléchargement du Tor Browser Bundle une nouvelle fois."
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr "Tor Browser Launcher configurations"
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr ""
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-"Cette option n'est disponible qu'en conjonction avec une installation "
-"système de Tor."
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr "Cette option requiert le paquet python-txsocksx"
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr "Faire jouer un son de modem, car Tor est lent :]"
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr "Cette option requiert le paquet python-pygame"
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr ""
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr ""
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr ""
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr ""
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
+#: settings.py:87
+msgid "Install Tor Browser"
 msgstr ""
 
-#: settings.py:151
-msgid "Install Tor Browser"
+#: settings.py:92
+msgid "Reinstall Tor Browser"
 msgstr ""
 
-#: settings.py:162
+#: settings.py:115
 msgid "Mirror"
 msgstr "Miroir"
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+#, fuzzy
+msgid "Save && Exit"
 msgstr "Enregistrer et quitter"
 
+#~ msgid ""
+#~ "The python-txsocksx package is missing, downloads will not happen over tor"
+#~ msgstr ""
+#~ "Le paquet python-txsocks est manquant, les téléchargements ne se feront "
+#~ "pas sur Tor."
+
+#~ msgid "DNS Lookup Error"
+#~ msgstr "Erreur de type DNS Lookup"
+
+#~ msgid ""
+#~ "The SSL certificate served by https://www.torproject.org is invalid! You "
+#~ "may be under attack."
+#~ msgstr ""
+#~ "Le certificat SSL servi par https://www.torproject.org n'est pas valide! "
+#~ "Vous pouvez être l'objet d'une attaques."
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "LA VÉRICATION DE LA SIGNATURE A ÉCHOUÉE\n"
+#~ "\n"
+#~ "Vous pourriez être l'objet d'une attaque, ou il ce peut être un problème "
+#~ "de réseau. Click Start try the download again."
+
+#~ msgid ""
+#~ "The python-pygame package is missing, the modem sound is unavailable."
+#~ msgstr ""
+#~ "Le paquet python-pygame est manquant, le sound de modem est indisponible."
+
+#~ msgid ""
+#~ "This option is only available when using a system wide Tor installation."
+#~ msgstr ""
+#~ "Cette option n'est disponible qu'en conjonction avec une installation "
+#~ "système de Tor."
+
+#~ msgid "This option requires the python-txsocksx package."
+#~ msgstr "Cette option requiert le paquet python-txsocksx"
+
+#~ msgid "Play modem sound, because Tor is slow :]"
+#~ msgstr "Faire jouer un son de modem, car Tor est lent :]"
+
+#~ msgid "This option requires python-pygame to be installed"
+#~ msgstr "Cette option requiert le paquet python-pygame"

diff --git a/po/hu.po b/po/hu.po
index 307eca94583b8d8c4cc155196a91f84d9a6357a3..5c1f6eaad7ba221c91f7dc76040375e7a462a1e9 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,163 +7,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-16 00:17+0100\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2017-02-16 00:55+0100\n"
+"Last-Translator: Barcza Károly <kbarcza@blackpanther.hu>\n"
 "Language-Team: \n"
+"Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.8\n"
-"Last-Translator: Barcza Károly <kbarcza@blackpanther.hu>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: hu_HU\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Tor böngésző indító"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr "Micah Lee által MIT licenc alatt"
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr "verzió {0}"
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Hiba a(z) {0} létrehozásakor"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "{0} nem írható"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Nem sikerült a(z) {0} létrehozása"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "GnuPG könyvtár létrehozása"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr "Nem lehetett importálni a kulcsot ujjlenyomattal: %s."
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr ""
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr "Letöltés Tor-on keresztül"
-
-#: launcher.py:77
-msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr ""
-"A python-txsocksx csoamag nem található, a letöltés nem fog megtörténni a "
-"tor-on"
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
 msgstr "Tor böngésző letöltése és telepítése első alkalommal."
 
-#: launcher.py:89
+#: launcher.py:85
+#, fuzzy
 msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 "A Tor böngésző verziója elavult. Töltsük le és telepítsük a legfrissebb "
 "változatot."
 
-#: launcher.py:114
+#: launcher.py:100
+msgid "Downloading over Tor"
+msgstr "Letöltés Tor-on keresztül"
+
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Tor böngésző"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr "Elindítás"
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr "Megszakít"
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Letöltés"
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr "Legújabb változat: {}"
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr "Hiba a Tor böngésző verzió felsimerésekor"
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Aláírás ellenőrzése"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Kibontás"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Fut"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr "Újra letöltés indítása"
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Letöltve"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Telepítés.."
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr "Tor böngésző indító nem érti a(z) {0} fájl formátumot."
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+"A Tor böngésződ verziója egy korábbi verzió mint amilyennek lennie kellene, "
+"ami lehet egy támadás jele!"
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Tör böngészőcsomag letöltése újra."
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Hiba a letöltésben:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr "Jelenleg használt tükörszerver nem az alapértelmezett"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr "Valóban szeretnéd visszaváltani alapértelmezettre?"
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr "Ehelyett megpróbálod a Tor böngésző angol változatát ?"
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Letöltve"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr "DNS feloldási hiba"
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
-"A ttps://www.torproject.org által adott SSL tanúsítvány érvénytelen! Lehet, "
-"hogy támadás alatt vagy."
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr "Megpróbálod újra a Tor letöltését?"
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
-msgstr "Hiba a  Tör csatlakozáskor itt {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
+msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -178,97 +210,92 @@ msgstr ""
 "\n"
 "Csatlakozva vagy az internethez?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"ALÁÍRÁS ELLENŐRZÉSE SIKERTELEN\n"
-"\n"
-"Lehet, hogy támadás alatt vagy, vagy előfordulhat egy hálózati probléma is. "
-"Kattints az indításra az újbóli letöltéshez."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Telepítés.."
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr "Tor böngésző indító nem érti a(z) {0} fájl formátumot."
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-"A Tor böngésződ verziója egy korábbi verzió mint amilyennek lennie kellene, "
-"ami lehet egy támadás jele!"
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr "A python-pygame csomag nem található, a modem hang nem elérhető."
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Tör böngészőcsomag letöltése újra."
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr "Tör böngésző indító beállítások"
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr "Letöltés rendszer Tor-on keresztül"
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-"Ehhez az opció akkor elérhető amikor használatban van a rendszer szintű Tor."
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr "Ehhez az opcióhoz szükséges a python-txsocksx csomag"
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr "Modem hang lejátszása, mert a Tor lassú :]"
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr "Ehhez az opcióhoz szükséges  hogy a python-pygame telepítve legyen"
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr "Kényszerítse a Tor angol változatának letöltését"
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr "Tor-szerver"
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr "Állapot: Telepített"
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr "Állapot: Nincs telepítve"
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
-msgstr "Tor böngésző úratelepítése"
-
-#: settings.py:151
+#: settings.py:87
 msgid "Install Tor Browser"
 msgstr "Tor-böngésző telepítése"
 
-#: settings.py:162
+#: settings.py:92
+msgid "Reinstall Tor Browser"
+msgstr "Tor böngésző úratelepítése"
+
+#: settings.py:115
 msgid "Mirror"
 msgstr "Tükrözés"
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+#, fuzzy
+msgid "Save && Exit"
 msgstr "Mentés és kilépés"
+
+#~ msgid ""
+#~ "The python-txsocksx package is missing, downloads will not happen over tor"
+#~ msgstr ""
+#~ "A python-txsocksx csoamag nem található, a letöltés nem fog megtörténni a "
+#~ "tor-on"
+
+#~ msgid "DNS Lookup Error"
+#~ msgstr "DNS feloldási hiba"
+
+#~ msgid ""
+#~ "The SSL certificate served by https://www.torproject.org is invalid! You "
+#~ "may be under attack."
+#~ msgstr ""
+#~ "A ttps://www.torproject.org által adott SSL tanúsítvány érvénytelen! "
+#~ "Lehet, hogy támadás alatt vagy."
+
+#~ msgid "Error connecting to Tor at {0}"
+#~ msgstr "Hiba a  Tör csatlakozáskor itt {0}"
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "ALÁÍRÁS ELLENŐRZÉSE SIKERTELEN\n"
+#~ "\n"
+#~ "Lehet, hogy támadás alatt vagy, vagy előfordulhat egy hálózati probléma "
+#~ "is. Kattints az indításra az újbóli letöltéshez."
+
+#~ msgid ""
+#~ "The python-pygame package is missing, the modem sound is unavailable."
+#~ msgstr "A python-pygame csomag nem található, a modem hang nem elérhető."
+
+#~ msgid ""
+#~ "This option is only available when using a system wide Tor installation."
+#~ msgstr ""
+#~ "Ehhez az opció akkor elérhető amikor használatban van a rendszer szintű "
+#~ "Tor."
+
+#~ msgid "This option requires the python-txsocksx package."
+#~ msgstr "Ehhez az opcióhoz szükséges a python-txsocksx csomag"
+
+#~ msgid "Play modem sound, because Tor is slow :]"
+#~ msgstr "Modem hang lejátszása, mert a Tor lassú :]"
+
+#~ msgid "This option requires python-pygame to be installed"
+#~ msgstr "Ehhez az opcióhoz szükséges  hogy a python-pygame telepítve legyen"

diff --git a/po/nl.po b/po/nl.po
index fc84813424f010862b96d3084302c7191f67bc84..2f89e3a4576899aab5200fd3784c8a5e8069e2b1 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,160 +7,191 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 17:28+0400\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2016-12-02 17:40+0400\n"
+"Last-Translator: Andrey Kunitsyn <contact@libnaru.so>\n"
 "Language-Team: \n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Andrey Kunitsyn <contact@libnaru.so>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: nl\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Tor Browser Launcher"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr "Door Micah Lee, onder MIT licensie"
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Fout bij maken van {0}"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "{0} is niet schrijfbaar"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Kan map niet maken: {0}"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "Aanmeken GnuPG map"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr ""
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr ""
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr ""
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
+msgstr "Tor Browser Bundle opnieuw aan het downloaden."
 
-#: launcher.py:77
+#: launcher.py:85
 msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
-msgstr ""
-
-#: launcher.py:89
-msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+#: launcher.py:100
+msgid "Downloading over Tor"
 msgstr ""
 
-#: launcher.py:114
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Tor Browser"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr "Start"
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Bezig met downloaden"
 
-#: launcher.py:262
+#: launcher.py:238
 #, fuzzy
 msgid "Latest version: {}"
 msgstr "Laatste versie: {}"
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr ""
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Handtekening verifiëren"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Uitpakken"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Uitvoeren"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr ""
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Gedownload"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Installeren"
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr ""
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Tor Browser Bundle opnieuw aan het downloaden."
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Download fout:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr ""
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr ""
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr ""
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Gedownload"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr ""
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
-"Het SSL certificaat geserveerd door https://www.torproject.org is ongeldig! "
-"Je bent misschien onder aanval."
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr "Probeer de download opnieuw via Tor?"
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
 msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -175,94 +206,70 @@ msgstr ""
 "\n"
 "Bent u verbonden met het internet?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"HANDTEKENING VERIFICATIE MISLUKT!\n"
-"\n"
-"U wordt misschien aangevallen of gewoon een netwerk probleem. Klik op Start "
-"om het downloaden nogmaals te proberen."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Installeren"
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr ""
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr ""
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Tor Browser Bundle opnieuw aan het downloaden."
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr "Tor Browser Launcher Instellingen"
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr ""
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr "Voor deze optie is het python-txsocksx pakket nodig."
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr "Speel modem geluid, omdat Tor langzaam is :]"
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr "Voor deze optie moet python-pygame geïnstalleerd zijn"
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr ""
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr ""
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr ""
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr ""
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
+#: settings.py:87
+msgid "Install Tor Browser"
 msgstr ""
 
-#: settings.py:151
-msgid "Install Tor Browser"
+#: settings.py:92
+msgid "Reinstall Tor Browser"
 msgstr ""
 
-#: settings.py:162
+#: settings.py:115
 msgid "Mirror"
 msgstr ""
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+#, fuzzy
+msgid "Save && Exit"
 msgstr "Opslaan & afsluiten"
+
+#~ msgid ""
+#~ "The SSL certificate served by https://www.torproject.org is invalid! You "
+#~ "may be under attack."
+#~ msgstr ""
+#~ "Het SSL certificaat geserveerd door https://www.torproject.org is "
+#~ "ongeldig! Je bent misschien onder aanval."
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "HANDTEKENING VERIFICATIE MISLUKT!\n"
+#~ "\n"
+#~ "U wordt misschien aangevallen of gewoon een netwerk probleem. Klik op "
+#~ "Start om het downloaden nogmaals te proberen."
+
+#~ msgid "This option requires the python-txsocksx package."
+#~ msgstr "Voor deze optie is het python-txsocksx pakket nodig."
+
+#~ msgid "Play modem sound, because Tor is slow :]"
+#~ msgstr "Speel modem geluid, omdat Tor langzaam is :]"
+
+#~ msgid "This option requires python-pygame to be installed"
+#~ msgstr "Voor deze optie moet python-pygame geïnstalleerd zijn"

diff --git a/po/pl.po b/po/pl.po
index d9d660a2057ff4cf0a009a92973aacf065e921d2..db223493db3bd3f41e9ebfd4942c20908fcd83c6 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,158 +7,191 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:24+0400\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2016-12-02 15:35+0400\n"
+"Last-Translator: AreYouLoco? <areyouloco@paranoici.org>\n"
 "Language-Team: Polish\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: AreYouLoco? <areyouloco@paranoici.org>\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"Language: pl\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Launcher Przeglądarki Tora"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr ""
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr "wersja {0}"
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Błąd przy tworzeniu {0}"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "{0} jest tylko do odczytu"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Nie można stworzyć {0}"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "Tworzenie katalogu głównego GnuPG"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr ""
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr ""
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr ""
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
+msgstr "Ponowne pobieranie Tor Browser Bundle"
 
-#: launcher.py:77
+#: launcher.py:85
 msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr ""
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 
-#: launcher.py:89
-msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+#: launcher.py:100
+msgid "Downloading over Tor"
 msgstr ""
 
-#: launcher.py:114
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Przeglądarka Tora"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr ""
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr ""
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Pobieranie"
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr ""
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr ""
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Weryfikowanie podpisu"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Rozpakowywanie"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Uruchamianie"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr "Ponowne rozpoczynanie pobierania"
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Pobrano"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Instalowanie"
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr ""
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Ponowne pobieranie Tor Browser Bundle"
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Błąd pobierania:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr ""
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr ""
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr ""
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Pobrano"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr ""
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr ""
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
 msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -173,94 +206,53 @@ msgstr ""
 "\n"
 "Czy jesteś podłąćzony do internetu?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"WERYFIKACJA PODPISU NIEUDANA!\n"
-"\n"
-"Możesz być atakowany, lub mogą być to tylko problemy z połączeniem. Naciśnij "
-"Start aby pobrać ponownie."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Instalowanie"
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr ""
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr ""
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Ponowne pobieranie Tor Browser Bundle"
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr ""
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr ""
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr ""
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr ""
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr ""
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr ""
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr ""
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr ""
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr ""
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
+#: settings.py:87
+msgid "Install Tor Browser"
 msgstr ""
 
-#: settings.py:151
-msgid "Install Tor Browser"
+#: settings.py:92
+msgid "Reinstall Tor Browser"
 msgstr ""
 
-#: settings.py:162
+#: settings.py:115
 msgid "Mirror"
 msgstr ""
 
-#: settings.py:186
-msgid "Save & Exit"
-msgstr ""
+#: settings.py:131
+msgid "Save && Exit"
+msgstr ""
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "WERYFIKACJA PODPISU NIEUDANA!\n"
+#~ "\n"
+#~ "Możesz być atakowany, lub mogą być to tylko problemy z połączeniem. "
+#~ "Naciśnij Start aby pobrać ponownie."

diff --git a/po/ru.po b/po/ru.po
index 93072a405d29c71379eb9a773a7b9747fc3c8167..d644cdf29f0df5895afc5065584434d8900270cc 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:14+0400\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: 2016-12-02 17:52+0400\n"
 "Last-Translator: Andrey Kunitsyn <contact@libnaru.so>\n"
 "Language-Team: Russian\n"
@@ -19,149 +19,182 @@ msgstr ""
 "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"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr "Программа запуска Tor Browser"
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr "Написана Micah Lee и распространяется по лицензии MIT"
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr "Ошибка создания {0}"
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr "Нельзя записать в {0}"
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr "Нельзя создать каталог {0}"
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr "Создание домашнего каталога GnuPG"
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr "Не удалось импортировать ключ с отпечатком: %s."
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr "Не все ключи были успешно импортированы!"
 
-#: launcher.py:75
-msgid "Downloading over Tor"
-msgstr "Загружать через Tor"
-
-#: launcher.py:77
-msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr ""
-"Пакет python-txsocks отсутствует, загрузка не будет производиться через Tor"
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+#: launcher.py:83
+#, fuzzy
+msgid "Downloading Tor Browser for the first time."
 msgstr "Загрузка и установка Tor Browser в первый раз"
 
-#: launcher.py:89
+#: launcher.py:85
+#, fuzzy
 msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr "Ваша версия Tor Browser устарела. Загрузка и установка новой версии."
 
-#: launcher.py:114
+#: launcher.py:100
+msgid "Downloading over Tor"
+msgstr "Загружать через Tor"
+
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr "Tor Browser"
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr "Запуск"
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr "Отмена"
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr "Загрузка"
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr "Последняя версия: {}"
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr "Ошибка сверки версии Tor Browser."
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr "Сверка подписи"
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr "Распаковка"
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr "Запуск"
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr "Начинать загрузку снова"
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
+msgstr ""
+
+#: launcher.py:293
+msgid "Downloaded"
+msgstr "Загружено"
+
+#: launcher.py:393
+msgid "Installing"
+msgstr "Установка"
+
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
+msgstr "Программа запуска Tor Browser не понимает формат файла {0}"
+
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
+msgstr ""
+"Вы установили новую версию Tor Browser раньше, чем это должно быть. Это "
+"может быть атакой!"
+
+#: launcher.py:446
+#, fuzzy
+msgid "Downloading Tor Browser over again."
+msgstr "Загрузка Tor Browser Bundle снова."
+
+#: launcher.py:516 launcher.py:525 launcher.py:533
 msgid "Download Error:"
 msgstr "Ошибка загрузки:"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:517
 msgid "You are currently using a non-default mirror"
 msgstr "Вы используете нестандартное зеркало"
 
-#: launcher.py:307 launcher.py:374
+#: launcher.py:518
 msgid "Would you like to switch back to the default?"
 msgstr "Вы бы хотели вернуться к стандартному?"
 
-#: launcher.py:309
+#: launcher.py:527
 msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr "Вы хотели бы вместо этого попробовать английскую версию Tor Browser?"
 
-#: launcher.py:326
-msgid "Downloaded"
-msgstr "Загружено"
-
-#: launcher.py:374
-msgid "DNS Lookup Error"
-msgstr "Ошибка запроса DNS"
-
-#: launcher.py:383 launcher.py:385
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+"Invalid SSL certificate for:\n"
+"{0}\n"
+"\n"
+"You may be under attack."
 msgstr ""
-"SSL-сертификат находящейся на https://www.torproject.org недействителен! Вы "
-"можете быть атакованы."
 
-#: launcher.py:383
+#: launcher.py:550
 msgid "Try the download again using Tor?"
 msgstr "Загрузить снова через Tor?"
 
-#: launcher.py:392
+#: launcher.py:559
 #, python-brace-format
-msgid "Error connecting to Tor at {0}"
-msgstr "Ошибка подключения к Tor через {0}"
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
+msgstr ""
 
-#: launcher.py:395
+#: launcher.py:563
 #, python-brace-format
 msgid ""
 "Error starting download:\n"
@@ -176,96 +209,90 @@ msgstr ""
 "\n"
 "Вы подключены к сети?"
 
-#: launcher.py:494
-msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
-"\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
-msgstr ""
-"ОШИБКА СВЕРКИ ПОДПИСИ!\n"
-"\n"
-"Вы можете бы быть под атакой, или имеют место проблемы с сетью. Нажмите "
-"кнопку Пуск и попробуйте снова."
-
-#: launcher.py:504
-msgid "Installing"
-msgstr "Установка"
-
-#: launcher.py:526
-#, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr "Программа запуска Tor Browser не понимает формат файла {0}"
-
-#: launcher.py:548
-msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-"Вы установили новую версию Tor Browser раньше, чем это должно быть. Это "
-"может быть атакой!"
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
-msgstr "Пакет python-pygame не найден, звуки модема недоступны."
-
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
-msgstr "Загрузка Tor Browser Bundle снова."
-
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr "Настройка программы запуска Tor Browser"
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr "Скачать через Tor"
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr "Эта опция доступна только при установки Tor в систему."
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr "Эта опция требует пакет python-txsocksx."
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr "Играть звуки модема, если Tor слишком медленный :]"
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr "Эта опция требует установленный python-pygame"
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr "Загружать только английскую версию Tor Browser"
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr "Сервер Tor"
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr "Статус: установлен"
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr "Статус: не установлен"
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
-msgstr "Переустановить Tor Browser"
-
-#: settings.py:151
+#: settings.py:87
 msgid "Install Tor Browser"
 msgstr "Установить Tor Browser"
 
-#: settings.py:162
+#: settings.py:92
+msgid "Reinstall Tor Browser"
+msgstr "Переустановить Tor Browser"
+
+#: settings.py:115
 msgid "Mirror"
 msgstr "Зеркало"
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+#, fuzzy
+msgid "Save && Exit"
 msgstr "Сохранить и выйти"
+
+#~ msgid ""
+#~ "The python-txsocksx package is missing, downloads will not happen over tor"
+#~ msgstr ""
+#~ "Пакет python-txsocks отсутствует, загрузка не будет производиться через "
+#~ "Tor"
+
+#~ msgid "DNS Lookup Error"
+#~ msgstr "Ошибка запроса DNS"
+
+#~ msgid ""
+#~ "The SSL certificate served by https://www.torproject.org is invalid! You "
+#~ "may be under attack."
+#~ msgstr ""
+#~ "SSL-сертификат находящейся на https://www.torproject.org недействителен! "
+#~ "Вы можете быть атакованы."
+
+#~ msgid "Error connecting to Tor at {0}"
+#~ msgstr "Ошибка подключения к Tor через {0}"
+
+#~ msgid ""
+#~ "SIGNATURE VERIFICATION FAILED!\n"
+#~ "\n"
+#~ "You might be under attack, or there might just be a networking problem. "
+#~ "Click Start try the download again."
+#~ msgstr ""
+#~ "ОШИБКА СВЕРКИ ПОДПИСИ!\n"
+#~ "\n"
+#~ "Вы можете бы быть под атакой, или имеют место проблемы с сетью. Нажмите "
+#~ "кнопку Пуск и попробуйте снова."
+
+#~ msgid ""
+#~ "The python-pygame package is missing, the modem sound is unavailable."
+#~ msgstr "Пакет python-pygame не найден, звуки модема недоступны."
+
+#~ msgid ""
+#~ "This option is only available when using a system wide Tor installation."
+#~ msgstr "Эта опция доступна только при установки Tor в систему."
+
+#~ msgid "This option requires the python-txsocksx package."
+#~ msgstr "Эта опция требует пакет python-txsocksx."
+
+#~ msgid "Play modem sound, because Tor is slow :]"
+#~ msgstr "Играть звуки модема, если Tor слишком медленный :]"
+
+#~ msgid "This option requires python-pygame to be installed"
+#~ msgstr "Эта опция требует установленный python-pygame"

diff --git a/torbrowser_launcher.pot b/torbrowser_launcher.pot
index 0948b80b93cf783f74f296f3cc45cab4cdbf4daf..ea646152cbc15e3270eeb076bfaec5d216057003 100644 (file)
--- a/torbrowser_launcher.pot
+++ b/torbrowser_launcher.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-02 15:13+0400\n"
+"POT-Creation-Date: 2018-03-23 15:47-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,239 +17,222 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: __init__.py:49
+#: __init__.py:65 launcher.py:470
 msgid "Tor Browser Launcher"
 msgstr ""
 
-#: __init__.py:50
+#: __init__.py:66
 msgid "By Micah Lee, licensed under MIT"
 msgstr ""
 
-#: __init__.py:51
+#: __init__.py:67
 #, python-brace-format
 msgid "version {0}"
 msgstr ""
 
-#: common.py:108
+#: common.py:100
 #, python-brace-format
 msgid "Error creating {0}"
 msgstr ""
 
-#: common.py:110 common.py:186
+#: common.py:102 common.py:180
 #, python-brace-format
 msgid "{0} is not writable"
 msgstr ""
 
-#: common.py:183
+#: common.py:177
 #, python-brace-format
 msgid "Cannot create directory {0}"
 msgstr ""
 
-#: common.py:193
+#: common.py:187
 msgid "Creating GnuPG homedir"
 msgstr ""
 
-#: common.py:240
+#: common.py:254
 #, python-format
 msgid "Could not import key with fingerprint: %s."
 msgstr ""
 
-#: common.py:245
+#: common.py:259
 msgid "Not all keys were imported successfully!"
 msgstr ""
 
-#: launcher.py:75
-msgid "Downloading over Tor"
+#: launcher.py:83
+msgid "Downloading Tor Browser for the first time."
 msgstr ""
 
-#: launcher.py:77
+#: launcher.py:85
 msgid ""
-"The python-txsocksx package is missing, downloads will not happen over tor"
-msgstr ""
-
-#: launcher.py:87
-msgid "Downloading and installing Tor Browser for the first time."
+"Your version of Tor Browser is out-of-date. Downloading the newest version."
 msgstr ""
 
-#: launcher.py:89
-msgid ""
-"Your version of Tor Browser is out-of-date. Downloading and installing the "
-"newest version."
+#: launcher.py:100
+msgid "Downloading over Tor"
 msgstr ""
 
-#: launcher.py:114
+#: launcher.py:111
 msgid "Tor Browser"
 msgstr ""
 
-#: launcher.py:210
+#: launcher.py:128
 msgid "Start"
 msgstr ""
 
-#: launcher.py:220 settings.py:195
+#: launcher.py:174
+msgid "Yes"
+msgstr ""
+
+#: launcher.py:178
+msgid "Exit"
+msgstr ""
+
+#: launcher.py:192 settings.py:136
 msgid "Cancel"
 msgstr ""
 
-#: launcher.py:255 launcher.py:270 launcher.py:274 launcher.py:412
+#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
+#: launcher.py:281
 msgid "Downloading"
 msgstr ""
 
-#: launcher.py:262
+#: launcher.py:238
 msgid "Latest version: {}"
 msgstr ""
 
-#: launcher.py:265
+#: launcher.py:241
 msgid "Error detecting Tor Browser version."
 msgstr ""
 
-#: launcher.py:281 launcher.py:479
+#: launcher.py:256 launcher.py:357
 msgid "Verifying Signature"
 msgstr ""
 
-#: launcher.py:285
+#: launcher.py:260
 msgid "Extracting"
 msgstr ""
 
-#: launcher.py:289
+#: launcher.py:264
 msgid "Running"
 msgstr ""
 
-#: launcher.py:293
+#: launcher.py:268
 msgid "Starting download over again"
 msgstr ""
 
-#: launcher.py:307 launcher.py:309 launcher.py:311 launcher.py:353
-msgid "Download Error:"
+#: launcher.py:279 launcher.py:295
+msgid "(over Tor)"
 msgstr ""
 
-#: launcher.py:307 launcher.py:374
-msgid "You are currently using a non-default mirror"
+#: launcher.py:293
+msgid "Downloaded"
 msgstr ""
 
-#: launcher.py:307 launcher.py:374
-msgid "Would you like to switch back to the default?"
+#: launcher.py:393
+msgid "Installing"
 msgstr ""
 
-#: launcher.py:309
-msgid "Would you like to try the English version of Tor Browser instead?"
+#: launcher.py:401
+#, python-brace-format
+msgid "Tor Browser Launcher doesn't understand the file format of {0}"
 msgstr ""
 
-#: launcher.py:326
-msgid "Downloaded"
+#: launcher.py:427
+msgid ""
+"The version of Tor Browser you have installed is earlier than it should be, "
+"which could be a sign of an attack!"
 msgstr ""
 
-#: launcher.py:374
-msgid "DNS Lookup Error"
+#: launcher.py:446
+msgid "Downloading Tor Browser over again."
 msgstr ""
 
-#: launcher.py:383 launcher.py:385
-msgid ""
-"The SSL certificate served by https://www.torproject.org is invalid! You may "
-"be under attack."
+#: launcher.py:516 launcher.py:525 launcher.py:533
+msgid "Download Error:"
 msgstr ""
 
-#: launcher.py:383
-msgid "Try the download again using Tor?"
+#: launcher.py:517
+msgid "You are currently using a non-default mirror"
 msgstr ""
 
-#: launcher.py:392
-#, python-brace-format
-msgid "Error connecting to Tor at {0}"
+#: launcher.py:518
+msgid "Would you like to switch back to the default?"
 msgstr ""
 
-#: launcher.py:395
-#, python-brace-format
-msgid ""
-"Error starting download:\n"
-"\n"
-"{0}\n"
-"\n"
-"Are you connected to the internet?"
+#: launcher.py:527
+msgid "Would you like to try the English version of Tor Browser instead?"
 msgstr ""
 
-#: launcher.py:494
+#: launcher.py:548
+#, python-brace-format
 msgid ""
-"SIGNATURE VERIFICATION FAILED!\n"
+"Invalid SSL certificate for:\n"
+"{0}\n"
 "\n"
-"You might be under attack, or there might just be a networking problem. "
-"Click Start try the download again."
+"You may be under attack."
 msgstr ""
 
-#: launcher.py:504
-msgid "Installing"
+#: launcher.py:550
+msgid "Try the download again using Tor?"
 msgstr ""
 
-#: launcher.py:526
+#: launcher.py:559
 #, python-brace-format
-msgid "Tor Browser Launcher doesn't understand the file format of {0}"
-msgstr ""
-
-#: launcher.py:548
 msgid ""
-"The version of Tor Browser you have installed is earlier than it should be, "
-"which could be a sign of an attack!"
-msgstr ""
-
-#: launcher.py:568
-msgid "The python-pygame package is missing, the modem sound is unavailable."
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Trying to download over Tor. Are you sure Tor is configured correctly and "
+"running?"
 msgstr ""
 
-#: launcher.py:598
-msgid "Downloading Tor Browser Bundle over again."
+#: launcher.py:563
+#, python-brace-format
+msgid ""
+"Error starting download:\n"
+"\n"
+"{0}\n"
+"\n"
+"Are you connected to the internet?"
 msgstr ""
 
-#: settings.py:41
+#: settings.py:46
 msgid "Tor Browser Launcher Settings"
 msgstr ""
 
-#: settings.py:71
+#: settings.py:50
 msgid "Download over system Tor"
 msgstr ""
 
-#: settings.py:73
-msgid ""
-"This option is only available when using a system wide Tor installation."
-msgstr ""
-
-#: settings.py:75
-msgid "This option requires the python-txsocksx package."
-msgstr ""
-
-#: settings.py:89
-msgid "Play modem sound, because Tor is slow :]"
-msgstr ""
-
-#: settings.py:101
-msgid "This option requires python-pygame to be installed"
-msgstr ""
-
-#: settings.py:106
+#: settings.py:57
 msgid "Force downloading English version of Tor Browser"
 msgstr ""
 
-#: settings.py:119
+#: settings.py:66
 msgid "Tor server"
 msgstr ""
 
-#: settings.py:131
+#: settings.py:82
 msgid "Status: Installed"
 msgstr ""
 
-#: settings.py:133
+#: settings.py:84
 msgid "Status: Not Installed"
 msgstr ""
 
-#: settings.py:142
-msgid "Reinstall Tor Browser"
+#: settings.py:87
+msgid "Install Tor Browser"
 msgstr ""
 
-#: settings.py:151
-msgid "Install Tor Browser"
+#: settings.py:92
+msgid "Reinstall Tor Browser"
 msgstr ""
 
-#: settings.py:162
+#: settings.py:115
 msgid "Mirror"
 msgstr ""
 
-#: settings.py:186
-msgid "Save & Exit"
+#: settings.py:131
+msgid "Save && Exit"
 msgstr ""