March 2013 - tor-commits - lists.torproject.org

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 20 Mar '13

20 Mar '13

commit c033cdbff41a0c338fc05ef110ef5549e8cdc6ec Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 20 00:46:18 2013 +0000 Update translations for mat-gui --- fi.po | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/fi.po b/fi.po new file mode 100644 index 0000000..945f8ef --- /dev/null +++ b/fi.po @@ -0,0 +1,178 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mikko Harhanen <gitti(a)mikkoharhanen.fi>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-01-05 20:03+0100\n" +"PO-Revision-Date: 2013-03-20 00:45+0000\n" +"Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: mat-gui:95 mat-gui:563 mat-gui:579 +msgid "Ready" +msgstr "Valmis" + +#: mat-gui:107 +msgid "Add" +msgstr "Lisää" + +#: mat-gui:109 mat-gui:183 +msgid "Add files" +msgstr "" + +#: mat-gui:113 mat-gui:203 mat-gui:308 mat-gui:311 mat-gui:555 mat-gui:557 +#: mat-gui:573 mat-gui:575 +msgid "Clean" +msgstr "" + +#: mat-gui:115 +msgid "Clean selected files" +msgstr "" + +#: mat-gui:119 mat-gui:214 +msgid "Check" +msgstr "" + +#: mat-gui:121 +msgid "Check selected files for harmful meta" +msgstr "" + +#: mat-gui:125 mat-gui:185 +msgid "Quit" +msgstr "" + +#: mat-gui:137 +msgid "Path" +msgstr "" + +#: mat-gui:137 mat-gui:363 +msgid "Filename" +msgstr "" + +#: mat-gui:137 mat-gui:365 +msgid "Mimetype" +msgstr "" + +#: mat-gui:137 +msgid "State" +msgstr "" + +#: mat-gui:138 +msgid "Cleaned file" +msgstr "" + +#: mat-gui:182 +msgid "Files" +msgstr "" + +#: mat-gui:188 +msgid "Edit" +msgstr "" + +#: mat-gui:189 +msgid "Clear the filelist" +msgstr "" + +#: mat-gui:192 mat-gui:447 +msgid "Preferences" +msgstr "" + +#: mat-gui:195 +msgid "Process" +msgstr "" + +#: mat-gui:218 +msgid "Help" +msgstr "" + +#: mat-gui:219 mat-gui:395 +msgid "Supported formats" +msgstr "" + +#: mat-gui:220 +msgid "About" +msgstr "" + +#: mat-gui:241 +msgid "Choose files" +msgstr "" + +#: mat-gui:248 +msgid "All files" +msgstr "" + +#: mat-gui:255 +msgid "Supported files" +msgstr "" + +#: mat-gui:297 +msgid "unknow" +msgstr "" + +#: mat-gui:313 mat-gui:559 +msgid "Dirty" +msgstr "" + +#: mat-gui:343 +msgid "Not-supported" +msgstr "" + +#: mat-gui:381 +msgid "This software was coded during the GSoC 2011" +msgstr "" + +#: mat-gui:386 +msgid "Website" +msgstr "" + +#: mat-gui:461 +msgid "Force Clean" +msgstr "" + +#: mat-gui:464 +msgid "Do not check if already clean before cleaning" +msgstr "" + +#: mat-gui:468 +msgid "Backup" +msgstr "" + +#: mat-gui:471 +msgid "Keep a backup copy" +msgstr "" + +#: mat-gui:474 +msgid "Reduce PDF quality" +msgstr "" + +#: mat-gui:477 +msgid "Reduce the produced PDF size and quality" +msgstr "" + +#: mat-gui:480 +msgid "Add unsupported file to archives" +msgstr "" + +#: mat-gui:484 +msgid "Add non-supported (and so non-anonymised) file to output archive" +msgstr "" + +#: mat-gui:554 +#, python-format +msgid "Checking %s..." +msgstr "" + +#: mat-gui:572 +#, python-format +msgid "Cleaning %s..." +msgstr ""

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 20 Mar '13

20 Mar '13

commit b183b31f432517f0869a7ffd5bb1452535b56ecd Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 20 00:46:08 2013 +0000 Update translations for tails-persistence-setup --- fi/fi.po | 85 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 43 insertions(+), 42 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index 6478348..335c915 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Mikko Harhanen <gitti(a)mikkoharhanen.fi>, 2013. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-10-03 17:39+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2013-03-20 00:42+0000\n" +"Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,15 +20,15 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:48 msgid "Personal Data" -msgstr "" +msgstr "Henkilökohtainen tieto" #: ../lib/Tails/Persistence/Configuration/Presets.pm:50 msgid "Keep files stored in the `Persistent' directory" -msgstr "" +msgstr "Säilyttää tiedostot hakemistossa 'Persistent'" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "GnuPG" -msgstr "" +msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" @@ -43,7 +44,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -51,7 +52,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" @@ -75,11 +76,11 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Selaimen kirjanmerkit" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Iceweasel-selaimen tallennetut kirjanmerkit" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -118,12 +119,12 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:298 msgid "Setup Tails persistent volume" -msgstr "" +msgstr "Valmistele Tailsin säilyvä osio" #: ../lib/Tails/Persistence/Setup.pm:442 #, perl-format msgid "Device %s already has a persistent volume." -msgstr "" +msgstr "Laitteella %s on jo säilyvä osio." #: ../lib/Tails/Persistence/Setup.pm:450 #, perl-format @@ -133,29 +134,29 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 #, perl-format msgid "Device %s has no persistent volume." -msgstr "" +msgstr "Laitteella %s ei ole säilyvää osiota." #: ../lib/Tails/Persistence/Setup.pm:464 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." -msgstr "" +msgstr "Et voi poistaa käytössä olevaa säilyvää osiota. Sinun täytyy käynnistää Tails uudelleen ilman kyseistä osiota." #: ../lib/Tails/Persistence/Setup.pm:483 msgid "Persistence volume is not unlocked." -msgstr "" +msgstr "Säilyvä osio ei ole lukitsematon." #: ../lib/Tails/Persistence/Setup.pm:488 msgid "Persistence volume is not mounted." -msgstr "" +msgstr "Säilyvä osio ei ole liitetty." #: ../lib/Tails/Persistence/Setup.pm:493 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "" +msgstr "Säilyvä osio ei ole luettavissa. Onko käyttöoikeus- tai omistajuusongelmia?" #: ../lib/Tails/Persistence/Setup.pm:498 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "" +msgstr "Säilyvä osioon ei voi kirjoittaa. Liitettiinkö se pelkällä lukuoikeudella?" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format @@ -178,7 +179,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" -msgstr "" +msgstr "Säilyvyysvelho - Valmis" #: ../lib/Tails/Persistence/Setup.pm:864 msgid "" @@ -189,11 +190,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" -msgstr "" +msgstr "Säilyvyysvelho - Säilyvän osion luominen" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 msgid "Choose a passphrase to protect the persistent volume" -msgstr "" +msgstr "Valitse säilyvää osiota suojaava salasana" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 @@ -201,7 +202,7 @@ msgstr "" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "%s:n pysyvä osio luodaan laitteelle %s %s. Osiolla säilytettävät tiedot salataan ja suojataan salalauseella." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" @@ -213,29 +214,29 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "Varo! Säilyvyydellä on seuraamuksia, jotka pitää ymmärtää. Tails ei voi auttaa, jos käytät sitä väärin! Katso artikkeli <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails documentation about persistence</a> oppiaksesi lisää." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Salalause:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "" +msgstr "Varmista salalause:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "" +msgstr "Salalause ei voi olla tyhjä" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "" +msgstr "Salalauseet eivät täsmää" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 msgid "Failed" -msgstr "" +msgstr "Epäonnistui" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 @@ -249,11 +250,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 msgid "Mounting Tails persistence partition." -msgstr "" +msgstr "Liitetään Tailsin säilyvä osio." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "Tailsin säilyvä osio liitetään." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Creating..." @@ -261,15 +262,15 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "Creating the persistent volume..." -msgstr "" +msgstr "Luodaan säilyvä osio..." #: ../lib/Tails/Persistence/Step/Configure.pm:60 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "Säilyvyysvelho - Säilyvän osion määrittely" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "Valitse tiedostot, jotka tallennetaan säilyvään osioon" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67 @@ -281,11 +282,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save" -msgstr "" +msgstr "Tallenna" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" -msgstr "" +msgstr "Tee valitusta hakemistosta säilyvä (absoluuttinen polku):" #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:" @@ -293,34 +294,34 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..." -msgstr "" +msgstr "Tallennetaan..." #: ../lib/Tails/Persistence/Step/Configure.pm:207 msgid "Saving persistence configuration..." -msgstr "" +msgstr "Tallennetaan säilyvyyden määrittelyt..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "Säilyvyysvelho - Säilyvän osion poistaminen" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "Säilyvät tietosi poistetaan." #: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "" +msgstr "Säilyvä osio %s (%s), joka on laitteessa %s %s, poistetaan." #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "Poista" #: ../lib/Tails/Persistence/Step/Delete.pm:99 msgid "Deleting..." -msgstr "" +msgstr "Poistetaan..." #: ../lib/Tails/Persistence/Step/Delete.pm:102 msgid "Deleting the persistent volume..." -msgstr "" +msgstr "Poistetaan säilyvä osio..."

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 20 Mar '13

20 Mar '13

commit b4220af3734527691801cc81883165e1980633f0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 20 00:16:14 2013 +0000 Update translations for tails-greeter_completed --- fi/fi.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/fi/fi.po b/fi/fi.po new file mode 100644 index 0000000..f7b0865 --- /dev/null +++ b/fi/fi.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mikko Harhanen <gitti(a)mikkoharhanen.fi>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2013-03-19 23:50+0000\n" +"Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Kirjaudu" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Tervetuloa käyttämään Tailsia" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Säilytä muutokset?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Kyllä" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Ei" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Salalause:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Vain lukuoikeus?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Lisää " + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Hallinnan salasana" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Valitse salasana siltä varalta, että joudut tekemään hallinnointiin liittyviä tehtäviä.⏎Turvallisuussyistä hallinnointi estetään ilman salasanaa." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Salasana:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Varmista salasana:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows-naamiointi" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Valinta naamioi Tailsin muistuttamaan Microsoft Windows XP:tä. Naamionti voi olla hyödyllistä julkisissa tiloissa, kun halutaan välttää epäluuloisuutta." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Ota Microsoft Windows XP -naamiointi käyttöön" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Kieli" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Maa-asetus" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Näppäinasettelu" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "Salasanat eivät täsmää" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist keskeytyi: %(returncode)s:⏎ %(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup keskeytyi: %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist keskeytyi: %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Väärä salalause. Yritä uudelleen." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Muu..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 20 Mar '13

20 Mar '13

commit b2322c5aa9421e01f7ab26da342852a8d0032bcf Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 20 00:16:12 2013 +0000 Update translations for tails-greeter --- fi/fi.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/fi/fi.po b/fi/fi.po index 6352172..f7b0865 100644 --- a/fi/fi.po +++ b/fi/fi.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-03-19 23:39+0000\n" +"PO-Revision-Date: 2013-03-19 23:50+0000\n" "Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -21,95 +21,95 @@ msgstr "" #: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 #: ../GdmGreeter/persistencewindow.py:128 msgid "Login" -msgstr "" +msgstr "Kirjaudu" #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 msgid "Welcome to Tails" -msgstr "" +msgstr "Tervetuloa käyttämään Tailsia" #: ../glade/persistencewindow.glade.h:3 msgid "Use persistence?" -msgstr "" +msgstr "Säilytä muutokset?" #: ../glade/persistencewindow.glade.h:4 msgid "Yes" -msgstr "" +msgstr "Kyllä" #: ../glade/persistencewindow.glade.h:5 msgid "No" -msgstr "" +msgstr "Ei" #: ../glade/persistencewindow.glade.h:6 msgid "Passphrase:" -msgstr "" +msgstr "Salalause:" #: ../glade/persistencewindow.glade.h:7 msgid "Read-Only?" -msgstr "" +msgstr "Vain lukuoikeus?" #: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/persistencewindow.glade.h:9 msgid "More options?" -msgstr "" +msgstr "Lisää " #: ../glade/optionswindow.glade.h:3 msgid "Administration password" -msgstr "" +msgstr "Hallinnan salasana" #: ../glade/optionswindow.glade.h:4 msgid "" "Enter an administration password in case you need to perform administration tasks.\n" "Otherwise it will be disabled for better security." -msgstr "" +msgstr "Valitse salasana siltä varalta, että joudut tekemään hallinnointiin liittyviä tehtäviä.⏎Turvallisuussyistä hallinnointi estetään ilman salasanaa." #: ../glade/optionswindow.glade.h:6 msgid "Password:" -msgstr "" +msgstr "Salasana:" #: ../glade/optionswindow.glade.h:7 msgid "Verify Password:" -msgstr "" +msgstr "Varmista salasana:" #: ../glade/optionswindow.glade.h:9 msgid "Windows Camouflage" -msgstr "" +msgstr "Windows-naamiointi" #: ../glade/optionswindow.glade.h:10 msgid "" "This option makes Tails look more like Microsoft Windows XP. This may be " "useful in public places in order to avoid attracting suspicion." -msgstr "" +msgstr "Valinta naamioi Tailsin muistuttamaan Microsoft Windows XP:tä. Naamionti voi olla hyödyllistä julkisissa tiloissa, kun halutaan välttää epäluuloisuutta." #: ../glade/optionswindow.glade.h:11 msgid "Activate Microsoft Windows XP Camouflage" -msgstr "" +msgstr "Ota Microsoft Windows XP -naamiointi käyttöön" #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language" -msgstr "" +msgstr "Kieli" #: ../glade/langpanel.glade.h:3 msgid "Locale" -msgstr "" +msgstr "Maa-asetus" #: ../glade/langpanel.glade.h:4 msgid "Layout" -msgstr "" +msgstr "Näppäinasettelu" #: ../GdmGreeter/optionswindow.py:68 msgid "Passwords do not match" -msgstr "" +msgstr "Salasanat eivät täsmää" #: ../GdmGreeter/persistence.py:59 #, python-format msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "" +msgstr "live-persist keskeytyi: %(returncode)s:⏎ %(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -117,7 +117,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "cryptsetup \n%(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" +msgstr "cryptsetup keskeytyi: %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format @@ -125,13 +125,13 @@ msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "" +msgstr "live-persist keskeytyi: %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" #: ../GdmGreeter/persistencewindow.py:94 msgid "Wrong passphrase. Please try again." -msgstr "" +msgstr "Väärä salalause. Yritä uudelleen." #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 #: ../GdmGreeter/langpanel.py:181 msgid "Other..." -msgstr "" +msgstr "Muu..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 20 Mar '13

20 Mar '13

commit f44dc8edb3d9a417905d9064a447e9d249646050 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 20 00:16:08 2013 +0000 Update translations for tails-persistence-setup --- fi/fi.po | 326 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 326 insertions(+), 0 deletions(-) diff --git a/fi/fi.po b/fi/fi.po new file mode 100644 index 0000000..6478348 --- /dev/null +++ b/fi/fi.po @@ -0,0 +1,326 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-10-03 17:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "" + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr ""

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Mar '13

19 Mar '13

commit e260cd1131921ca0dc5fc7bf65259ebe74fad94e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 19 23:46:09 2013 +0000 Update translations for tails-greeter --- fi/fi.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/fi/fi.po b/fi/fi.po new file mode 100644 index 0000000..6352172 --- /dev/null +++ b/fi/fi.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Mikko Harhanen <gitti(a)mikkoharhanen.fi>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-06-01 15:10+0200\n" +"PO-Revision-Date: 2013-03-19 23:39+0000\n" +"Last-Translator: mikkoharhanen <gitti(a)mikkoharhanen.fi>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "" + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "" + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "" + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup \n%(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr ""

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit 96d39fd236d3e4f72b164ddcf7735cf833bef749 Merge: 96e8e30 f1caa2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 16:44:00 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7350 | 4 ++++ src/or/channel.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-)

1 0

[tor/master] Don't assert when writing a cell to a CLOSING connection.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit ca50fb4f81a1f48c82d75825687085cda4627424 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 16:35:40 2013 -0400 Don't assert when writing a cell to a CLOSING connection. Instead, drop the cell. Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha --- changes/bug7350 | 4 ++++ src/or/channel.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/changes/bug7350 b/changes/bug7350 new file mode 100644 index 0000000..b0ee9d0 --- /dev/null +++ b/changes/bug7350 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid an assertion when we discover that we'd like to write a cell + onto a closing connection: just discard the cell. Fixes another + case of bug 7350; bugfix on 0.2.4.4-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index 82db061..4e9086f 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1751,6 +1751,14 @@ channel_write_cell(channel_t *chan, cell_t *cell) tor_assert(chan); tor_assert(cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding cell_t %p on closing channel %p with " + "global ID "U64_FORMAT, cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + tor_free(cell); + return; + } + log_debug(LD_CHANNEL, "Writing cell_t %p to channel %p with global ID " U64_FORMAT, @@ -1777,6 +1785,14 @@ channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) tor_assert(chan); tor_assert(packed_cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding packed_cell_t %p on closing channel %p " + "with global ID "U64_FORMAT, packed_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + packed_cell_free(packed_cell); + return; + } + log_debug(LD_CHANNEL, "Writing packed_cell_t %p to channel %p with global ID " U64_FORMAT, @@ -1805,6 +1821,14 @@ channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) tor_assert(chan); tor_assert(var_cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding var_cell_t %p on closing channel %p " + "with global ID "U64_FORMAT, var_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + var_cell_free(var_cell); + return; + } + log_debug(LD_CHANNEL, "Writing var_cell_t %p to channel %p with global ID " U64_FORMAT,

1 0

[tor/master] Merge branch 'bug7350_redux' into maint-0.2.4
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit f1caa2f2146ac750962e6506fe672b03749c50f9 Merge: 323cb65 ca50fb4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 16:43:00 2013 -0400 Merge branch 'bug7350_redux' into maint-0.2.4 changes/bug7350 | 4 ++++ src/or/channel.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.4] Don't assert when writing a cell to a CLOSING connection.
by nickm＠torproject.org 19 Mar '13

19 Mar '13

commit ca50fb4f81a1f48c82d75825687085cda4627424 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 16:35:40 2013 -0400 Don't assert when writing a cell to a CLOSING connection. Instead, drop the cell. Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha --- changes/bug7350 | 4 ++++ src/or/channel.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/changes/bug7350 b/changes/bug7350 new file mode 100644 index 0000000..b0ee9d0 --- /dev/null +++ b/changes/bug7350 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid an assertion when we discover that we'd like to write a cell + onto a closing connection: just discard the cell. Fixes another + case of bug 7350; bugfix on 0.2.4.4-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index 82db061..4e9086f 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1751,6 +1751,14 @@ channel_write_cell(channel_t *chan, cell_t *cell) tor_assert(chan); tor_assert(cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding cell_t %p on closing channel %p with " + "global ID "U64_FORMAT, cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + tor_free(cell); + return; + } + log_debug(LD_CHANNEL, "Writing cell_t %p to channel %p with global ID " U64_FORMAT, @@ -1777,6 +1785,14 @@ channel_write_packed_cell(channel_t *chan, packed_cell_t *packed_cell) tor_assert(chan); tor_assert(packed_cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding packed_cell_t %p on closing channel %p " + "with global ID "U64_FORMAT, packed_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + packed_cell_free(packed_cell); + return; + } + log_debug(LD_CHANNEL, "Writing packed_cell_t %p to channel %p with global ID " U64_FORMAT, @@ -1805,6 +1821,14 @@ channel_write_var_cell(channel_t *chan, var_cell_t *var_cell) tor_assert(chan); tor_assert(var_cell); + if (chan->state == CHANNEL_STATE_CLOSING) { + log_debug(LD_CHANNEL, "Discarding var_cell_t %p on closing channel %p " + "with global ID "U64_FORMAT, var_cell, chan, + U64_PRINTF_ARG(chan->global_identifier)); + var_cell_free(var_cell); + return; + } + log_debug(LD_CHANNEL, "Writing var_cell_t %p to channel %p with global ID " U64_FORMAT,

1 0