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

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

30 Jun '14

commit 7a56563f3bc52f2031fc998c743247f43d488a9c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 30 16:20:38 2014 -0400 Bug 11471: Text does not fit the dialog size. Increase the progress window width slightly and allow for three lines in the description field. --- src/chrome/content/progress.xul | 4 ++-- src/chrome/skin/progress.css | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/progress.xul b/src/chrome/content/progress.xul index fe85e39..473dab9 100644 --- a/src/chrome/content/progress.xul +++ b/src/chrome/content/progress.xul @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -32,7 +32,7 @@ <spacer flex="1" /> </vbox> <separator orient="vertical" /> - <vbox> + <vbox flex="1"> <label id="progressHeading" value="&torprogress.heading;" /> <description id="progressDesc" /> </vbox> diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css index 711a679..d718452 100644 --- a/src/chrome/skin/progress.css +++ b/src/chrome/skin/progress.css @@ -1,12 +1,12 @@ /* - * Copyright (c) 2013, The Tor Project, Inc. + * Copyright (c) 2014, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: */ dialog { - width: 370px; + width: 400px; } #progressHeading { @@ -27,7 +27,7 @@ dialog { } #progressDesc { - height: 32px; + height: 48px; } #progressMeter {

1 0

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

30 Jun '14

commit d94b703e7ddaed7f199b07457920e3629d9e1e76 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 20:15:21 2014 +0000 Update translations for liveusb-creator_completed --- da/da.po | 190 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 98 insertions(+), 92 deletions(-) diff --git a/da/da.po b/da/da.po index 1e36733..5a49404 100644 --- a/da/da.po +++ b/da/da.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# nrbbi <nrbbiyoutube(a)gmail.com>, 2013 -# andersd <andersd(a)riseup.net>, 2013 +# Adam Jerjir Ancker <nrbbiyoutube(a)gmail.com>, 2013 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 -# DavidNielsen <gnomeuser(a)gmail.com>, 2014 +# David Nielsen <gnomeuser(a)gmail.com>, 2014 # Joe Hansen <joedalton2(a)yahoo.dk>, 2013 # Kris Thomsen <lakristho(a)gmail.com>, 2009 # mort3n <nalholm(a)yahoo.dk>, 2013 +# Per Hansen <per(a)kofod-hansen.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-16 18:47+0200\n" -"PO-Revision-Date: 2014-05-21 19:13+0000\n" -"Last-Translator: DavidNielsen <gnomeuser(a)gmail.com>\n" +"POT-Creation-Date: 2014-05-28 16:00+0200\n" +"PO-Revision-Date: 2014-06-30 20:13+0000\n" +"Last-Translator: Per Hansen <per(a)kofod-hansen.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,22 +30,22 @@ msgstr "" msgid "%(distribution)s Installer" msgstr "%(distribution)s Installer" -#: ../liveusb/gui.py:808 +#: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s valgt" -#: ../liveusb/gui.py:439 +#: ../liveusb/gui.py:425 #, python-format msgid "%(size)s %(label)s" msgstr "%(size)s %(label)s" -#: ../liveusb/gui.py:445 +#: ../liveusb/gui.py:431 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" -#: ../liveusb/creator.py:1021 +#: ../liveusb/creator.py:1046 #, python-format msgid "%s already bootable" msgstr "kan allerede opstarte fra %s" @@ -101,16 +102,16 @@ msgid "" "persist after a reboot." msgstr "Ved at allokere ekstra plads på dit USB drev til et vedvarende overlæg, vil du kunne gemme data og lave permanente ændringer på dit live operativsystem. Uden vil du ikke kunne gemme data der er tilgængelige efter en genstart." -#: ../liveusb/creator.py:1125 ../liveusb/creator.py:1388 +#: ../liveusb/creator.py:1150 ../liveusb/creator.py:1413 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Beregner SHA1 for %s" -#: ../liveusb/creator.py:1336 +#: ../liveusb/creator.py:1361 msgid "Cannot find" msgstr "Kan ikke finde" -#: ../liveusb/creator.py:543 +#: ../liveusb/creator.py:551 #, python-format msgid "Cannot find device %s" msgstr "Kan ikke finde enhed %s" @@ -129,12 +130,12 @@ msgid "" "Upgrade" msgstr "Klon\n&&\nOpgradér" -#: ../liveusb/creator.py:399 +#: ../liveusb/creator.py:407 #, python-format msgid "Creating %sMB persistent overlay" msgstr "Opretter %sMB vedvarende overlæg" -#: ../liveusb/gui.py:567 +#: ../liveusb/gui.py:553 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "Enheden er endnu ikke monteret, så vi kan ikke bestemme mængden af ledig plads." @@ -144,11 +145,11 @@ msgstr "Enheden er endnu ikke monteret, så vi kan ikke bestemme mængden af led msgid "Download %(distribution)s" msgstr "Download %(distribution)s" -#: ../liveusb/gui.py:782 +#: ../liveusb/gui.py:768 msgid "Download complete!" msgstr "Nedhentning udført!" -#: ../liveusb/gui.py:786 +#: ../liveusb/gui.py:772 msgid "Download failed: " msgstr "Nedhentning fejlede: " @@ -157,45 +158,45 @@ msgstr "Nedhentning fejlede: " msgid "Downloading %s..." msgstr "Henter %s..." -#: ../liveusb/creator.py:1121 +#: ../liveusb/creator.py:1146 msgid "Drive is a loopback, skipping MBR reset" msgstr "Drevet er et loopback, springer nulstilling af MBR over" -#: ../liveusb/creator.py:814 +#: ../liveusb/creator.py:822 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Starter afmontering for '%(device)s'" -#: ../liveusb/creator.py:1201 +#: ../liveusb/creator.py:1226 msgid "Error probing device" msgstr "Fejl ved undersøgelse af enhed" -#: ../liveusb/gui.py:227 +#: ../liveusb/gui.py:211 msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." msgstr "Fejl: Kunne ikke sætte etiket eller finde enhedens UUID. Kan ikke fortsætte." -#: ../liveusb/creator.py:375 +#: ../liveusb/creator.py:383 msgid "" "Error: The SHA1 of your Live CD is invalid. You can run this program with " "the --noverify argument to bypass this verification check." msgstr "Fejl: SHA1'et på din live-cd er ugyldig. Du kan køre dette program med \"--noverify\"-argumentet for at springe over denne verificeringskontrol." -#: ../liveusb/creator.py:144 +#: ../liveusb/creator.py:146 msgid "Extracting live image to the target device..." msgstr " Udpakker det direkte foto til den valgte enhed..." -#: ../liveusb/creator.py:1064 +#: ../liveusb/creator.py:1089 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formatterer %(device)s som FAT32" -#: ../liveusb/creator.py:139 +#: ../liveusb/creator.py:141 msgid "ISO MD5 checksum passed" msgstr "ISO MD5-kontrolsum verificeret" -#: ../liveusb/creator.py:137 +#: ../liveusb/creator.py:139 msgid "ISO MD5 checksum verification failed" msgstr "Verificering af ISO MD5-kontrolsum mislykkedes" @@ -209,70 +210,70 @@ msgstr "Hvis du ikke vælger en eksisterende Live ISO, vil den valgte release bl msgid "Install Tails" msgstr "Installer Tails" -#: ../liveusb/gui.py:630 +#: ../liveusb/gui.py:616 msgid "Installation complete!" msgstr "Installation færdig!" -#: ../liveusb/gui.py:279 +#: ../liveusb/gui.py:265 #, python-format msgid "Installation complete! (%s)" msgstr "Installation færdig! (%s)" -#: ../liveusb/gui.py:631 +#: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." msgstr "Installation er færdig. Tryk O.k. for at lukke dette program." -#: ../liveusb/creator.py:917 ../liveusb/creator.py:1242 +#: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." msgstr "Installerer opstartsindlæser..." -#: ../liveusb/gui.py:284 +#: ../liveusb/gui.py:270 msgid "LiveUSB creation failed!" msgstr "Oprettelse af LiveUSB fejlede!" -#: ../liveusb/creator.py:1337 +#: ../liveusb/creator.py:1362 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Vær sikker på at udpakke hele zip-filen liveusb-creator før du kører dette program." -#: ../liveusb/creator.py:1213 +#: ../liveusb/creator.py:1238 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Vær sikker på at din USB-nøgle er tilsluttet og formateret med FAT-filsystemet" -#: ../liveusb/creator.py:836 +#: ../liveusb/creator.py:844 #, python-format msgid "Mount %s exists after unmounting" msgstr "Tilslutning %s eksisterer efter frakobling" -#: ../liveusb/gui.py:573 +#: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" msgstr "Ingen ledig plads på enhed %(device)s" -#: ../liveusb/creator.py:803 +#: ../liveusb/creator.py:811 msgid "No mount points found" msgstr "Fandt ingen tilslutningspunkter" -#: ../liveusb/creator.py:392 +#: ../liveusb/creator.py:400 msgid "Not enough free space on device." msgstr "Der er ikke tilstrækkelig ledig plads på enheden." -#: ../liveusb/gui.py:554 +#: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "Partition er FAT16; begrænser overlagsstørrelse til 2G" -#: ../liveusb/gui.py:550 +#: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "Partitionen er FAT32; begrænser ekstra størrelse til 4G" -#: ../liveusb/creator.py:225 ../liveusb/creator.py:843 +#: ../liveusb/creator.py:227 ../liveusb/creator.py:851 #, python-format msgid "Partitioning device %(device)s" msgstr "Partitionerer enheden %(device)s" -#: ../liveusb/gui.py:621 +#: ../liveusb/gui.py:607 msgid "Persistent Storage" msgstr "Vedvarende lager" @@ -280,53 +281,53 @@ msgstr "Vedvarende lager" msgid "Persistent Storage (0 MB)" msgstr "Vedvarende lager (0 MB)" -#: ../liveusb/gui.py:702 ../liveusb/gui.py:731 +#: ../liveusb/gui.py:688 ../liveusb/gui.py:717 msgid "Please confirm your device selection" msgstr "Bekræft venligst dit valg af enhed" -#: ../liveusb/gui.py:467 +#: ../liveusb/gui.py:453 msgid "Refreshing releases..." msgstr "Genopfrisker releases..." -#: ../liveusb/gui.py:472 +#: ../liveusb/gui.py:458 msgid "Releases updated!" msgstr "Releases opdateret!" -#: ../liveusb/creator.py:940 ../liveusb/creator.py:1260 +#: ../liveusb/creator.py:965 ../liveusb/creator.py:1285 #, python-format msgid "Removing %(file)s" msgstr "Fjerner %(file)s" -#: ../liveusb/creator.py:470 +#: ../liveusb/creator.py:478 msgid "Removing existing Live OS" msgstr "Fjerner eksisterende Live OS" -#: ../liveusb/creator.py:1115 +#: ../liveusb/creator.py:1140 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Nulstiller Master Boot Record for %s" -#: ../liveusb/gui.py:793 +#: ../liveusb/gui.py:779 msgid "Select Live ISO" msgstr "Vælg live-ISO" -#: ../liveusb/creator.py:181 +#: ../liveusb/creator.py:183 msgid "Setting up OLPC boot file..." msgstr "Opretter OLPC opstartsfil..." -#: ../liveusb/creator.py:717 +#: ../liveusb/creator.py:725 #, python-format msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." msgstr "Nogle partitioner på den valgte enhed %(device)s er i brug. De vil alle blive skubbet ud før installationen starter." -#: ../liveusb/creator.py:130 +#: ../liveusb/creator.py:132 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "Kildetype understøtter ikke verificering af iSO MD5-kontrolsum, udelader" -#: ../liveusb/creator.py:1149 +#: ../liveusb/creator.py:1174 msgid "Synchronizing data on disk..." msgstr "Synkroniserer data på disk..." @@ -334,19 +335,19 @@ msgstr "Synkroniserer data på disk..." msgid "Target Device" msgstr "Målenhed" -#: ../liveusb/gui.py:667 +#: ../liveusb/gui.py:653 msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." msgstr "Master Boot Record'en på enheden er blank. Hvis du trykker 'Installer Tails' igen, vil MBR'en på enheden overskrives." -#: ../liveusb/gui.py:796 +#: ../liveusb/gui.py:782 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." msgstr "Den valgte fil er ikke læsbar. Du kan enten ændre filtilladelserne eller vælge en anden fil." -#: ../liveusb/creator.py:336 +#: ../liveusb/creator.py:344 #, python-format msgid "" "There was a problem executing the following command: `%(command)s`.\n" @@ -384,87 +385,87 @@ msgstr "Dette er statusbjælken der vil vise hvor langt du er kommet i oprettels msgid "This is the status console, where all messages get written to." msgstr "Dette er statuskonsollen som alle meddelelser bliver skrevet til." -#: ../liveusb/creator.py:880 +#: ../liveusb/creator.py:905 msgid "Trying to continue anyway." msgstr "Prøver at forsætte alligevel." -#: ../liveusb/creator.py:912 +#: ../liveusb/creator.py:937 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "Kan ikke ændre drev-navn: %(message)s" -#: ../liveusb/creator.py:479 ../liveusb/creator.py:490 +#: ../liveusb/creator.py:487 ../liveusb/creator.py:498 #, python-format msgid "Unable to chmod %(file)s: %(message)s" msgstr "Kan ikke chmod %(file)s: %(message)s" -#: ../liveusb/creator.py:460 +#: ../liveusb/creator.py:468 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" msgstr "Kan ikke kopiere %(infile)s til %(outfile)s: %(message)s" -#: ../liveusb/gui.py:418 +#: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" msgstr "Kunne ikke finde et USB-drev" -#: ../liveusb/creator.py:1203 +#: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" msgstr "Kunne ikke finde nogen understøttede enheder." -#: ../liveusb/creator.py:1041 +#: ../liveusb/creator.py:1066 msgid "Unable to find partition" msgstr "Kan ikke finde partition" -#: ../liveusb/creator.py:1283 +#: ../liveusb/creator.py:1308 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "Kan ikke få Win32_LogicalDisk; win32com forespørgslen returnerede ingen resultater" -#: ../liveusb/gui.py:695 +#: ../liveusb/gui.py:681 msgid "Unable to mount device" msgstr "Kan ikke tilslutte enhed" -#: ../liveusb/creator.py:791 +#: ../liveusb/creator.py:799 #, python-format msgid "Unable to mount device: %(message)s" msgstr "Kunne ikke tilslutte enhed: %(message)s" -#: ../liveusb/creator.py:495 +#: ../liveusb/creator.py:503 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" msgstr "Kan ikke fjerne mappe fra tidligere LiveOS: %(message)s" -#: ../liveusb/creator.py:483 +#: ../liveusb/creator.py:491 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "Kan ikke fjerne fil fra tidligere LiveOS: %(message)s" -#: ../liveusb/creator.py:1118 +#: ../liveusb/creator.py:1143 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "Kan ikke nulstille MBR. Måske har du ikke pakken 'syslinux' installeret." -#: ../liveusb/gui.py:802 +#: ../liveusb/gui.py:788 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "Kan ikke anvende den valgte fil. Prøv istedet at flytte din ISO til roden af dit drev (dvs. C:\\)" -#: ../liveusb/creator.py:698 +#: ../liveusb/creator.py:706 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "Kan ikke skrive til %(device)s, springer over." -#: ../liveusb/creator.py:381 +#: ../liveusb/creator.py:389 msgid "Unknown ISO, skipping checksum verification" msgstr "Ukendt ISO, undlader verifikation af kontrolsum" -#: ../liveusb/creator.py:787 +#: ../liveusb/creator.py:795 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Ukendt dbus fejl ved forsøg på at tilslutte enhed: %(message)s" -#: ../liveusb/creator.py:766 ../liveusb/creator.py:891 +#: ../liveusb/creator.py:774 ../liveusb/creator.py:916 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Ukendt filsystem. Din enhed skal måske reformateres." @@ -473,40 +474,45 @@ msgstr "Ukendt filsystem. Din enhed skal måske reformateres." msgid "Unknown release: %s" msgstr "Ukendt udgivelse: %s" -#: ../liveusb/creator.py:828 +#: ../liveusb/creator.py:836 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Afmonterer '%(udi)s' på '%(device)s'" -#: ../liveusb/creator.py:824 +#: ../liveusb/creator.py:832 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Afmonterer monterede filsystemer på '%(device)s'" -#: ../liveusb/creator.py:877 +#: ../liveusb/creator.py:902 #, python-format msgid "Unsupported device '%(device)s', please report a bug." msgstr "Enheden '%(device)s' er ikke understøttet. Rapporter venligst fejlen." -#: ../liveusb/creator.py:771 ../liveusb/creator.py:894 +#: ../liveusb/creator.py:779 ../liveusb/creator.py:919 #, python-format msgid "Unsupported filesystem: %s" msgstr "Ikke understøttet filsystem: %s" -#: ../liveusb/creator.py:769 +#: ../liveusb/creator.py:777 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Uunderstøttet filesystem: %s\nHvis du prøver at opgradere et manuelt installeret Tails system (dvs. hvis det var installeret uden denne installer), er denne mulighed ikke understøttet: Du er nødt til at installere det på ny først f.eks. ved at vælge \"Klon & installere\" istedet." -#: ../liveusb/creator.py:1216 +#: ../liveusb/creator.py:1241 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Ikke understøttet filsystem: %s\nLav venligst en sikkerhedskopi og formatér din USB-nøgle med FAT-filsystemet." +#: ../liveusb/creator.py:877 +#, python-format +msgid "Updating properties of system partition %(system_partition)s" +msgstr "Opdaterer indstillingerne på system partitionen %(system_partition)s" + #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "Opgradér fra ISO" @@ -515,54 +521,54 @@ msgstr "Opgradér fra ISO" msgid "Use existing Live system ISO" msgstr "Brug eksisterende Live system ISO" -#: ../liveusb/creator.py:132 +#: ../liveusb/creator.py:134 msgid "Verifying ISO MD5 checksum" msgstr "Verificerer ISO MD5-kontrolsum" -#: ../liveusb/creator.py:355 +#: ../liveusb/creator.py:363 msgid "Verifying SHA1 checksum of LiveCD image..." msgstr "Verificerer SHA1-kontrolsum af LiveCD billedet..." -#: ../liveusb/creator.py:359 +#: ../liveusb/creator.py:367 msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verificerer SHA256-kontrolsum af LiveCD billedet..." -#: ../liveusb/creator.py:888 ../liveusb/creator.py:1209 +#: ../liveusb/creator.py:913 ../liveusb/creator.py:1234 msgid "Verifying filesystem..." msgstr "Kontrollerer filsystem..." -#: ../liveusb/gui.py:729 +#: ../liveusb/gui.py:715 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Advarsel: Oprettelse af en ny vedvarende overlægning vil slette den eksisterende." -#: ../liveusb/gui.py:681 +#: ../liveusb/gui.py:667 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." msgstr "Advarsel: Master Boot Record på din enhed matcher ikke dit systems syslinux MBR. Hvis du har problemer med opstart fra dette drev så prøv at køre liveusb-creater med tilføjelsen --reset-mbr " -#: ../liveusb/gui.py:392 +#: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." msgstr "Advarsel: Dette værktøj skal køres som en administrator. For dette, højreklik på ikonet og åbn egenskaberne. Under kompatibilitetsfanebladet afkrydses boksen »Kør dette program som en administrator«." -#: ../liveusb/creator.py:151 +#: ../liveusb/creator.py:153 #, python-format msgid "Wrote to device at %(speed)d MB/sec" msgstr "Skrev til enhed med %(speed)d MB/s" -#: ../liveusb/gui.py:703 +#: ../liveusb/gui.py:689 #, python-format msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" msgstr "Du har valgt at installere Tails på %(size)s %(vendor)s %(model)s enheden (%(device)s). Alt data på den valgte enhed tabes. Fortsæt?" -#: ../liveusb/gui.py:719 +#: ../liveusb/gui.py:705 #, python-format msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " @@ -570,17 +576,17 @@ msgid "" "unchanged. Continue?" msgstr "Du skal til at opgradere Tails på %(parent_size)s %(vendor)s %(model)s enheden (%(device)s). Enhver vedvarende partition på enheden ændres ikke. Fortsæt?" -#: ../liveusb/creator.py:605 +#: ../liveusb/creator.py:613 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Du anvender en gammel version af syslinux-extlinux der ikke understøtter ext4 filsystemet" -#: ../liveusb/gui.py:787 +#: ../liveusb/gui.py:773 msgid "You can try again to resume your download" msgstr "Du kan prøve at genoptage din nedhentning igen" -#: ../liveusb/creator.py:91 +#: ../liveusb/creator.py:93 msgid "You must run this application as root" msgstr "Du skal køre dette program som administrator (root)"

1 0

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

30 Jun '14

commit 2c629e72b2b6f1f6e8d7bcb4d1e8c7c7d7cdd9e4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 20:15:18 2014 +0000 Update translations for liveusb-creator --- da/da.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/da/da.po b/da/da.po index 44a26e6..5a49404 100644 --- a/da/da.po +++ b/da/da.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# nrbbi <nrbbiyoutube(a)gmail.com>, 2013 -# andersd <andersd(a)riseup.net>, 2013 +# Adam Jerjir Ancker <nrbbiyoutube(a)gmail.com>, 2013 +# Anders Damsgaard <andersd(a)riseup.net>, 2013 # bna1605 <bna1605(a)gmail.com>, 2014 -# DavidNielsen <gnomeuser(a)gmail.com>, 2014 +# David Nielsen <gnomeuser(a)gmail.com>, 2014 # Joe Hansen <joedalton2(a)yahoo.dk>, 2013 # Kris Thomsen <lakristho(a)gmail.com>, 2009 # mort3n <nalholm(a)yahoo.dk>, 2013 +# Per Hansen <per(a)kofod-hansen.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-29 09:11+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-30 20:13+0000\n" +"Last-Translator: Per Hansen <per(a)kofod-hansen.com>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -510,7 +511,7 @@ msgstr "Ikke understøttet filsystem: %s\nLav venligst en sikkerhedskopi og form #: ../liveusb/creator.py:877 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Opdaterer indstillingerne på system partitionen %(system_partition)s" #: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO"

1 0

[orbot/master] update to 14.0.4.3
by n8fr8＠torproject.org 30 Jun '14

30 Jun '14

commit 522f2938c7a5cc480e3bddb4671960ec8a1352dd Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 30 15:45:57 2014 -0400 update to 14.0.4.3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 43bfd20..1cf449a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.5-alpha" - android:versionCode="108" + android:versionName="14.0.4.3" + android:versionCode="109" android:installLocation="auto" >

1 0

[orbot/master] update for 14.0.4.3
by n8fr8＠torproject.org 30 Jun '14

30 Jun '14

commit 646bc66e517a5bb4b39ea06e20e881451017a594 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 30 15:46:24 2014 -0400 update for 14.0.4.3 --- CHANGELOG | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9f91575..5c03e2b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,18 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +522f293 update to 14.0.4.3 +70615d6 fixes for status, service, binding and start/stop +fbc1a87 update to 14.0.5-alpha +bfa1d56 remove diag/test menu +10ceafa ensure status is not set to CONNECTING incorrectly +7f8e9b8 remove test/diag option +e13d228 fix bug with wrong apps being transproxied (typo!) +312c6da apps should only show those with internet permission +d56c87e update to 14.0.4.2 +0e95dda update translations from transifex +bb0b7e8 unbind the service when the activity is destroyed we don't want leaky services +247e2ed don't kill Tor process and make sure service is sticky +8b6cff0 update CHANGELOG entries 7ec6de7 update to 14.0.4.1 298a01e make sure transproxy is renabled when network returns 2eb79a5 fulfilles the wishes of #12413 by support --default-torrc and -f

1 0

[orbot/master] fixes for status, service, binding and start/stop
by n8fr8＠torproject.org 30 Jun '14

30 Jun '14

commit 70615d669bc3dd56f83a5715a6cb215a5da882ee Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jun 30 15:45:14 2014 -0400 fixes for status, service, binding and start/stop --- src/org/torproject/android/Orbot.java | 52 +++++++----- src/org/torproject/android/service/TorService.java | 86 +++++++++++--------- 2 files changed, 77 insertions(+), 61 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 83d8e42..106c20b 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -34,7 +34,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -82,7 +81,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic /* Tor Service interaction */ /* The primary interface we will be calling on the service. */ ITorService mService = null; - + private SharedPreferences mPrefs = null; private boolean autoStartFromIntent = false; @@ -104,11 +103,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - Intent torService; private void startService () { - torService = new Intent(this, TorService.class); + Intent torService = new Intent(this, TorService.class); startService(torService); bindService(torService, @@ -435,6 +433,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mConnection = null; mService = null; + } catch (RemoteException e) { Log.w(TAG, e); } @@ -645,7 +644,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - torStatus = -1; updateStatus (""); } @@ -844,7 +842,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected Integer doInBackground(String... params) { mTorServiceMsg = params[0]; - int newTorStatus = -1; + int newTorStatus = TorServiceConstants.STATUS_OFF; try { if (mService != null) @@ -966,20 +964,28 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mTxtOrbotLog.setText(""); + + if (mService != null) + { - // this is a bit of a strange/old/borrowed code/design i used to change the service state - // not sure it really makes sense when what we want to say is just "startTor" - mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on - - //here we update the UI which is a bit sloppy and mixed up code wise - //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense - imgStatus.setImageResource(R.drawable.torstarting); - lblStatus.setText(getString(R.string.status_starting_up)); - - //we send a message here to the progressDialog i believe, but we can clarify that shortly - Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); - msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); - mHandler.sendMessage(msg); + // this is a bit of a strange/old/borrowed code/design i used to change the service state + // not sure it really makes sense when what we want to say is just "startTor" + mService.setProfile(TorServiceConstants.PROFILE_ON); //this means turn on + + //here we update the UI which is a bit sloppy and mixed up code wise + //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense + imgStatus.setImageResource(R.drawable.torstarting); + lblStatus.setText(getString(R.string.status_starting_up)); + + //we send a message here to the progressDialog i believe, but we can clarify that shortly + Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); + msg.getData().putString(HANDLER_TOR_MSG, getString(R.string.status_starting_up)); + mHandler.sendMessage(msg); + } + else + { + showAlert(getString(R.string.error),"Tor Service has not started yet. Please wait and try again.",false); + } } @@ -1169,7 +1175,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // representation of that from the raw service object. mService = ITorService.Stub.asInterface(service); - torStatus = -1; + torStatus = TorServiceConstants.STATUS_OFF; // We want to monitor the service for as long as we are // connected to it. @@ -1259,8 +1265,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onDestroy() { super.onDestroy(); - if (mConnection != null) + if (mConnection != null && mService != null) + { unbindService(mConnection); + mConnection = null; + mService = null; + } } public class DataCount { diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3ddc112..358e717 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -154,7 +154,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mLastProcessId != -1) { - sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); String state = conn.getInfo("dormant"); @@ -293,29 +292,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst { Intent intent = params[0]; - initBinaries(); - - - IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); - registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) - { - - boolean startOnBoot = TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); - - if (startOnBoot) - { - setTorProfile(PROFILE_ON); - } - } - else - { - findExistingProc(); - - } + if (mNotificationManager == null) + { + + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) + { + + boolean startOnBoot = TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); + + if (startOnBoot) + { + setTorProfile(PROFILE_ON); + } + } + } } catch (Exception e) { @@ -507,7 +502,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - private void initBinaries () throws Exception + @Override + public void onCreate() { + super.onCreate(); + + try + { + initBinariesAndDirectories(); + } + catch (Exception e) + { + //what error here + Log.e(TAG, "Error installing Orbot binaries",e); + logNotice("There was an error installing Orbot binaries"); + } + } + + private void initBinariesAndDirectories () throws Exception { if (appBinHome == null) @@ -617,16 +628,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst currentStatus = STATUS_CONNECTING; - try - { - initBinaries(); - } - catch (IOException e) - { - logNotice("There was a problem installing the Tor binaries: " + e.getLocalizedMessage()); - Log.d(TAG,"error installing binaries",e); - return; - } enableBinExec(fileTor); enableBinExec(filePolipo); @@ -1126,7 +1127,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void setTorProfile(int profile) { - if (currentStatus == STATUS_OFF) + if (profile == PROFILE_ON) { sendCallbackStatusMessage (getString(R.string.status_starting_up)); @@ -1368,7 +1369,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - initBinaries(); findExistingProc (); } catch (Exception e) @@ -1444,7 +1444,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void run () { try { - + + + processSettingsImpl (); @@ -1488,7 +1490,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst List<ConfigEntry> listCe = conn.getConf(name); Iterator<ConfigEntry> itCe = listCe.iterator(); - ConfigEntry ce = null; + ConfigEntry ce = null; + + while (itCe.hasNext()) { @@ -1517,7 +1521,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst * Set configuration **/ public boolean updateConfiguration (String name, String value, boolean saveToDisk) - { + { + + if (configBuffer == null) configBuffer = new ArrayList<String>();

1 0

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

30 Jun '14

commit 1be4770c8cc4467c2625028781836ebb81aa5b37 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 16:45:20 2014 +0000 Update translations for liveusb-creator_completed --- zh_TW/zh_TW.po | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 41a50d5..e484c47 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 修銘張 <cges30901(a)gmail.com>, 2014 +# cges30901 <cges30901(a)gmail.com>, 2014 # chinrur <chinrur(a)gmail.com>, 2013 -# muraji <muraji(a)tormail.org>, 2013 +# danfong <danfong.hsieh(a)gmail.com>, 2014 +# muraji saori <muraji(a)tormail.org>, 2013 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-31 16:31+0000\n" -"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-30 16:41+0000\n" +"Last-Translator: danfong <danfong.hsieh(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "%(distribution)s Installer" #: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s 選擇" +msgstr "%(filename)s 已選" #: ../liveusb/gui.py:425 #, python-format @@ -220,7 +221,7 @@ msgstr "安裝完成! (%s)" #: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." -msgstr "安裝已完成，按“確定”以關閉該程式。" +msgstr "安裝已完成，按下「確定」關閉此程式。" #: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." @@ -249,7 +250,7 @@ msgstr "卸載後 %s 掛載仍存在" #: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" -msgstr "%(device)s 裝置上的剩餘空間不足。" +msgstr "裝置 %(device)s 上的可用空間不足。" #: ../liveusb/creator.py:811 msgid "No mount points found" @@ -261,7 +262,7 @@ msgstr "裝置上的剩餘空間不足。" #: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "磁碟分區為FAT16；覆蓋限制大小為2 GB" +msgstr "分割區為 FAT16；覆蓋限制大小為 2 GB" #: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" @@ -274,7 +275,7 @@ msgstr "分割設備是 %(device)s" #: ../liveusb/gui.py:607 msgid "Persistent Storage" -msgstr "持續性儲存裝置" +msgstr "永續性儲存體" #: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" @@ -405,7 +406,7 @@ msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" #: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" -msgstr "無法找到任何的 USB 裝置" +msgstr "找不到任何的 USB 裝置" #: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" @@ -422,7 +423,7 @@ msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有返回任何結果" #: ../liveusb/gui.py:681 msgid "Unable to mount device" -msgstr "無法移除裝置" +msgstr "無法掛接裝置" #: ../liveusb/creator.py:799 #, python-format @@ -448,7 +449,7 @@ msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件" msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "無法使用已選取的檔案，您可能有更好的運氣，如果您移動您的ISO到您的裝置根目錄下(例如：C：\\)" +msgstr "無法使用所選檔案，您可能會有更好的運氣，如果您將您的 ISO 移動到您的磁碟根目錄下(例如：C：\\)" #: ../liveusb/creator.py:706 #, python-format @@ -546,14 +547,14 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "警告：在您裝置上的主要開機記錄與syslinux 作業系統MBR無法匹配。如果您對此感到麻煩，嘗試執行liveusb-creator，並重新設定MBR選項。" +msgstr "警告：在您裝置上的主開機記錄與您系統的 syslinux MBR 無法相符。如果您有麻煩，嘗試使用 --reset-mbr 選項執行 liveusb-creator。" #: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "警告：此工具需以系統管理員身分執行。請右鍵圖標點選內容，在相容性一欄下，勾選以「系統管理員的身分執行此程式」一格。" +msgstr "警告：此工具需以系統管理員身分執行。請對圖示按滑鼠右鍵後點選內容，在相容性頁籤下，勾選「以系統管理員身份執行此程式」方塊。" #: ../liveusb/creator.py:153 #, python-format @@ -583,7 +584,7 @@ msgstr "您正在使用舊版 syslinux-extlinux ，不支援 ext4 檔案系統" #: ../liveusb/gui.py:773 msgid "You can try again to resume your download" -msgstr "您可再次嘗試復原您的下載" +msgstr "您可再次嘗試來繼續您的下載" #: ../liveusb/creator.py:93 msgid "You must run this application as root"

1 0

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

30 Jun '14

commit e48106e78d88e5643032db19df5826c7cd818473 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 16:45:17 2014 +0000 Update translations for liveusb-creator --- zh_TW/zh_TW.po | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index 41a50d5..e484c47 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# 修銘張 <cges30901(a)gmail.com>, 2014 +# cges30901 <cges30901(a)gmail.com>, 2014 # chinrur <chinrur(a)gmail.com>, 2013 -# muraji <muraji(a)tormail.org>, 2013 +# danfong <danfong.hsieh(a)gmail.com>, 2014 +# muraji saori <muraji(a)tormail.org>, 2013 # Terry Chuang <tchuang(a)redhat.com>, 2009 # Wei-Lun Chao <william.chao(a)ossii.com.tw>, 2009 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 -# xatier 同學@提不起勁 <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 +# x4r <xatierlike(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-28 16:00+0200\n" -"PO-Revision-Date: 2014-05-31 16:31+0000\n" -"Last-Translator: xatier 同學@提不起勁 <xatierlike(a)gmail.com>\n" +"PO-Revision-Date: 2014-06-30 16:41+0000\n" +"Last-Translator: danfong <danfong.hsieh(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +33,7 @@ msgstr "%(distribution)s Installer" #: ../liveusb/gui.py:794 #, python-format msgid "%(filename)s selected" -msgstr "%(filename)s 選擇" +msgstr "%(filename)s 已選" #: ../liveusb/gui.py:425 #, python-format @@ -220,7 +221,7 @@ msgstr "安裝完成! (%s)" #: ../liveusb/gui.py:617 msgid "Installation was completed. Press OK to close this program." -msgstr "安裝已完成，按“確定”以關閉該程式。" +msgstr "安裝已完成，按下「確定」關閉此程式。" #: ../liveusb/creator.py:942 ../liveusb/creator.py:1267 msgid "Installing bootloader..." @@ -249,7 +250,7 @@ msgstr "卸載後 %s 掛載仍存在" #: ../liveusb/gui.py:559 #, python-format msgid "No free space on device %(device)s" -msgstr "%(device)s 裝置上的剩餘空間不足。" +msgstr "裝置 %(device)s 上的可用空間不足。" #: ../liveusb/creator.py:811 msgid "No mount points found" @@ -261,7 +262,7 @@ msgstr "裝置上的剩餘空間不足。" #: ../liveusb/gui.py:540 msgid "Partition is FAT16; Restricting overlay size to 2G" -msgstr "磁碟分區為FAT16；覆蓋限制大小為2 GB" +msgstr "分割區為 FAT16；覆蓋限制大小為 2 GB" #: ../liveusb/gui.py:536 msgid "Partition is FAT32; Restricting overlay size to 4G" @@ -274,7 +275,7 @@ msgstr "分割設備是 %(device)s" #: ../liveusb/gui.py:607 msgid "Persistent Storage" -msgstr "持續性儲存裝置" +msgstr "永續性儲存體" #: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" @@ -405,7 +406,7 @@ msgstr "無法複製 %(infile)s 到 %(outfile)s: %(message)s" #: ../liveusb/gui.py:404 msgid "Unable to find any USB drive" -msgstr "無法找到任何的 USB 裝置" +msgstr "找不到任何的 USB 裝置" #: ../liveusb/creator.py:1228 msgid "Unable to find any supported device" @@ -422,7 +423,7 @@ msgstr "無法取得 Win32_LogicalDisk; win32com 查詢沒有返回任何結果" #: ../liveusb/gui.py:681 msgid "Unable to mount device" -msgstr "無法移除裝置" +msgstr "無法掛接裝置" #: ../liveusb/creator.py:799 #, python-format @@ -448,7 +449,7 @@ msgstr "無法重設 MBR。您可能沒有安裝 `syslinux` 套件" msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "無法使用已選取的檔案，您可能有更好的運氣，如果您移動您的ISO到您的裝置根目錄下(例如：C：\\)" +msgstr "無法使用所選檔案，您可能會有更好的運氣，如果您將您的 ISO 移動到您的磁碟根目錄下(例如：C：\\)" #: ../liveusb/creator.py:706 #, python-format @@ -546,14 +547,14 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "警告：在您裝置上的主要開機記錄與syslinux 作業系統MBR無法匹配。如果您對此感到麻煩，嘗試執行liveusb-creator，並重新設定MBR選項。" +msgstr "警告：在您裝置上的主開機記錄與您系統的 syslinux MBR 無法相符。如果您有麻煩，嘗試使用 --reset-mbr 選項執行 liveusb-creator。" #: ../liveusb/gui.py:378 msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "警告：此工具需以系統管理員身分執行。請右鍵圖標點選內容，在相容性一欄下，勾選以「系統管理員的身分執行此程式」一格。" +msgstr "警告：此工具需以系統管理員身分執行。請對圖示按滑鼠右鍵後點選內容，在相容性頁籤下，勾選「以系統管理員身份執行此程式」方塊。" #: ../liveusb/creator.py:153 #, python-format @@ -583,7 +584,7 @@ msgstr "您正在使用舊版 syslinux-extlinux ，不支援 ext4 檔案系統" #: ../liveusb/gui.py:773 msgid "You can try again to resume your download" -msgstr "您可再次嘗試復原您的下載" +msgstr "您可再次嘗試來繼續您的下載" #: ../liveusb/creator.py:93 msgid "You must run this application as root"

1 0

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

30 Jun '14

commit d31934e70e1a16671a04d31ff1fd6243fb83b850 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 30 16:15:34 2014 +0000 Update translations for tails-misc --- nn.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nn.po b/nn.po index e66ba8b..1b6b0d1 100644 --- a/nn.po +++ b/nn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-06-30 15:41+0000\n" +"PO-Revision-Date: 2014-06-30 15:51+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n"

1 0

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

30 Jun '14

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

1 0