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

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Jul '14

13 Jul '14

commit 2360f29ac37969a17b7af189cbecde8ca1d60eec Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 13 19:45:03 2014 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 80 ++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index 6b64b11..5f181df 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-07-13 19:14+0000\n" +"PO-Revision-Date: 2014-07-13 19:40+0000\n" "Last-Translator: isus <isus(a)openmailbox.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "" +msgstr "BridgeDB poate oferi punți cu cîteva %stypes de Pluggable Transports%s,\nce pot obfusca conexiunile dvs către Tor Network, făcînd mai dificilă determinarea traficului Tor pentru oricine vă urmărește traficul de internet.\n\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -109,7 +109,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Unele punți cu adrese IPv6 sînt disponibile, deși unele Pluggable\nTransports nu sînt compatibile cu IPv5.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -123,7 +123,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "În plus, BridgeDB are multe punți simple %s fără nici o\nPluggable Transport %s ce poate nu pare așa cool, dar care pot\nde asemenea să ocolească cenzura internet în multe cazuri.\n\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" @@ -132,7 +132,7 @@ msgstr "Ce sunt punțile? " #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s punți %s sînt Tor relays care vă ajută să ocoliți cenzura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" @@ -144,7 +144,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s or %s." -msgstr "" +msgstr "Alt mod de a obține punție este să trimiteți un email la %s. Remarcați că trebuie să trimiteți un email de la unul din următorii privederi::\n%s or %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" @@ -164,40 +164,40 @@ 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 "" +msgstr "Încercați să includeți cît mai multe informații despre cazul dvs pe cît puteți, includeți lista de punți și Pluggable Transports pe care ați încercat să le folosiți, versiunea de Tor Browser și orice alt mesaj dat de Tor, etc." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" -msgstr "" +msgstr "Acestea sînt liniile de punți:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "Ia punți!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Alegeți opțiunile pentru tipul de punte:" #: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "Aveți nevoie de adrese IPv6?" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Aveți nevoie de %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Browserul nu afișează imaginile corect." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "Introduceți caracterele din imaginea de mai sus..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "" +msgstr "Cum să începeți să folosiți punțile" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 @@ -205,21 +205,21 @@ msgstr "" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "" +msgstr "Pentru a introduce în Tor Browser, urmați instrucțiunile de la %s Tor Browser download page %s pentru a porni Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "" +msgstr "Cînd apare dialogul 'Tor Network Settings', clic 'Configure' și urmați vrăjitorul pînă cînd vă cere:" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "" +msgstr "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:133 @@ -228,45 +228,45 @@ msgid "" "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 "" +msgstr "Alegeți 'Yes' și apoi clic 'Next'. Pentru a configura noile punți, copiați și colați liniile cu punțile în căsuța de text. În final, clic 'Connect' și totul e gata! Dacă aveți probleme, clic pe 'Help' din vrăjitorul 'Tor Network Settings'." #: lib/bridgedb/strings.py:141 msgid "Displays this message." -msgstr "" +msgstr "Afișează acest mesaj." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." -msgstr "" +msgstr "Cere punți simple." #: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." -msgstr "" +msgstr "Cere punți IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." -msgstr "" +msgstr "Cereți un Pluggable Transport după TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". #: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "Obțineți o copie a cheii GnuPG publice a BridgeDB." #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "" +msgstr "Raporați un bug" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "Cod Sursa" +msgstr "Cod sursă" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" -msgstr "" +msgstr "Schimbări" #: lib/bridgedb/templates/base.html:98 msgid "Contact" @@ -278,33 +278,33 @@ msgstr "Contact" #. or for French: "Sacrebleu!". :) #: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "O, spagettios!" #: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "Acum nu sînt punți disponibile..." #: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "Poate ar trebui să încercați %s înapoi %s și să alegeți un alt tip de punte!" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Pas %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "Descarcă %s Tor Browser %s" #: lib/bridgedb/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "Pas %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format @@ -314,12 +314,12 @@ msgstr "Ia %s punți %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Pas %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "Acum %s adăugați punțile la Tor Browser %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -328,11 +328,11 @@ msgstr "" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sD%soar dă-mi punțle!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "Opțiuni avansate" #: lib/bridgedb/templates/options.html:88 msgid "No" @@ -340,7 +340,7 @@ msgstr "Nu" #: lib/bridgedb/templates/options.html:89 msgid "none" -msgstr "" +msgstr "nimic" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -348,7 +348,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" -msgstr "" +msgstr "%sD%sa!" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -356,4 +356,4 @@ msgstr "" #: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sI%sa punți"

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 13 Jul '14

13 Jul '14

commit 690b705ef2c12529534847bf2b5d03fab6f4ca28 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 13 19:15:51 2014 +0000 Update translations for tails-iuk_completed --- ro.po | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) diff --git a/ro.po b/ro.po new file mode 100644 index 0000000..4b566e5 --- /dev/null +++ b/ro.po @@ -0,0 +1,236 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# isus <isus(a)openmailbox.org>, 2014 +# laura berindei <lauraagavriloae(a)yahoo.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" +"POT-Creation-Date: 2014-06-24 11:44+0200\n" +"PO-Revision-Date: 2014-07-13 19:10+0000\n" +"Last-Translator: isus <isus(a)openmailbox.org>\n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 +#: ../lib/Tails/IUK/Frontend.pm:667 +msgid "For debugging information, see /home/amnesia/.xsession-errors" +msgstr "Pentru informații debugging, vezi /home/amnesia/.xsession-errors" + +#: ../lib/Tails/IUK/Frontend.pm:216 +msgid "Error while checking for upgrades" +msgstr "Eroare la căutarea actualizărilor" + +#: ../lib/Tails/IUK/Frontend.pm:219 +msgid "" +"Could not determine whether an upgrade is available from our website.\n" +"\n" +"Check your network connection, and restart Tails to try upgrading again.\n" +"\n" +"If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" +msgstr "Nu am putut detecta dacă o actualizare este diponibilă pe website.\n\nVerificați conexiunea la rețea reporniți Tails și reîncercați să actualizați.\n\nDacă problema persistă, mergeți la file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:234 +msgid "no automatic upgrade is available from our website for this version" +msgstr "pentru această versiune nu există actualizare automată pe website" + +#: ../lib/Tails/IUK/Frontend.pm:240 +msgid "your device was not created using Tails Installer" +msgstr "aparatul nu a fost creat cu Tails installer" + +#: ../lib/Tails/IUK/Frontend.pm:245 +msgid "Tails was started from a DVD or a read-only device" +msgstr "Tails a fost pornit de pe un DVD sau un aparat read-only" + +#: ../lib/Tails/IUK/Frontend.pm:250 +msgid "there is not enough free space on the Tails system partition" +msgstr "nu este destul spațiu liber pe partiția de sistem a Tails" + +#: ../lib/Tails/IUK/Frontend.pm:255 +msgid "not enough memory is available on this system" +msgstr "memorie insuficienta disponibila in acest sistem" + +#: ../lib/Tails/IUK/Frontend.pm:261 +#, perl-brace-format +msgid "No explanation available for reason '%{reason}s'." +msgstr "Nu am explicație pentru motivul '%{reason}s'." + +#: ../lib/Tails/IUK/Frontend.pm:281 +msgid "The system is up-to-date" +msgstr "Sistemul este la zi" + +#: ../lib/Tails/IUK/Frontend.pm:286 +msgid "This version of Tails is outdated, and may have security issues." +msgstr "Această versiune de Tails este depășită și ar putea avea probleme de securitate." + +#: ../lib/Tails/IUK/Frontend.pm:318 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{space_needed}s of free space on" +" Tails system partition, but only %{free_space}s is available." +msgstr "Actualizarea incrementală disponibilă necesită %{space_needed}s din spațiul disponibil pe partiția sistemului TAILS, dar numai %{free_space}s este disponibil." + +#: ../lib/Tails/IUK/Frontend.pm:334 +#, perl-brace-format +msgid "" +"The available incremental upgrade requires %{memory_needed}s of free memory," +" but only %{free_memory}s is available." +msgstr "Actualizarea incrementală disponibilă necesită %{memory_needed}s din memoria disponibilă, dar numai %{free_memory}s este disponibil." + +#: ../lib/Tails/IUK/Frontend.pm:356 +msgid "" +"An incremental upgrade is available, but no full upgrade is.\n" +"This should not happen. Please report a bug." +msgstr "O actualizare incrementală este disponibilă, dar nu o actualizare completă. Aceasta nu ar trebui să se întîmple. Raportați un bug." + +#: ../lib/Tails/IUK/Frontend.pm:360 +msgid "Error while detecting available upgrades" +msgstr "Eroare în timpul căutării upgradeurilor disponibile" + +#: ../lib/Tails/IUK/Frontend.pm:370 +#, perl-brace-format +msgid "" +"You should upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is recommended to close all the open applications during the upgrade.\n" +"Downloading the upgrade might take a long time, from several minutes to a few hours.\n" +"The networking will be disabled after downloading the upgrade.\n" +"\n" +"Download size: %{size}s\n" +"\n" +"Do you want to upgrade now?" +msgstr "Ar trebui să actualizați la %{name}s %{version}s.\n\nPentru mai multe informații despre această versiune nouă mergeți la %{details_url}s\n\nSe recomandă să închideți toate aplicațiile deschise în timpul actualizării.\nDescărcarea actualizării poate lua mult timp, de la cîteva minute pînă la cîteva ore.\nRețeaua va fi oprită după descărcarea actualizării.\n\nDimensiune download: %{size}s\n\nVreți să actualizați acum?" + +#: ../lib/Tails/IUK/Frontend.pm:385 +msgid "Upgrade available" +msgstr "Actualizare disponibilă" + +#: ../lib/Tails/IUK/Frontend.pm:386 +msgid "Upgrade now" +msgstr "Actualizați acum" + +#: ../lib/Tails/IUK/Frontend.pm:387 +msgid "Upgrade later" +msgstr "Actualizați mai tîrziu" + +#: ../lib/Tails/IUK/Frontend.pm:395 +#, perl-brace-format +msgid "" +"You should do a manual upgrade to %{name}s %{version}s.\n" +"\n" +"For more information about this new version, go to %{details_url}s\n" +"\n" +"It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" +"\n" +"To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "Ar trebui să faceți o actualizare manuală la %{name}s %{version}s.\n\nPentru mai multe informații despre această versiune nouă mergeți la %{details_url}s\n\nNu este posibil să actualizați automat acum la această nouă versiune: %{explanation}s.\n\nPentru a afla cum să faceți o actualizare manuală mergeți la https://tails.boum.org/doc/first_steps/upgrade/#manual" + +#: ../lib/Tails/IUK/Frontend.pm:411 +msgid "New version available" +msgstr "Versiune nouă disponibilă" + +#: ../lib/Tails/IUK/Frontend.pm:468 +msgid "Downloading upgrade" +msgstr "Descarc actualizarea" + +#: ../lib/Tails/IUK/Frontend.pm:471 +#, perl-brace-format +msgid "Downloading the upgrade to %{name}s %{version}s..." +msgstr "Descarc actualizarea la %{name}s %{version}s..." + +#: ../lib/Tails/IUK/Frontend.pm:512 +msgid "" +"The upgrade could not be downloaded.\\n\\nCheck your network " +"connection, and restart Tails to try upgrading again.\\n\\nIf the problem " +"persists, go to " +"file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" +msgstr "Actualizarea nu a fost descărcată.\\n\\nVerificați-vă conexiunea la rețea și reporniți Tails pentru a reîncerca actualizarea.\\n\\nDacă problema persistă mergeți la file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +msgid "Error while downloading the upgrade" +msgstr "Eroare la descărcarea actualizării" + +#: ../lib/Tails/IUK/Frontend.pm:540 +#, perl-brace-format +msgid "" +"Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " +"did not complain. Please report a bug." +msgstr "Fișierul ieșire '%{output_file}s' nu există, dar tails-iuk-get-target-file nu a anunțat. Raportați un bug." + +#: ../lib/Tails/IUK/Frontend.pm:559 +msgid "Error while creating temporary downloading directory" +msgstr "Eroare la crearea folderului temporar pentru descărcare" + +#: ../lib/Tails/IUK/Frontend.pm:562 +msgid "Failed to create temporary download directory" +msgstr "Am eșuat să creez un director temporar pentru descărcare" + +#: ../lib/Tails/IUK/Frontend.pm:574 +msgid "" +"Your Tails device was successfully upgraded.\n" +"\n" +"Some security features were temporarily disabled.\n" +"You should restart Tails on the new version as soon as possible.\n" +"\n" +"Do you want to restart now?" +msgstr "Aparatul Tails a fost actualizat cu succes.\n\nAnumite funcți de securitate au fost dezactivate temporar.\nAr trebui să reporniți Tails cu noua versiune cît mai curînd posibil.\n\nVreți să repornesc acum?" + +#: ../lib/Tails/IUK/Frontend.pm:579 +msgid "Restart Tails" +msgstr "Reporniți Tails" + +#: ../lib/Tails/IUK/Frontend.pm:580 +msgid "Restart now" +msgstr "Reporniți" + +#: ../lib/Tails/IUK/Frontend.pm:581 +msgid "Restart later" +msgstr "Reporniți mai tarziu" + +#: ../lib/Tails/IUK/Frontend.pm:592 +msgid "Error while restarting the system" +msgstr "Eroare in timpul repornirii sistemului" + +#: ../lib/Tails/IUK/Frontend.pm:595 +msgid "Failed to restart the system" +msgstr "Am eșuat să repornesc sistemul" + +#: ../lib/Tails/IUK/Frontend.pm:610 +msgid "Error while shutting down the network" +msgstr "Eroare la oprirea rețelei" + +#: ../lib/Tails/IUK/Frontend.pm:613 +msgid "Failed to shutdown network" +msgstr "Am eșuat să opresc rețeaua" + +#: ../lib/Tails/IUK/Frontend.pm:623 +msgid "Upgrading the system" +msgstr "Actualizez sistemul" + +#: ../lib/Tails/IUK/Frontend.pm:625 +msgid "" +"Your Tails device is being upgraded...\n" +"\n" +"For security reasons, the networking is now disabled." +msgstr "Aparatul Tails este actualizat...\n\nDin motive de securitate, rețeaua este dezactivată." + +#: ../lib/Tails/IUK/Frontend.pm:662 +msgid "" +"An error occured while installing the upgrade.\\n\\nYour Tails device" +" needs to be repaired and might be unable to restart.\\n\\nPlease follow the" +" instructions at " +"file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "A avut loc o eroare la instalarea actualizării.\\n\\nAparatul Tails trebuie să fie reparat și ar putea să nu poată să fie repornit.\\n\\nUrmați instrucțiunile de la file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" + +#: ../lib/Tails/IUK/Frontend.pm:672 +msgid "Error while installing the upgrade" +msgstr "Eroare la instalarea actualizării"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 13 Jul '14

13 Jul '14

commit 56a5020c3e163adb2a5eccec0908e277d5b394e2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 13 19:15:49 2014 +0000 Update translations for tails-iuk --- ro.po | 74 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/ro.po b/ro.po index a870d6b..4b566e5 100644 --- a/ro.po +++ b/ro.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-06-24 11:44+0200\n" -"PO-Revision-Date: 2014-07-13 18:45+0000\n" +"PO-Revision-Date: 2014-07-13 19:10+0000\n" "Last-Translator: isus <isus(a)openmailbox.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 msgid "For debugging information, see /home/amnesia/.xsession-errors" -msgstr "" +msgstr "Pentru informații debugging, vezi /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" -msgstr "" +msgstr "Eroare la căutarea actualizărilor" #: ../lib/Tails/IUK/Frontend.pm:219 msgid "" @@ -35,23 +35,23 @@ msgid "" "Check your network connection, and restart Tails to try upgrading again.\n" "\n" "If the problem persists, go to file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" -msgstr "" +msgstr "Nu am putut detecta dacă o actualizare este diponibilă pe website.\n\nVerificați conexiunea la rețea reporniți Tails și reîncercați să actualizați.\n\nDacă problema persistă, mergeți la file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html" #: ../lib/Tails/IUK/Frontend.pm:234 msgid "no automatic upgrade is available from our website for this version" -msgstr "" +msgstr "pentru această versiune nu există actualizare automată pe website" #: ../lib/Tails/IUK/Frontend.pm:240 msgid "your device was not created using Tails Installer" -msgstr "" +msgstr "aparatul nu a fost creat cu Tails installer" #: ../lib/Tails/IUK/Frontend.pm:245 msgid "Tails was started from a DVD or a read-only device" -msgstr "" +msgstr "Tails a fost pornit de pe un DVD sau un aparat read-only" #: ../lib/Tails/IUK/Frontend.pm:250 msgid "there is not enough free space on the Tails system partition" -msgstr "" +msgstr "nu este destul spațiu liber pe partiția de sistem a Tails" #: ../lib/Tails/IUK/Frontend.pm:255 msgid "not enough memory is available on this system" @@ -60,7 +60,7 @@ msgstr "memorie insuficienta disponibila in acest sistem" #: ../lib/Tails/IUK/Frontend.pm:261 #, perl-brace-format msgid "No explanation available for reason '%{reason}s'." -msgstr "" +msgstr "Nu am explicație pentru motivul '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" @@ -75,20 +75,20 @@ msgstr "Această versiune de Tails este depășită și ar putea avea probleme d msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "Actualizarea incrementală disponibilă necesită %[space_needed]s din spațiul disponibil pe partiția sistemului TAILS, dar numai %[free_space]s este disponibil." +msgstr "Actualizarea incrementală disponibilă necesită %{space_needed}s din spațiul disponibil pe partiția sistemului TAILS, dar numai %{free_space}s este disponibil." #: ../lib/Tails/IUK/Frontend.pm:334 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." -msgstr "" +msgstr "Actualizarea incrementală disponibilă necesită %{memory_needed}s din memoria disponibilă, dar numai %{free_memory}s este disponibil." #: ../lib/Tails/IUK/Frontend.pm:356 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." -msgstr "" +msgstr "O actualizare incrementală este disponibilă, dar nu o actualizare completă. Aceasta nu ar trebui să se întîmple. Raportați un bug." #: ../lib/Tails/IUK/Frontend.pm:360 msgid "Error while detecting available upgrades" @@ -108,19 +108,19 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "Ar trebui să actualizați la %{name}s %{version}s.\n\nPentru mai multe informații despre această versiune nouă mergeți la %{details_url}s\n\nSe recomandă să închideți toate aplicațiile deschise în timpul actualizării.\nDescărcarea actualizării poate lua mult timp, de la cîteva minute pînă la cîteva ore.\nRețeaua va fi oprită după descărcarea actualizării.\n\nDimensiune download: %{size}s\n\nVreți să actualizați acum?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" -msgstr "" +msgstr "Actualizare disponibilă" #: ../lib/Tails/IUK/Frontend.pm:386 msgid "Upgrade now" -msgstr "" +msgstr "Actualizați acum" #: ../lib/Tails/IUK/Frontend.pm:387 msgid "Upgrade later" -msgstr "" +msgstr "Actualizați mai tîrziu" #: ../lib/Tails/IUK/Frontend.pm:395 #, perl-brace-format @@ -132,20 +132,20 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "Ar trebui să faceți o actualizare manuală la %{name}s %{version}s.\n\nPentru mai multe informații despre această versiune nouă mergeți la %{details_url}s\n\nNu este posibil să actualizați automat acum la această nouă versiune: %{explanation}s.\n\nPentru a afla cum să faceți o actualizare manuală mergeți la https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available" -msgstr "O noua versiune disponibila" +msgstr "Versiune nouă disponibilă" #: ../lib/Tails/IUK/Frontend.pm:468 msgid "Downloading upgrade" -msgstr "" +msgstr "Descarc actualizarea" #: ../lib/Tails/IUK/Frontend.pm:471 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." -msgstr "" +msgstr "Descarc actualizarea la %{name}s %{version}s..." #: ../lib/Tails/IUK/Frontend.pm:512 msgid "" @@ -153,26 +153,26 @@ msgid "" "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " "persists, go to " "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -msgstr "" +msgstr "Actualizarea nu a fost descărcată.\\n\\nVerificați-vă conexiunea la rețea și reporniți Tails pentru a reîncerca actualizarea.\\n\\nDacă problema persistă mergeți la file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" #: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 msgid "Error while downloading the upgrade" -msgstr "" +msgstr "Eroare la descărcarea actualizării" #: ../lib/Tails/IUK/Frontend.pm:540 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "" +msgstr "Fișierul ieșire '%{output_file}s' nu există, dar tails-iuk-get-target-file nu a anunțat. Raportați un bug." #: ../lib/Tails/IUK/Frontend.pm:559 msgid "Error while creating temporary downloading directory" -msgstr "" +msgstr "Eroare la crearea folderului temporar pentru descărcare" #: ../lib/Tails/IUK/Frontend.pm:562 msgid "Failed to create temporary download directory" -msgstr "" +msgstr "Am eșuat să creez un director temporar pentru descărcare" #: ../lib/Tails/IUK/Frontend.pm:574 msgid "" @@ -182,46 +182,46 @@ msgid "" "You should restart Tails on the new version as soon as possible.\n" "\n" "Do you want to restart now?" -msgstr "" +msgstr "Aparatul Tails a fost actualizat cu succes.\n\nAnumite funcți de securitate au fost dezactivate temporar.\nAr trebui să reporniți Tails cu noua versiune cît mai curînd posibil.\n\nVreți să repornesc acum?" #: ../lib/Tails/IUK/Frontend.pm:579 msgid "Restart Tails" -msgstr "" +msgstr "Reporniți Tails" #: ../lib/Tails/IUK/Frontend.pm:580 msgid "Restart now" -msgstr "Restartare" +msgstr "Reporniți" #: ../lib/Tails/IUK/Frontend.pm:581 msgid "Restart later" -msgstr "Restartati mai tarziu" +msgstr "Reporniți mai tarziu" #: ../lib/Tails/IUK/Frontend.pm:592 msgid "Error while restarting the system" -msgstr "Eroare in timpul restartarii sistemului" +msgstr "Eroare in timpul repornirii sistemului" #: ../lib/Tails/IUK/Frontend.pm:595 msgid "Failed to restart the system" -msgstr "" +msgstr "Am eșuat să repornesc sistemul" #: ../lib/Tails/IUK/Frontend.pm:610 msgid "Error while shutting down the network" -msgstr "" +msgstr "Eroare la oprirea rețelei" #: ../lib/Tails/IUK/Frontend.pm:613 msgid "Failed to shutdown network" -msgstr "" +msgstr "Am eșuat să opresc rețeaua" #: ../lib/Tails/IUK/Frontend.pm:623 msgid "Upgrading the system" -msgstr "" +msgstr "Actualizez sistemul" #: ../lib/Tails/IUK/Frontend.pm:625 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." -msgstr "" +msgstr "Aparatul Tails este actualizat...\n\nDin motive de securitate, rețeaua este dezactivată." #: ../lib/Tails/IUK/Frontend.pm:662 msgid "" @@ -229,8 +229,8 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "" +msgstr "A avut loc o eroare la instalarea actualizării.\\n\\nAparatul Tails trebuie să fie reparat și ar putea să nu poată să fie repornit.\\n\\nUrmați instrucțiunile de la file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: ../lib/Tails/IUK/Frontend.pm:672 msgid "Error while installing the upgrade" -msgstr "" +msgstr "Eroare la instalarea actualizării"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 13 Jul '14

13 Jul '14

commit 479264b955a63a100ff710c1ad7fa8e80de9123b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 13 19:15:02 2014 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 141 ++++++++++++++++++++++++++------------------ 1 file changed, 83 insertions(+), 58 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index 541c546..6b64b11 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.po @@ -4,14 +4,15 @@ # # Translators: # Adda.17 <adrianatrifoi(a)gmail.com>, 2013 +# isus <isus(a)openmailbox.org>, 2014 # laura berindei <lauraagavriloae(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-06-06 20:10+0000\n" -"Last-Translator: laura berindei <lauraagavriloae(a)yahoo.com>\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-07-13 19:14+0000\n" +"Last-Translator: isus <isus(a)openmailbox.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,19 +23,16 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): -#. "bridge" -#. "bridges" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" #. "obfs2" #. "obfs3" #. "scramblesuit" -#. "fte" +#. "fteproxy" #. "Tor" #. "Tor Browser" -#. "TBB" -#: lib/bridgedb/HTTPServer.py:124 +#: lib/bridgedb/HTTPServer.py:121 msgid "Sorry! Something went wrong with your request." msgstr "Ne cerem scuze ! Ceva a funcţionat prost !" @@ -44,53 +42,58 @@ msgstr "[ Acesta este un mesaj automat ; va rugam nu răspundeţi ]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "" +msgstr "Acestea sînt punțile pentru dvs:" #: lib/bridgedb/strings.py:22 #, 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 "" +msgstr "Ați depășit rata limită. Încetiniți vă rog! Timpul minim între\nemailuri este %s ore. Toate emailurile în acest interval vor fi ignorate." #: lib/bridgedb/strings.py:25 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "COMMANDs: (combină COMMANDs pentru a specifica mai multe opțiuni simultan)" -#: lib/bridgedb/strings.py:27 +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" msgstr "Bine aţi venit la BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:29 +#: lib/bridgedb/strings.py:30 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "TYPEs transport suportate curent:" -#: lib/bridgedb/strings.py:30 +#: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" msgstr "Buna , %s!" -#: lib/bridgedb/strings.py:31 +#: lib/bridgedb/strings.py:32 msgid "Hello, friend!" msgstr "Buna , prietene !" -#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100 +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" -msgstr "" +msgstr "Chei publice" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:36 +#: lib/bridgedb/strings.py:37 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "" +msgstr "Acest email a fost generat cu curcubee, inorogi și scîntei pentru %s în %s la %s." -#: lib/bridgedb/strings.py:42 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -100,14 +103,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:48 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" msgstr "" -#: lib/bridgedb/strings.py:52 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -116,20 +125,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:65 +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Ce sunt punțile? " -#: lib/bridgedb/strings.py:66 +#: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:71 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Am nevoie de o cale alternativă de a obține punțile !" -#: lib/bridgedb/strings.py:72 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -137,75 +146,83 @@ msgid "" "%s or %s." msgstr "" -#: lib/bridgedb/strings.py:79 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!" -#: lib/bridgedb/strings.py:80 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." msgstr "Daca Tor nu funcţionează trimiteţi un mesaj la %s ." -#: lib/bridgedb/strings.py:81 +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:88 +#: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:89 +#: lib/bridgedb/strings.py:104 msgid "Get Bridges!" msgstr "" -#: lib/bridgedb/strings.py:93 +#: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" msgstr "" -#: lib/bridgedb/strings.py:94 +#: lib/bridgedb/strings.py:109 msgid "Do you need IPv6 addresses?" msgstr "" -#: lib/bridgedb/strings.py:95 +#: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" msgstr "" -#: lib/bridgedb/strings.py:99 +#: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." msgstr "" -#: lib/bridgedb/strings.py:100 +#: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:104 +#: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" msgstr "" -#: lib/bridgedb/strings.py:105 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 #, python-format msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." msgstr "" -#: lib/bridgedb/strings.py:108 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "" -#: lib/bridgedb/strings.py:111 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "" -#: lib/bridgedb/strings.py:114 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -213,24 +230,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:122 +#: lib/bridgedb/strings.py:141 msgid "Displays this message." msgstr "" -#: lib/bridgedb/strings.py:123 +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:124 +#: lib/bridgedb/strings.py:146 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:126 +#: lib/bridgedb/strings.py:148 msgid "Request a Pluggable Transport by TYPE." msgstr "" -#: lib/bridgedb/strings.py:127 +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" @@ -250,15 +272,19 @@ msgstr "" msgid "Contact" msgstr "Contact" -#: lib/bridgedb/templates/bridges.html:65 +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 msgid "Uh oh, spaghettios!" msgstr "" -#: lib/bridgedb/templates/bridges.html:70 +#: lib/bridgedb/templates/bridges.html:72 msgid "There currently aren't any bridges available..." msgstr "" -#: lib/bridgedb/templates/bridges.html:71 +#: lib/bridgedb/templates/bridges.html:73 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -283,7 +309,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "Ia %s punți %s" #: lib/bridgedb/templates/index.html:36 #, python-format @@ -299,28 +325,27 @@ msgstr "" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#. TRANSLATORS: Please do NOT translate the word "bridges"! -#: lib/bridgedb/templates/options.html:39 +#: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: lib/bridgedb/templates/options.html:53 +#: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" msgstr "" -#: lib/bridgedb/templates/options.html:89 +#: lib/bridgedb/templates/options.html:88 msgid "No" msgstr "Nu" -#: lib/bridgedb/templates/options.html:90 +#: 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:131 +#: lib/bridgedb/templates/options.html:130 #, python-format msgid "%sY%ses!" msgstr "" @@ -328,7 +353,7 @@ msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:155 +#: lib/bridgedb/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr ""

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 13 Jul '14

13 Jul '14

commit 210960466953fe66c0a6757eb52e1f0d3747a742 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 13 18:45:48 2014 +0000 Update translations for tails-iuk --- ro.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ro.po b/ro.po index e60277c..a870d6b 100644 --- a/ro.po +++ b/ro.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# lauraberindei <lauraagavriloae(a)yahoo.com>, 2014 +# isus <isus(a)openmailbox.org>, 2014 +# laura berindei <lauraagavriloae(a)yahoo.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 17:54+0200\n" -"PO-Revision-Date: 2014-05-02 20:30+0000\n" -"Last-Translator: lauraberindei <lauraagavriloae(a)yahoo.com>\n" +"POT-Creation-Date: 2014-06-24 11:44+0200\n" +"PO-Revision-Date: 2014-07-13 18:45+0000\n" +"Last-Translator: isus <isus(a)openmailbox.org>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,18 +64,18 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:281 msgid "The system is up-to-date" -msgstr "" +msgstr "Sistemul este la zi" #: ../lib/Tails/IUK/Frontend.pm:286 msgid "This version of Tails is outdated, and may have security issues." -msgstr "" +msgstr "Această versiune de Tails este depășită și ar putea avea probleme de securitate." #: ../lib/Tails/IUK/Frontend.pm:318 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." -msgstr "" +msgstr "Actualizarea incrementală disponibilă necesită %[space_needed]s din spațiul disponibil pe partiția sistemului TAILS, dar numai %[free_space]s este disponibil." #: ../lib/Tails/IUK/Frontend.pm:334 #, perl-brace-format @@ -91,7 +92,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:360 msgid "Error while detecting available upgrades" -msgstr "" +msgstr "Eroare în timpul căutării upgradeurilor disponibile" #: ../lib/Tails/IUK/Frontend.pm:370 #, perl-brace-format

1 0

r26867: {website} add 3 new mirrors. (website/trunk/include)
by Andrew Lewman 13 Jul '14

13 Jul '14

Author: phobos Date: 2014-07-13 18:39:37 +0000 (Sun, 13 Jul 2014) New Revision: 26867 Modified: website/trunk/include/tor-mirrors.csv Log: add 3 new mirrors. Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-07-12 11:17:28 UTC (rev 26866) +++ website/trunk/include/tor-mirrors.csv 2014-07-13 18:39:37 UTC (rev 26867) @@ -100,3 +100,6 @@ rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, https://ayo.tl/tor/dist/, , , , admin AT nuclear DASH weapons DOT net,Setec Administrator,US,Texas,Austin,TRUE,FALSE,No,http://tor.nuclear-weapons.net,…, stefano.fenoglio AT gmail DOT com,Tor Supporter,IT,Italy,Europe,TRUE,FALSE,No,http://tor.stefanof.com,,,,,,http:/…,,, +mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, VN, TRUE, TRUE, Yes, http://torproject.ip-connect.vn.ua, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , , +Tor Fan, tor.d4rkn3t.com, US, United States, US, TRUE, TRUE, No, http://tor.d4rkn3t.com/, , , , http://tor.d4rkn3t.com/dist/, , , , +Jacob Henner,Anatomical Networks, US,United States,US,TRUE,TRUE,TRUE, http://tor.ventricle.us/,,,,http://tor.ventricle.us/dist/,,,,

1 0

[arm/master] Rewriting header panel's ports section
by atagar＠torproject.org 13 Jul '14

13 Jul '14

commit 8268a9e24cb4d140226944195f248cda45f2539e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 29 23:50:48 2014 -0700 Rewriting header panel's ports section Overhauling the second header panel section. For most (but not all) attributes we displayed either a full entry or nothing at all. That is to say, if we had room for 'Dir Port: 80' then we show it, but otherwise omit it entirely. This is generally preferable for really, really tiny screens. I'm dropping that. It made the code quite a bit more clunky and generally only arises with consoles skinnier than fourty columns or so. That's... rare to say the least, and it's perfectly fine for us to render with normal cropping there. --- arm/header_panel.py | 102 ++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 62 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index d3d3945..614ec52 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -156,65 +156,7 @@ class HeaderPanel(panel.Panel, threading.Thread): right_width = width - left_width self._draw_platform_section(0, 0, left_width, vals) - - # Line 2 / Line 2 Left (tor ip/port information) - - x, include_control_port = 0, True - - if vals.or_port: - # acting as a relay (we can assume certain parameters are set - - entries = ( - vals.nickname, - ' - ' + vals.or_address, - ':%s' % vals.or_port, - ', Dir Port: %s' % vals.dir_port if vals.dir_port != '0' else '', - ) - - for label in entries: - if x + len(label) <= left_width: - self.addstr(1, x, label) - x += len(label) - else: - break - else: - # non-relay (client only) - - if self.vals.is_connected: - self.addstr(1, x, 'Relaying Disabled', ui_tools.get_color('cyan')) - x += 17 - else: - status_time = tor_controller().get_latest_heartbeat() - - if status_time: - status_time_label = time.strftime('%H:%M %m/%d/%Y, ', time.localtime(status_time)) - else: - status_time_label = '' # never connected to tor - - self.addstr(1, x, 'Tor Disconnected', curses.A_BOLD | ui_tools.get_color('red')) - self.addstr(1, x + 16, ' (%spress r to reconnect)' % status_time_label) - x += 39 + len(status_time_label) - include_control_port = False - - if include_control_port: - if vals.control_port == '0': - # connected via a control socket - self.addstr(1, x, ', Control Socket: %s' % vals.socket_path) - else: - if vals.is_password_auth: - auth_type = 'password' - elif vals.is_cookie_auth: - auth_type = 'cookie' - else: - auth_type = 'open' - - if x + 19 + len(vals.control_port) + len(auth_type) <= left_width: - auth_color = 'red' if auth_type == 'open' else 'green' - self.addstr(1, x, ', Control Port (') - self.addstr(1, x + 16, auth_type, ui_tools.get_color(auth_color)) - self.addstr(1, x + 16 + len(auth_type), '): %s' % vals.control_port) - elif x + 16 + len(vals.control_port) <= left_width: - self.addstr(1, 0, ', Control Port: %s' % vals.control_port) + self._draw_ports_section(0, 1, left_width, vals) # Line 3 / Line 1 Right (system usage info) @@ -384,6 +326,37 @@ class HeaderPanel(panel.Panel, threading.Thread): x = self.addstr(y, x, vals.version_status, ui_tools.get_color(version_color)) self.addstr(y, x, ')') + def _draw_ports_section(self, x, y, width, vals): + """ + Section providing our nickname, address, and port information... + + Unnamed - 0.0.0.0:7000, Control Port (cookie): 9051 + """ + + if self.vals.is_connected: + if not vals.or_port: + x = self.addstr(y, x, 'Relaying Disabled', ui_tools.get_color('cyan')) + else: + x = self.addstr(y, x, '%s - %s:%s' % (vals.nickname, vals.or_address, vals.or_port)) + + if vals.dir_port != '0': + x = self.addstr(y, x, ', Dir Port: %s' % vals.dir_port) + else: + x = self.addstr(y, x, 'Tor Disconnected', curses.A_BOLD | ui_tools.get_color('red')) + x = self.addstr(y, x, ' (%s, press r to reconnect)' % self.last_heartbeat) + + if vals.control_port == '0': + self.addstr(y, x, ', Control Socket: %s' % vals.socket_path) + else: + if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): + auth_color = 'red' if vals.auth_type == 'open' else 'green' + + x = self.addstr(y, x, ', Control Port (') + x = self.addstr(y, x, vals.auth_type, ui_tools.get_color(auth_color)) + self.addstr(y, x, '): %s' % vals.control_port) + else: + self.addstr(y, x, ', Control Port: %s' % vals.control_port) + def get_pause_time(self): """ Provides the time Tor stopped if it isn't running. Otherwise this is the @@ -499,6 +472,7 @@ class Sampling(object): tor_resources = arm.util.tracker.get_resource_tracker().get_value() self.is_connected = controller.is_alive() + self.last_heartbeat = time.strftime('%H:%M %m/%d/%Y', time.localtime(controller.get_latest_heartbeat())) self.retrieved = time.time() self.arm_total_cpu_time = sum(os.times()[:3]) @@ -507,11 +481,15 @@ class Sampling(object): self.or_address = or_listeners[0][0] if or_listeners else controller.get_info('address', 'Unknown') self.or_port = or_listeners[0][1] if or_listeners else '' self.dir_port = controller.get_conf('DirPort', '0') - self.control_port = controller.get_conf('ControlPort', '0') self.socket_path = controller.get_conf('ControlSocket', '') - self.is_password_auth = controller.get_conf('HashedControlPassword', None) is not None - self.is_cookie_auth = controller.get_conf('CookieAuthentication', None) == '1' + + if controller.get_conf('HashedControlPassword', None): + self.auth_type = 'password' + elif controller.get_conf('CookieAuthentication', None) == '1': + self.auth_type = 'cookie' + else: + self.auth_type = 'open' self.exit_policy = str(controller.get_exit_policy('')) self.flags = self._get_flags(controller)

1 0

[arm/master] Rewriting header panel's fingerprint section
by atagar＠torproject.org 13 Jul '14

13 Jul '14

commit 6527ded420fe095a557360323e74ce5ad4664eb9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 12 21:27:49 2014 -0700 Rewriting header panel's fingerprint section Simple section that includes the fingerprint and possibly descriptor information. One change this makes is that we no longer allow an armrc configuration to make us always show the file descriptors (I'd be surprised if anyone ever used that). --- arm/header_panel.py | 65 ++++++++++++++++++++++++++------------------------- armrc.sample | 4 ---- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 58e4db1..6b61379 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -26,11 +26,11 @@ import arm.controller from util import panel, ui_tools, tor_controller MIN_DUAL_COL_WIDTH = 141 # minimum width where we'll show two columns +SHOW_FD_THRESHOLD = 60 # show file descriptor usage if usage is over this percentage CONFIG = conf.config_dict('arm', { 'attr.flag_colors': {}, 'attr.version_status_colors': {}, - 'features.showFdUsage': False, }) @@ -166,37 +166,10 @@ class HeaderPanel(panel.Panel, threading.Thread): self._draw_resource_usage(0, 2, left_width, vals) if vals.or_port: - # Line 4 / Line 2 Right (fingerprint, and possibly file descriptor usage) - - y, x = (1, left_width) if is_wide else (3, 0) - - fingerprint_label = ui_tools.crop_str('fingerprint: %s' % vals.fingerprint, width) - self.addstr(y, x, fingerprint_label) - - # if there's room and we're able to retrieve both the file descriptor - # usage and limit then it might be presented - - if width - x - 59 >= 20 and vals.fd_used and vals.fd_limit: - # display file descriptor usage if we're either configured to do so or - # running out - - fd_percent = 100 * vals.fd_used / vals.fd_limit - - if fd_percent >= 60 or CONFIG['features.showFdUsage']: - fd_percentLabel, fd_percent_format = '%i%%' % fd_percent, curses.A_NORMAL - - if fd_percent >= 95: - fd_percent_format = curses.A_BOLD | ui_tools.get_color('red') - elif fd_percent >= 90: - fd_percent_format = ui_tools.get_color('red') - elif fd_percent >= 60: - fd_percent_format = ui_tools.get_color('yellow') - - base_label = 'file desc: %i / %i (' % (vals.fd_used, vals.fd_limit) - - self.addstr(y, x + 59, base_label) - self.addstr(y, x + 59 + len(base_label), fd_percentLabel, fd_percent_format) - self.addstr(y, x + 59 + len(base_label) + len(fd_percentLabel), ')') + if is_wide: + self._draw_fingerprint_and_fd_usage(left_width, 1, right_width, vals) + else: + self._draw_fingerprint_and_fd_usage(0, 3, left_width, vals) # Line 5 / Line 3 Left (flags) @@ -367,6 +340,34 @@ class HeaderPanel(panel.Panel, threading.Thread): else: break + def _draw_fingerprint_and_fd_usage(self, x, y, width, vals): + """ + Presents our fingerprint, and our file descriptor usage if we're running + out... + + fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B, file desc: 900 / 1000 (90%) + """ + + x, space_left = self.addtstr(y, x, vals.format('fingerprint: {fingerprint}'), width) + + if space_left >= 30 and vals.fd_used and vals.fd_limit: + fd_percent = 100 * vals.fd_used / vals.fd_limit + + if fd_percent >= SHOW_FD_THRESHOLD: + if fd_percent >= 95: + percentage_format = curses.A_BOLD | ui_tools.get_color('red') + elif fd_percent >= 90: + percentage_format = ui_tools.get_color('red') + elif fd_percent >= 60: + percentage_format = ui_tools.get_color('yellow') + else: + percentage_format = curses.A_NORMAL + + x = self.addstr(y, x, ', file descriptors' if space_left >= 37 else ', file desc') + x = self.addstr(y, x, vals.format(': {fd_used} / {fd_limit} (')) + x = self.addstr(y, x, '%i%%' % fd_percent, percentage_format) + self.addstr(y, x, ')') + def run(self): """ Keeps stats updated, checking for new information at a set rate. diff --git a/armrc.sample b/armrc.sample index 540bb6d..6639879 100644 --- a/armrc.sample +++ b/armrc.sample @@ -46,10 +46,6 @@ tor.chroot # events. features.logFile -# If true, the header panel always shows the file descriptor usage. Otherwise -# this is only displayed when we're running out. -features.showFdUsage false - # Seconds to wait on user input before refreshing content features.redrawRate 5

1 0

[arm/master] Rewriting header panel's resource usage section
by atagar＠torproject.org 13 Jul '14

13 Jul '14

commit 2a6b57e53094d07007207faad14bff8b2a0a616b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 12 19:49:08 2014 -0700 Rewriting header panel's resource usage section --- arm/header_panel.py | 76 +++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 614ec52..7aba465 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -12,10 +12,12 @@ import threading import arm.util.tracker import stem +import stem.util.proc +import stem.util.str_tools import stem.util.system from stem.control import Listener, State -from stem.util import conf, log, proc, str_tools +from stem.util import conf, log import arm.starter import arm.popups @@ -158,34 +160,12 @@ class HeaderPanel(panel.Panel, threading.Thread): self._draw_platform_section(0, 0, left_width, vals) self._draw_ports_section(0, 1, left_width, vals) - # Line 3 / Line 1 Right (system usage info) - - y, x = (0, left_width) if is_wide else (2, 0) - - if vals.rss != '0': - memory_label = str_tools.get_size_label(int(vals.rss)) + if is_wide: + self._draw_resource_usage(left_width, 0, right_width, vals) else: - memory_label = '0' - - uptime_label = '' - - if vals.start_time: - if self.is_paused() or not self.vals.is_connected: - # freeze the uptime when paused or the tor process is stopped - uptime_label = str_tools.get_short_time_label(self.get_pause_time() - vals.start_time) - else: - uptime_label = str_tools.get_short_time_label(time.time() - vals.start_time) - - sys_fields = ((0, 'cpu: %s%% tor, %s%% arm' % (vals.tor_cpu, vals.arm_cpu)), - (27, 'mem: %s (%s%%)' % (memory_label, vals.memory)), - (47, 'pid: %s' % (vals.pid if self.vals.is_connected else '')), - (59, 'uptime: %s' % uptime_label)) + self._draw_resource_usage(0, 2, left_width, vals) - for (start, label) in sys_fields: - if start + len(label) <= (right_width if is_wide else left_width): - self.addstr(y, x + start, label) - else: - break + # Line 3 / Line 1 Right (system usage info) if vals.or_port: # Line 4 / Line 2 Right (fingerprint, and possibly file descriptor usage) @@ -357,16 +337,37 @@ class HeaderPanel(panel.Panel, threading.Thread): else: self.addstr(y, x, ', Control Port: %s' % vals.control_port) - def get_pause_time(self): + def _draw_resource_usage(self, x, y, width, vals): """ - Provides the time Tor stopped if it isn't running. Otherwise this is the - time we were last paused. + System resource usage of the tor process... + + cpu: 0.0% tor, 1.0% arm mem: 0 (0.0%) pid: 16329 uptime: 12-20:42:07 """ - if self._halt_time: - return self._halt_time + if vals.start_time: + if not self.vals.is_connected: + now = self._halt_time + elif self.is_paused(): + now = self.get_pause_time() + else: + now = time.time() + + uptime = stem.util.str_tools.get_short_time_label(now - vals.start_time) else: - return panel.Panel.get_pause_time(self) + uptime = '' + + sys_fields = ( + (0, 'cpu: %s%% tor, %s%% arm' % (vals.tor_cpu, vals.arm_cpu)), + (27, 'mem: %s (%s%%)' % (vals.memory, vals.memory_percent)), + (47, 'pid: %s' % vals.pid), + (59, 'uptime: %s' % uptime), + ) + + for (start, label) in sys_fields: + if width >= start + len(label): + self.addstr(y, x + start, label) + else: + break def run(self): """ @@ -468,7 +469,6 @@ class Sampling(object): fd_limit = controller.get_info('process/descriptor-limit', '-1') uname_vals = os.uname() - start_time = stem.util.system.get_start_time(controller.get_pid(None)) tor_resources = arm.util.tracker.get_resource_tracker().get_value() self.is_connected = controller.is_alive() @@ -497,14 +497,14 @@ class Sampling(object): self.version_status = controller.get_info('status/version/current', 'Unknown') self.pid = controller.get_pid('') - self.start_time = start_time if start_time else '' + self.start_time = stem.util.system.get_start_time(controller.get_pid(None)) self.fd_limit = int(fd_limit) if fd_limit.isdigit() else None self.fd_used = self._get_fd_used(controller.get_pid(None)) if self.fd_limit else 0 self.tor_cpu = '%0.1f' % (100 * tor_resources.cpu_sample) self.arm_cpu = '%0.1f' % (100 * self._get_cpu_percentage(last_sampling)) - self.rss = str(tor_resources.memory_bytes) - self.memory = '%0.1f' % (100 * tor_resources.memory_percent) + self.memory = stem.util.str_tools.get_size_label(tor_resources.memory_bytes) if tor_resources.memory_bytes > 0 else 0 + self.memory_percent = '%0.1f' % (100 * tor_resources.memory_percent) self.hostname = uname_vals[1] self.platform = '%s %s' % (uname_vals[0], uname_vals[2]) # [platform name] [version] @@ -525,7 +525,7 @@ class Sampling(object): # # I'm not sure about other platforms (like BSD) so erroring out there. - if pid and proc.is_available(): + if pid and stem.util.proc.is_available(): try: return len(os.listdir('/proc/%s/fd' % pid)) except:

1 0

[arm/master] Adding a format() method to the header panel's Sampling
by atagar＠torproject.org 13 Jul '14

13 Jul '14

commit 570f5aa2d10f807f1d8291d511c689e59badc1c6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 12 20:04:05 2014 -0700 Adding a format() method to the header panel's Sampling Method so we can apply Samplings via a format() style method. --- arm/header_panel.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 7aba465..58e4db1 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -165,8 +165,6 @@ class HeaderPanel(panel.Panel, threading.Thread): else: self._draw_resource_usage(0, 2, left_width, vals) - # Line 3 / Line 1 Right (system usage info) - if vals.or_port: # Line 4 / Line 2 Right (fingerprint, and possibly file descriptor usage) @@ -289,7 +287,7 @@ class HeaderPanel(panel.Panel, threading.Thread): """ space_left = min(width, 40) - x, space_left = self.addtstr(y, x, 'arm - %s' % vals.hostname, space_left) + x, space_left = self.addtstr(y, x, vals.format('arm - {hostname}'), space_left) if space_left >= 10: self.addstr(y, x, ' (%s)' % ui_tools.crop_str(vals.platform, space_left - 3, 4)) @@ -297,7 +295,7 @@ class HeaderPanel(panel.Panel, threading.Thread): x, space_left = 43, width - 43 if vals.version != 'Unknown' and space_left >= 10: - x, space_left = self.addtstr(y, x, 'Tor %s' % vals.version, space_left) + x, space_left = self.addtstr(y, x, vals.format('Tor {version}'), space_left) if space_left >= 7 + len(vals.version_status): version_color = CONFIG['attr.version_status_colors'].get(vals.version_status, 'white') @@ -317,23 +315,23 @@ class HeaderPanel(panel.Panel, threading.Thread): if not vals.or_port: x = self.addstr(y, x, 'Relaying Disabled', ui_tools.get_color('cyan')) else: - x = self.addstr(y, x, '%s - %s:%s' % (vals.nickname, vals.or_address, vals.or_port)) + x = self.addstr(y, x, vals.format('{nickname} - {or_address}:{or_port}')) if vals.dir_port != '0': - x = self.addstr(y, x, ', Dir Port: %s' % vals.dir_port) + x = self.addstr(y, x, vals.format(', Dir Port: {dir_port}')) else: x = self.addstr(y, x, 'Tor Disconnected', curses.A_BOLD | ui_tools.get_color('red')) x = self.addstr(y, x, ' (%s, press r to reconnect)' % self.last_heartbeat) if vals.control_port == '0': - self.addstr(y, x, ', Control Socket: %s' % vals.socket_path) + self.addstr(y, x, vals.format(', Control Socket: {socket_path}')) else: if width >= x + 19 + len(vals.control_port) + len(vals.auth_type): auth_color = 'red' if vals.auth_type == 'open' else 'green' x = self.addstr(y, x, ', Control Port (') x = self.addstr(y, x, vals.auth_type, ui_tools.get_color(auth_color)) - self.addstr(y, x, '): %s' % vals.control_port) + self.addstr(y, x, vals.format('): {control_port}')) else: self.addstr(y, x, ', Control Port: %s' % vals.control_port) @@ -357,9 +355,9 @@ class HeaderPanel(panel.Panel, threading.Thread): uptime = '' sys_fields = ( - (0, 'cpu: %s%% tor, %s%% arm' % (vals.tor_cpu, vals.arm_cpu)), - (27, 'mem: %s (%s%%)' % (vals.memory, vals.memory_percent)), - (47, 'pid: %s' % vals.pid), + (0, vals.format('cpu: {tor_cpu}% tor, {arm_cpu}% arm')), + (27, vals.format('mem: {memory} ({memory_percent}%)')), + (47, vals.format('pid: {pid}')), (59, 'uptime: %s' % uptime), ) @@ -508,6 +506,13 @@ class Sampling(object): self.hostname = uname_vals[1] self.platform = '%s %s' % (uname_vals[0], uname_vals[2]) # [platform name] [version] + def format(self, msg): + """ + Applies our attributes to the given string. + """ + + return msg.format(**self.__dict__) + def _get_fd_used(self, pid): """ Provides the number of file descriptors currently being used by this

1 0