tor-commits November 2018

tor-commits@lists.torproject.org

19 participants
2292 discussions

[tor-glossary/master] update german translations (#28417)
by emmapeel＠torproject.org 15 Nov '18

15 Nov '18

commit ad1edfe14c1954eb17646ab89100f880b31dd883 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Thu Nov 15 11:21:41 2018 +0100 update german translations (#28417) --- glossary_de.csv | 228 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/glossary_de.csv b/glossary_de.csv index 797ca76..b01c5a9 100644 --- a/glossary_de.csv +++ b/glossary_de.csv @@ -1,7 +1,7 @@ term,pos,comment,de - donation process,,, - testing,,, - third-party,,, + donation process,,, Spendenprozess + testing,,, wird geprüft + third-party,,, aus dritter Hand !,Conjunction,"Punctuation, not a conjunction, however “punctionation” is not an option in Transifex",! """",Conjunction,"Punctuation, not a conjunction, however “punctionation” is not an option in Transifex",»« $,,, @@ -13,7 +13,7 @@ $,,, Two-factor authentication ""Something you know, and something you have."" Login systems that require only a username and password risk being broken when someone else can obtain (or guess) those pieces of information. Services that offer two-factor authentication also require you to provide a separate confirmation that you are who you say you are. The second factor could be a one-off secret code, a number generated by a program running on a mobile device, or a device that you carry and that you can use to confirm who you are. Companies like banks, and major internet services like Google, Paypal and Twitter now offer two-factor authentication. Synonyms: two-step verification, multi-factor authentication. -Source EFF.", +Source EFF.",2-Faktor-Authentifzierung 3D bar chart,Noun,[Martus],3D Balkendiagramm 3rd party,Adjective,[Signal] As in “Use a 3rd party application.”, :,Conjunction,"Punctuation, not a conjunction, however “punctionation” is not an option in Transifex",: @@ -24,7 +24,7 @@ A security-oriented operating system,Noun,[Qubes OS],Ein sicherheitsorientiertes ADIDS,Noun,what is that?, API,Noun,"Application Programming Interface: ""In computer programming, an application programming interface (API) is a set of subroutine definitions, protocols, and tools for building application software."" - Wikipedia",API APK,Noun,"""Android application package (APK) is the package file format used to distribute and install application software and middleware onto Google's Android operating system and sometimes on the BlackBerry OS 10."" https://en.wikipedia.org/wiki/Android_application_package",APK -About,Noun,, +About,Noun,,Über Alice,,[Briar], American Apparel,,, Android,Noun,[Signal] [Orbot] Operating system,Android @@ -33,73 +33,73 @@ App Store,Noun,Apple App Store [Signal],App Store AppVM,Noun,"[Qubes OS] ""Application Virtual Machine""A VM which is intended for running software applications.", Apt.,,, Ativistas,,, -Autocrypt Setup Message,Noun,[Enigmail] [OpenKeychain], -Autonomous System number,Noun,, +Autocrypt Setup Message,Noun,[Enigmail] [OpenKeychain],Autocrypt Installations-Nachricht +Autonomous System number,Noun,,AS-Nummer BCC,Noun,"""Blind carbon copy""",BCC -Back,Adverb,, -Back to,,, +Back,Adverb,,Zurück +Back to,,,Zurück zu Backup Key File,Noun,[Martus] Also: key backup,Sicherungsschlüsseldatei Benetech,Noun,Company name which should not be translated or transcribed., BitTorrent,,, Bitcoin,,, -Blow the Whistle,Noun,[Globaleaks], +Blow the Whistle,Noun,[Globaleaks],Hinweise geben Blow the Whistle,Verb,[Globaleaks] GlobaLeaks catch phrase,Hinweise geben Bob,,[Briar], -Bug,,, +Bug,,,Fehler C&C,Noun,"A command and control server (C&C or C2) is a computer that gives orders to malware-infected devices and receives information from those devices. Some C&C servers control millions of devices. Synonyms: Command and control server, C2. -Source EFF.", +Source EFF.","C&C (Kommando und Kontroll-Server, kontrolliert infizierte Computer)" C2,Noun,"A command and control server (C&C or C2) is a computer that gives orders to malware-infected devices and receives information from those devices. Some C&C servers control millions of devices. Synonyms: Command and control server, C2. -Source EFF.", -CFC program,,, +Source EFF.","C2 (Kommando und Kontroll-Server, kontrolliert infizierte Computer)" +CFC program,,,CFC-Programm CIDR,Noun,Classless inter-domain routing, CPU,Noun,, CSR,Noun,Certificate Signing Request, CSRF,Noun,, CVC,,, -Cancel,Verb,, -Card Number,,, +Cancel,Verb,,Abbrechen +Card Number,,,Kartennummber Carol,,[Briar], -Certificate Signing Request,Noun,, +Certificate Signing Request,Noun,,CSR (Zertifikat-Signierungs-Anfrage) ChatSecure,Noun,Application Name, Chrome App,Noun,[Signal], Chrome OS,Noun,, Chrome Web Store,Noun,, -Circuit Display,Noun,[Tor], -Clear,Noun,, -Clearnet,Noun,,Sichtbare Internet -Client User Interface,Noun,,Client-Benutzeroberfläche +Circuit Display,Noun,[Tor],Kanal-Anzeige +Clear,Noun,,Löschen +Clearnet,Noun,,Sichtbares Internet +Client User Interface,Noun,,Programm-Benutzeroberfläche ClockVM,Noun,, -Combined Federal Campaign,,, +Combined Federal Campaign,,,kombinierte behördliche Kampagne Command-line tool,Noun,"The ""command line"" is an ancient way of giving a computer a series of small, self-contained orders (think of those science fiction movies where teenage geniuses type long strings of green text onto black screens). To use a command line tool, the user types a command into a window called a terminal emulator, hits the return or enter key, and then receives a textual response in the same window. Windows, Linux and Apple desktop computers still let you run software using this interface, and even some mobile phones can do the same with the right app. The command line can be used to run software pre-packaged with your operating system. Some downloadable programs, especially technical utilities, use the command line instead of a more familiar ""icons and buttons"" user interface. The command line needn't be scary, but it does require you to type in exactly the right set of letters and numbers to get the correct result, and it's often unclear what to do if the resp onses don't match your expectations. Source EFF.",Befehlszeilenwerkzeug -Comments,,, +Comments,,,Kommentare Commit,Noun,, Commit,Verb,, -Company,,, -Contributions,,, -Contributors,Noun,, -Core,,, +Company,,,Firma +Contributions,,,Beiträge +Contributors,Noun,,Mitwirkende +Core,,,Kern Courier,Noun,"App name. Do not translate the app name. If necessary, transcribe the name into translation language and place in parentheses after the original name. Ex: Courier (كوريور)", -"Credit Card, credit card",,, -Cross-site scripting,Noun,, -Crowdfunding,,, -Crypto,Adjective,, -Crypto,Noun,This is an abbreviation of “cryptography.”, -Customization Template Files (*.mct),Noun,[Martus], +"Credit Card, credit card",,,Kreditkarte +Cross-site scripting,Noun,,Seiten übergreifende Skripte +Crowdfunding,,,Schwarmfinanzierung +Crypto,Adjective,,crypto +Crypto,Noun,This is an abbreviation of “cryptography.”,Crypto +Customization Template Files (*.mct),Noun,[Martus],angepasste Vorlagen-Dateien (*.mct) DD,Noun,, DDoS,Noun,"A method for taking a website or other Internet service offline, by co-ordinating many different computers to request or send data to it simultaneously. Usually the computers used to conduct such an attack are remotely controlled by criminals, who have taken over the machines by breaking into them, or infecting them with malware. Synonyms: distributed denial of service -Source EFF", +Source EFF",verteilte Dienstblockade (DdoS) DDoS (distributed denial of service),Noun,"A method for taking a website or other Internet service offline, by co-ordinating many different computers to request or send data to it simultaneously. Usually the computers used to conduct such an attack are remotely controlled by criminals, who have taken over the machines by breaking into them, or infecting them with malware. (Synonyms: DDoS) (Source EFF)", -DHT,Noun,, -DNS,Noun,[Orbot],DNS -DNS record,Noun,, +DHT,Noun,,verteilte Streuwerttabelle (DHT) +DNS,Noun,Domain Name Server, +DNS record,Noun,,DNS-Eintrag DVM,Noun,"[Qubes] An abbreviation of DispVM, typically used to refer to DVM Templates.", DVM Template,Noun,[Qubes] TemplateBasedVMs on which DispVMs are based., Darknet,Noun,, -Data Retention Strategy,Noun,, +Data Retention Strategy,Noun,,Datenspeicherungsstrategie Data Source Grid,Noun,, Data-Driven Dropdown (Field),Noun,[Matus], Date,Noun,, @@ -365,7 +365,7 @@ Newsletter,Noun,,Infobrief Next,Noun,“Next” button, No,Noun,, Node,Noun,,Knotenpunkt -Non-Tor,Noun,, +Non-Tor,Noun,,Nicht-Tor Notes,,, OK,Noun,[Signal] “OK” button which can also be translated as “Accept”, OPML,Noun,"Outline Processor Markup Language @@ -378,13 +378,13 @@ Observatory,Noun,,Beobachtungsstelle Off,Adjective,,Aus Off-the-Record,Noun,"[Orbot] Messaging systems are often unencrypted. OTR is a way of adding encryption to them, so that you can keep using familiar networks like Facebook chat, Google Chat or Hangouts but with your messages more resistant to surveillance. The OTR cryptographic protocol provides strong encryption for messaging conversations. (Synonyms : OTR) (Source EFF)", Oil pipeline,Noun,, -On,Adjective,, +On,Adjective,,An One-time password,Noun,"Passwords are usually semi-permanent: once you set them up, you can keep using them until you manually change or reset them. One-time passwords only work once. Some one-time password systems work by having a tool or program that can create many different one-time passwords, that you use in turn. This is useful if you're afraid that there may be a key-logger on a system where you have to type in a password. Source EFF.", Onion,Noun,[Tor], -Onion Address,Noun,[Tor], +Onion Address,Noun,[Tor],Onion-Adresse Onion Browser,Noun,[Tor], -Onion Circuits,Noun,[Tor], +Onion Circuits,Noun,[Tor],Onion-Kanäle Onion routing,Noun,[Tor], Open Observatory of Network Interference,,, Open Observatory of Network Interference (OONI) ,,, @@ -613,7 +613,7 @@ TRIM,Noun,"[VeraCrypt] ""A trim command (known as TRIM in the ATA command set, a TRIM command,Noun,"[VeraCrypt] ""A trim command (known as TRIM in the ATA command set, and UNMAP in the SCSI command set) allows an operating system to inform a solid-state drive (SSD) which blocks of data are no longer considered in use and can be wiped internally."" https://en.wikipedia.org/wiki/Trim_(computing)", TTL,Noun,, Tails,Noun,Name of the organization and tool.,Tails -Tails Installer,Noun,Tails = The Amnesic Incognito Live System, +Tails Installer,Noun,Tails = The Amnesic Incognito Live System,Tails-Installateur Take a stand,,, Tamanho,,, TemplateBasedHVM,Noun,"[QubesOS] ""Template-Based Hardware Virtual Machine""Any HVM that depends on a TemplateVM for its root filesystem.", @@ -623,8 +623,8 @@ TemplateVM,Noun,"[QubesOS] ""Template Virtual Machine.""Any VM which supplies it Terms & Privacy Policy,Noun,[Signal], Text message,Noun,Synonym: SMS, Thanks You,,, -Threat,Noun,"In computer security, a threat is a potential event that could undermine your efforts to defend your data. Threats can be intentional (conceived by attackers), or they could be accidental (you might leave your computer turned on and unguarded). (Source EFF)", -Threat model,Verb,, +Threat,Noun,"In computer security, a threat is a potential event that could undermine your efforts to defend your data. Threats can be intentional (conceived by attackers), or they could be accidental (you might leave your computer turned on and unguarded). (Source EFF)",Gefahr +Threat model,Verb,,Gefahrenmodell Threat modeling,Noun,"A way of narrowly thinking about the sorts of protection you want for your data. It's impossible to protect against every kind of trick or attacker, so you should concentrate on which people might want your data, what they might want from it, and how they might get it. Coming up with a set of possible attacks you plan to protect against is called threat modeling. Once you have a threat model, you can conduct a risk analysis. (Synonyms: Threat model) (Source EFF)", Throwaway,Noun,"A phone that is not connected to your identity, is only used for a small set of calls or activities, and can be discarded if and when it is suspected of being tracked or compromised. Burner phones are often pre-paid mobile phones bought with cash. (Synonyms: Burner phone) (Source EFF)", Throwaway address,Noun,"An email address you use once, and never again. Used to sign up to Internet services without revealing an email address connected to your identity. @@ -648,12 +648,12 @@ Tor Project,Noun,[Orbot] Organization name. Do not translate. Name can be transc Tor bridge,Noun,,Tor-Brücke Tor messenger,Noun,[The Tor Project], Tor network,Noun,,Tor-Netzwerk -Tor relay,Noun,[Tor] [Orbot],Tor-Relais +Tor relay,Noun,[Tor] [Orbot],Tor-Relay Torbutton,Noun,, Touch ID,Noun,[Signal] Specific to iOS, Trademark,Noun,, Twitter,,, -Two-Factor,Noun,, +Two-Factor,Noun,,Zwei-Faktor UI,Noun,user interface, URL,Noun,,URL US $,,, @@ -667,15 +667,15 @@ VM,Noun,"""virtual machine""", VPN,,, VPN,Noun,"A virtual private network is a method for connecting your computer securely to the network of an organization on the other side of the Internet. When you use a VPN, all of your computer's Internet communications is packaged together, encrypted and then relayed to this other organization, where it is decrypted, unpacked, and then sent on to its destination. To the organization's network, or any other computer on the wider Internet, it looks like your computer's request is coming from inside the organization, not from your location. VPNs are used by businesses to provide secure access to internal resources (like file servers or printers). They are also used by individuals to bypass local censorship, or defeat local surveillance. Synonyms: Virtual Private Network -Source: EFF", -VPNs,,, -Vanilla Bridges,,, +Source: EFF",Virtuelles Privates Netzwerk (VPN) +VPNs,,,Virtuelle Private Netzwerke (VPNs) +Vanilla Bridges,,,Standard-Brücken Vidalia,Noun,, -Virtual Machine (VM),Noun,"A software implementation of a machine (for example, a computer) which executes programs like a physical machine.", +Virtual Machine (VM),Noun,"A software implementation of a machine (for example, a computer) which executes programs like a physical machine.",Virtuelle Maschine (VM) Virtual Private Network (VPN),Noun,"A virtual private network is a method for connecting your computer securely to the network of an organization on the other side of the Internet. When you use a VPN, all of your computer's Internet communications is packaged together, encrypted and then relayed to this other organization, where it is decrypted, unpacked, and then sent on to its destination. To the organization's network, or any other computer on the wider Internet, it looks like your computer's request is coming from inside the organization, not from your location. VPNs are used by businesses to provide secure access to internal resources (like file servers or printers). They are also used by individuals to bypass local censorship, or defeat local surveillance. (Synonyms: VPN) (Source: EFF)", "Virtual Private Network, VPN",Noun,"[Orbot] A virtual private network is a method for connecting your computer securely to the network of an organization on the other side of the Internet. When you use a VPN, all of your computer's Internet communications is packaged together, encrypted and then relayed to this other organization, where it is decrypted, unpacked, and then sent on to its destination. To the organization's network, or any other computer on the wider Internet, it looks like your computer's request is coming from inside the organization, not from your location. VPNs are used by businesses to provide secure access to internal resources (like file servers or printers). They are also used by individuals to bypass local censorship, or defeat local surveillance. (Synonyms: Virtual Private Network) (Source: EFF)", Virtual Private Server (VPS),Noun,Virtual Private Server, -VoIP Call,Noun,, +VoIP Call,Noun,,VoIP-Anruf Voice over IP (VoIP),Noun,"Any technology that allows you to use the Internet for voice communication with other VoIP users or receive telephone calls over the Internet. Synonyms: VoIP. Source EFF.", @@ -868,9 +868,9 @@ box,Noun,,Kästchen break in,Noun,,Einbruch bridge,Noun,[Orbot] [Tor],Brücke bridge,Verb,[Tor],überbrücken -bridge line,Noun,[Tor] a line with the bridge configuration, -bridge relay,Noun,[Tor], -bridge type,Noun,[Tor], +bridge line,Noun,[Tor] a line with the bridge configuration,Brücken-Konfiguration +bridge relay,Noun,[Tor],Brücken-Relais +bridge type,Noun,[Tor],Brücken-Typ broad range,,, broadcast,Verb,[Signal], browse,Verb,[Orbot],durchsuchen @@ -884,31 +884,31 @@ bug,Noun,,Fehler bug report,Noun,[Signal],Fehlermeldung bundle,Noun,,Bündel bundled,Adjective,,gebündelt -burden,,, +burden,,,Last burner phone,Noun,"A phone that is not connected to your identity, is only used for a small set of calls or activities, and can be discarded if and when it is suspected of being tracked or compromised. Burner phones are often pre-paid mobile phones bought with cash. (Synonyms: Throwaway) (Source: EFF)",Wegwerfhandy button,Noun,,Schaltfläche -by,Adverb,, +by,Adverb,,von bypass,Verb,,vorbeikommen bytes,Noun,[Globaleaks],Bytes cache,Noun,, cache,Verb,, cache-busting,Noun,, -calendar,Noun,, -camera,Noun,, -cams,,, -can,Verb,, +calendar,Noun,,Kalender +camera,Noun,,Kamera +cams,,,Kameras +can,Verb,,kann cancel,Verb,[Signal],abbrechen -cannot,Verb,, +cannot,Verb,,kann nicht capability,Noun,"The capability of an attacker (in the context of an attack) is what it is able to do to achieve its aims. For example, a country's security services might have the capability to listen to telephone calls while a neighbor may have the capability to watch you from their window. To say that an attacker “has"" a capability does not mean that they will necessarily use that capability. It does mean that you should consider and prepare for the possibility. -Source EFF.", -car documents,Noun,[Umbrella], -carjacking,Noun,, -carry,,, -case management,Noun,[GlobaLeaks], -cash,,, +Source EFF.",Fähigkeit +car documents,Noun,[Umbrella],KFZ-Brief +carjacking,Noun,,KFZ-Dienstahl +carry,,,tragen +case management,Noun,[GlobaLeaks],Fall-Verwaltung +cash,,,Bargeld cc,Noun,“carbon copy”, -censor,,, +censor,,,Zensor censored,,, censored,Adjective,, censorship,,, @@ -921,12 +921,12 @@ certificate chain,Noun,[Globaleaks],Zertifikatskette certificate chain file,Noun,[Globaleaks], certificates,Noun,"Is it needed, the plural form defined here? The singular already exists.",Zertifikate chain,Noun,,Kette -change,Verb,, -change log,Noun,, -charges,,, +change,Verb,,Änderung +change log,Noun,,Changelog +charges,,,Anklage chart,Noun,, chat,Noun,[Signal],Unterhaltung -chat,Verb,[Signal], +chat,Verb,[Signal],reden check,Verb,,überprüfen checking,,, checkpoint,Noun,, @@ -937,11 +937,11 @@ choker,Noun,, choose,Verb,, choose ,Verb,, chronic stress,Noun,, -cipher,Noun,, +cipher,Noun,,Code ciphertext,Noun,,Geheimtext -circuit,Noun,[Orbot],Schaltkreis -circuits,,, -circuits,Noun,, +circuit,Noun,[Orbot],Kanal +circuits,,,Kanäle +circuits,Noun,,Kanäle circumvent,Verb,[Orbot],umgehen circumvention,Noun,[Signal] [Orbot],Umgehung clear,Verb,[Signal] [Orbot],Löschen @@ -1129,20 +1129,20 @@ discouraged,,, discussion,Noun,, disk,Noun,"In most contexts in Martus, ""disk"" refers to any sort of removable storage device (USB, CD, floppy disk etc.)", diversify,,, -document,Noun,[Signal], +document,Noun,[Signal],Dokument domain,Noun,An area or set of activities in one's digital life that has certain security requirements and therefore involves the use of certain qube.,Domain domain name,Noun,"The address, in words, of a website or Internet service; for example: ssd.eff.org. (Source: EFF)", -domestic violence survivors,,, -donating,,, -donation,,, -donations,,, +domestic violence survivors,,,Überlebende häuslicher Gewalt +donating,,,spenden +donation,,,Spende +donations,,,Spenden donations,Noun,"feminine noun, otherwise a (V) verb. eu doo tu doas ele doa nós doamos vós doais -eles doam", +eles doam",Spenden donations options,,, donor,Noun,, download,,, @@ -1194,16 +1194,16 @@ exchange,Verb,, excited,,, executable,Noun,, exercised,,, -exit,Noun,, +exit,Noun,,Ausgang exit,Verb,,verlassen -exit relay,,, +exit relay,,,Exit-Server exit relay,Noun,,Exit-Server -exited,Verb,,Verlassen -experience,Verb,, -expiration,Noun,, +exited,Verb,,verlassen +experience,Verb,,Erfahrung +expiration,Noun,,Ablauf expiration date,Noun,,Ablaufdatum -expire,Verb,[Signal], -expired,Noun,, +expire,Verb,[Signal],ablaufen +expired,Noun,,abgelaufen expiry,Noun,[Globaleaks],Ablauf expiry,Verb,[Signal], export,Noun,[Signal], @@ -1288,16 +1288,16 @@ goal,Noun,, grants,,, guard,Noun,,Wächter guard relay,Noun,[The Tor Project],Wächterrelais -guidelines,Noun,, -handshake,Noun,Signal exchange process between pieces of equipment until they are synchronized. Transmitting and receiving communication can then take place., +guidelines,Noun,,Richtlinien +handshake,Noun,Signal exchange process between pieces of equipment until they are synchronized. Transmitting and receiving communication can then take place.,Handschlag hardware,,, -header,Noun,, +header,Noun,,Kopfzeilen help,Noun,,Hilfe help,Verb,,helfen -helper link,Noun,, +helper link,Noun,,Hilfe-Verweis helper link ,Noun,, -hidden service,Noun,, -hidden services,,, +hidden service,Noun,[Tor],Onion-Dienst +hidden services,,[Tor],Onion-Dienste hidden volume,Noun,[VeraCrypt], hide,Verb,,verstecken high bandwidth,Noun,, @@ -1473,7 +1473,7 @@ meta search engine,,, metadata,Noun,"Metadata (or ""data about data"") is everything about a piece of information, apart from the information itself. So the content of a message is not metadata, but who sent it, when, where from, and to whom, are all examples of metadata. Legal systems often protect content more than metadata: for instance, in the United States, law enforcement needs a warrant to listen to a person's telephone calls, but claims the right to obtain the list of who you have called far more easily. However, metadata can often reveal a great deal, and will often need to be protected as carefully as the data it describes. (Source EFF) [Signal]",Meta-Daten method,,, microphone,Noun,[Signal], -middle relay,Noun,, +middle relay,Noun,,Mittel-Relais migrate,Verb,[Signal], miniLock,Noun,,miniLock minimize,Verb,Minimize a window, @@ -1527,20 +1527,20 @@ notify,Verb,, obfuscate,Verb,"[Orbot] Transforming of a section of code or program to make it totally unintelligible to a human reader, even if helped by software tools.",verschleiern obfuscation,Noun,"Transformation of a section of code or program to make it totally unintelligible to a human reader, even if helped by software tools.", obfuscation layer,Noun,"Related to data transmission -[Tor]", +[Tor]",Verschleierungs-Schicht offline,Adjective,[Signal], -onboarding,Noun,, -once,,, +onboarding,Noun,,Begrüßung +once,,,ein Mai onion service,Noun,[Tor],Onion-Dienst online,,, online,Adjective,[Signal], -open,Adjective,, +open,Adjective,,offen open,Verb,,öffnen -open source,Noun,[Orbot], +open source,Noun,[Orbot],quelloffen open-source,Adjective,[Orbot],Open Source opened,Verb,,geöffnet -operate,,, -operator,Noun,, +operate,,,betreiben +operator,Noun,,betreibende Person opt,,, optical,Adjective,,optisch optimization,Noun,[Orbot], @@ -1709,17 +1709,17 @@ referral code,Noun,, refund,,, refunded,,, register,Verb,,Benutzerkonto anlegen -regular,Adjective,, -regular expression,Noun,, -reinstall,Verb,[Signal], -reject,,, -relay,,, -relay,Noun,[Orbot],Relais +regular,Adjective,,gewöhnlich +regular expression,Noun,,regulärer Ausdruck +reinstall,Verb,[Signal],neu installieren +reject,,,ablehnen +relay,,,Relay +relay,Noun,[Orbot],Relay relay,Verb,[Signal],weiterleiten / umleiten -relay directory,Noun,, -relay node,Noun,[Orbot], -relays,,, -relays,Noun,, +relay directory,Noun,,Relay-Verzeichnis +relay node,Noun,[Orbot],Relay-Knoten +relays,,,Relays +relays,Noun,,Relays release,Noun,,Veröffentlichung release,Verb,, release candidate,Noun,,

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit a829bcda2aeac48bbcc4aa17302723eab4b5c91d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:20:06 2018 +0000 Update translations for support-portal_completed --- contents+bn.po | 15 ++++----------- contents+ca.po | 15 ++++----------- contents+de.po | 15 ++++----------- contents+es-AR.po | 15 ++++----------- contents+es.po | 15 ++++----------- contents+fr.po | 15 ++++----------- contents+ga.po | 15 ++++----------- contents+id.po | 14 ++++---------- contents+it.po | 15 ++++----------- contents+pt-BR.po | 15 ++++----------- contents+tr.po | 15 ++++----------- contents+zh-CN.po | 13 ++++--------- contents.pot | 17 +++++------------ 13 files changed, 53 insertions(+), 141 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index e40cabc8a..aa8ceb463 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n" @@ -2623,8 +2623,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " @@ -2985,15 +2987,6 @@ msgstr "টর-ব্রাউজারের-সাথে-সংযোগ-ক #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " -"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ca.po b/contents+ca.po index 978afd383..24bf585a7 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" @@ -2653,8 +2653,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si veieu línies com aquestes al vostre registre de Tor, significa que no " @@ -3014,15 +3016,6 @@ msgstr "no-puc-connectar-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si veieu línies com aquestes al vostre registre de Tor, significa que no " -"esteu connectant a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+de.po b/contents+de.po index 147a5105a..226d02f38 100644 --- a/contents+de.po +++ b/contents+de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -2661,8 +2661,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" @@ -3024,15 +3026,6 @@ msgstr "kann-mich-nicht-mit-tor-browser-verbinden" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" -"Proxy kann nicht erreicht werden." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+es-AR.po b/contents+es-AR.po index d2f7f59db..2f0428651 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" @@ -2671,8 +2671,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" @@ -3036,15 +3038,6 @@ msgstr "no-puedo-conectar-al-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" -" conectarte a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+es.po b/contents+es.po index ac78c91b8..1ae4feb86 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -2674,8 +2674,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si ves líneas como estas en tu registro Tor, significa que no te estás " @@ -3036,15 +3038,6 @@ msgstr "no-se-puede-conectar-el-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si ves líneas como estas en tu registro Tor, significa que no te estás " -"conectando a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+fr.po b/contents+fr.po index 335f9269d..56b79601a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" @@ -2707,8 +2707,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" @@ -3075,15 +3077,6 @@ msgstr "impossible-connecter-au-navigateur-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" -" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ga.po b/contents+ga.po index 66565aba4..174b78ebc 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n" @@ -2666,8 +2666,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " @@ -3032,15 +3034,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " -"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+id.po b/contents+id.po index f1c218840..a9a1e25f8 100644 --- a/contents+id.po +++ b/contents+id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n" @@ -2648,8 +2648,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." @@ -3006,14 +3008,6 @@ msgstr "cant-connect-to-tor-browser " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+it.po b/contents+it.po index ac2ba2bd1..052b9326a 100644 --- a/contents+it.po +++ b/contents+it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" @@ -2663,8 +2663,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " @@ -3028,15 +3030,6 @@ msgstr "impossibile-connettersi-a-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " -"riesci a conetterti al SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 936a79d23..a9a23a736 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" @@ -2645,8 +2645,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Se você vê linhas como essas no seu registro Tor, isso significa que você " @@ -3006,15 +3008,6 @@ msgstr "não-pode-conectar-se-ao-navegador-tor " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Se você vê linhas como essas no seu registro Tor, isso significa que você " -"está falhando ao conectar a um SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+tr.po b/contents+tr.po index b70a8a68b..e25a3bee7 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" @@ -2651,8 +2651,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " @@ -3016,15 +3018,6 @@ msgstr "tor-browser-baglantisi-kurulamiyor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " -"ile bağlantı kurma sorunları yaşıyorsunuz demektir." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 0d31fbace..44a0ed894 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" @@ -2349,8 +2349,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" @@ -2684,13 +2686,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents.pot b/contents.pot index 6a71bc84f..bb1e974e7 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -2610,11 +2610,13 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." #: http//localhost/connecting/connecting-2/ @@ -2968,15 +2970,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead."

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 Nov '18

15 Nov '18

commit 45b6172c54bb9fd2749d4c95a9fdd30b4a676dcc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:19:41 2018 +0000 Update translations for support-portal --- contents+bn.po | 15 ++++----------- contents+ca.po | 15 ++++----------- contents+de.po | 15 ++++----------- contents+el.po | 15 ++++----------- contents+es-AR.po | 15 ++++----------- contents+es.po | 15 ++++----------- contents+fa.po | 13 ++++--------- contents+fr.po | 15 ++++----------- contents+ga.po | 15 ++++----------- contents+he.po | 13 ++++--------- contents+id.po | 14 ++++---------- contents+is.po | 13 ++++--------- contents+it.po | 15 ++++----------- contents+ka.po | 13 ++++--------- contents+ko.po | 13 ++++--------- contents+nb.po | 13 ++++--------- contents+pt-BR.po | 15 ++++----------- contents+pt-PT.po | 13 ++++--------- contents+ru.po | 15 ++++----------- contents+tr.po | 15 ++++----------- contents+zh-CN.po | 13 ++++--------- contents.pot | 17 +++++------------ 22 files changed, 89 insertions(+), 226 deletions(-) diff --git a/contents+bn.po b/contents+bn.po index e40cabc8a..aa8ceb463 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)\n" @@ -2623,8 +2623,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " @@ -2985,15 +2987,6 @@ msgstr "টর-ব্রাউজারের-সাথে-সংযোগ-ক #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"যদি আপনি আপনার টর লগে এই ধরনের লাইনগুলো দেখেন, এর মানে আপনি একটি মোজা " -"প্রক্সির সাথে সংযোগ করতে ব্যর্থ হন ।" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ca.po b/contents+ca.po index 978afd383..24bf585a7 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" @@ -2653,8 +2653,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si veieu línies com aquestes al vostre registre de Tor, significa que no " @@ -3014,15 +3016,6 @@ msgstr "no-puc-connectar-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si veieu línies com aquestes al vostre registre de Tor, significa que no " -"esteu connectant a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+de.po b/contents+de.po index 147a5105a..226d02f38 100644 --- a/contents+de.po +++ b/contents+de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" @@ -2661,8 +2661,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" @@ -3024,15 +3026,6 @@ msgstr "kann-mich-nicht-mit-tor-browser-verbinden" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Wenn in der Log-Datei Zeile wie diese auftauchen, bedeutet das, der SOCKS-" -"Proxy kann nicht erreicht werden." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+el.po b/contents+el.po index 1fbe58227..79f17d22b 100644 --- a/contents+el.po +++ b/contents+el.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)\n" @@ -2588,8 +2588,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Αν δείτε γραμμές όπως αυτό στο αρχείο καταγραφής Tor, αυτό σημαίνει ότι δεν " @@ -2949,15 +2951,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Αν δείτε γραμμές όπως αυτό στο αρχείο καταγραφής Tor, αυτό σημαίνει ότι δεν " -"μπορείτε να συνδεθείτε σε ένα SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+es-AR.po b/contents+es-AR.po index d2f7f59db..2f0428651 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" @@ -2671,8 +2671,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" @@ -3036,15 +3038,6 @@ msgstr "no-puedo-conectar-al-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si ves líneas cómo éstas en tu bitácora Tor, significa que estás fallando en" -" conectarte a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+es.po b/contents+es.po index ac78c91b8..1ae4feb86 100644 --- a/contents+es.po +++ b/contents+es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -2674,8 +2674,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si ves líneas como estas en tu registro Tor, significa que no te estás " @@ -3036,15 +3038,6 @@ msgstr "no-se-puede-conectar-el-navegador-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si ves líneas como estas en tu registro Tor, significa que no te estás " -"conectando a un proxy SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+fa.po b/contents+fa.po index a1dcfb7ec..3345e4791 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: A.Mehraban <Mehr.Ban(a)chmail.ir>, 2018\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" @@ -2317,8 +2317,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2624,13 +2626,6 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+fr.po b/contents+fr.po index 335f9269d..56b79601a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" @@ -2707,8 +2707,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" @@ -3075,15 +3077,6 @@ msgstr "impossible-connecter-au-navigateur-tor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Si vous rencontrez de telles lignes dans votre journal de Tor, cela signifie" -" que vous n’arrivez pas à vous connecter à un mandataire SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ga.po b/contents+ga.po index 66565aba4..174b78ebc 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)\n" @@ -2666,8 +2666,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " @@ -3032,15 +3034,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Má fheiceann tú línte den sórt seo i do logchomhad Tor, ciallaíonn sé gur " -"theip ort ceangal a bhunú le seachfhreastalaí SOCKS." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+he.po b/contents+he.po index 99c5026e2..73ae9b38d 100644 --- a/contents+he.po +++ b/contents+he.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n" @@ -2256,8 +2256,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2562,13 +2564,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+id.po b/contents+id.po index f1c218840..a9a1e25f8 100644 --- a/contents+id.po +++ b/contents+id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n" @@ -2648,8 +2648,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." @@ -3006,14 +3008,6 @@ msgstr "cant-connect-to-tor-browser " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Jika Anda melihat baris seperti ini, Tor gagal tersambung ke SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+is.po b/contents+is.po index 379dfaba7..3afdadfe3 100644 --- a/contents+is.po +++ b/contents+is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n" @@ -2260,8 +2260,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2566,13 +2568,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+it.po b/contents+it.po index ac2ba2bd1..052b9326a 100644 --- a/contents+it.po +++ b/contents+it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n" @@ -2663,8 +2663,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " @@ -3028,15 +3030,6 @@ msgstr "impossibile-connettersi-a-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Se vedi delle righe simili a queste nel tuo log di Tor, significa che non " -"riesci a conetterti al SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ka.po b/contents+ka.po index 9ecd22a3a..8e80e3f6b 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)\n" @@ -2400,8 +2400,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2708,13 +2710,6 @@ msgstr "ვერ-ხერხდება-tor-ბრაუზერთან- #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ko.po b/contents+ko.po index 7efea4569..1e23b1e34 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Philipp Sauter <qt123(a)pm.me>, 2018\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)\n" @@ -2250,8 +2250,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2556,13 +2558,6 @@ msgstr "tor-브라우저에-연결할-수-없습니다" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+nb.po b/contents+nb.po index 99a600bd3..a5770b8e4 100644 --- a/contents+nb.po +++ b/contents+nb.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/otf/teams/1519/nb/)\n" @@ -2281,8 +2281,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2588,13 +2590,6 @@ msgstr "" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 936a79d23..a9a23a736 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" @@ -2645,8 +2645,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Se você vê linhas como essas no seu registro Tor, isso significa que você " @@ -3006,15 +3008,6 @@ msgstr "não-pode-conectar-se-ao-navegador-tor " #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Se você vê linhas como essas no seu registro Tor, isso significa que você " -"está falhando ao conectar a um SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 81e053583..1d35db2a7 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)\n" @@ -2440,8 +2440,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" @@ -2744,13 +2746,6 @@ msgstr "não-consigo-ligar-ao-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+ru.po b/contents+ru.po index 31ebd2fb5..b97137151 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" @@ -2596,8 +2596,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Если вы видите подобные строчки в логе Tor, значит, не удалось соединение с " @@ -2957,15 +2959,6 @@ msgstr "не-могу-подключиться-к-тор-браузеру" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Если вы видите подобные строчки в логе Tor, значит, не удалось соединение с " -"SOCKS-прокси." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+tr.po b/contents+tr.po index b70a8a68b..e25a3bee7 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" @@ -2651,8 +2651,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" "Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " @@ -3016,15 +3018,6 @@ msgstr "tor-browser-baglantisi-kurulamiyor" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"Tor günlüğünde buna benzer satırlar görüyorsanız, bir SOCKS vekil sunucusu " -"ile bağlantı kurma sorunları yaşıyorsunuz demektir." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 0d31fbace..44a0ed894 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" @@ -2349,8 +2349,10 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" @@ -2684,13 +2686,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "如果您看见这些提示出现在您的日志里面，这意味着您连接 SOCKS 代理失败了。" - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead." diff --git a/contents.pot b/contents.pot index 6a71bc84f..bb1e974e7 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-15 13:05+CET\n" +"POT-Creation-Date: 2018-11-15 16:05+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -2610,11 +2610,13 @@ msgstr "" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) +#: http//localhost/censorship/censorship-5/ +#: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " +"If you see lines like these in your Tor log, it means you are failing to " "connect to a SOCKS proxy." #: http//localhost/connecting/connecting-2/ @@ -2968,15 +2970,6 @@ msgstr "cant-connect-to-tor-browser" #: http//localhost/censorship/censorship-5/ #: (content/censorship/censorship-5/contents+en.lrquestion.description) msgid "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." -msgstr "" -"If you see lines like these in your Tor log, it means you are failing to " -"connect to a SOCKS proxy." - -#: http//localhost/censorship/censorship-5/ -#: (content/censorship/censorship-5/contents+en.lrquestion.description) -msgid "" "19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time " "(OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours," " 1 minutes, or that theirs is ahead."

1 0

[styleguide/master] Fix color code typo
by hiro＠torproject.org 15 Nov '18

15 Nov '18

commit e309e64c91b6f14a3f6fe1b1e8cc0d1b2cdf6ab1 Author: hiro <hiro(a)torproject.org> Date: Thu Nov 15 15:23:29 2018 +0100 Fix color code typo --- i18n/contents.pot | 2 +- templates/visuals.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/contents.pot b/i18n/contents.pot index 0a8a1f9..f2332af 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-02 14:19+CET\n" +"POT-Creation-Date: 2018-11-02 14:20+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" diff --git a/templates/visuals.html b/templates/visuals.html index a620660..3b9b478 100644 --- a/templates/visuals.html +++ b/templates/visuals.html @@ -27,7 +27,7 @@ <h6 class="pt-3 text-left">Purple</h6> </div> <div class="col-4"> - <div class="rounded pt-5 pl-2 pb-2 mt-3 mb-2 bg-secondary text-white small">#59316B</div> + <div class="rounded pt-5 pl-2 pb-2 mt-3 mb-2 bg-secondary text-white small">#484848</div> <h6 class="pt-3 text-left">Dark Grey</h6> </div> <div class="col-4"> @@ -39,7 +39,7 @@ <h6 class="pt-3 text-left">Grey</h6> </div> <div class="col-4"> - <div class="rounded pt-5 pl-2 pb-2 mt-3 mb-2 bg-dark text-white small">#484848</div> + <div class="rounded pt-5 pl-2 pb-2 mt-3 mb-2 bg-dark text-white small">#59316B</div> <h6 class="pt-3 text-left">Dark Purple</h6> </div> <div class="col-4">

1 0

[tor/maint-0.3.5] Appveyor: Improve diagnostics
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4c3d61b5f2450ff8bf81f02bbaa2a42baa7af372 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 13:43:20 2018 +1000 Appveyor: Improve diagnostics Stop installing MSYS2 packages. We're compiling for mingw, so we only need mingw packages. Run pacman in verbose mode. Explicitly install pkg-config and xz, to future-proof our builds. Diagnostics for 28399. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 7d8927ee3..4069a5396 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,7 +30,7 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --needed --noconfirm openssl-devel openssl libevent-devel libevent ${env:mingw_prefix}-libevent ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >-

1 0

[tor/maint-0.3.5] Appveyor: add comments to the config file
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 27b91704753ae3235630b298449b4c8a107bd107 Author: teor <teor(a)torproject.org> Date: Thu Nov 15 18:57:39 2018 +1000 Appveyor: add comments to the config file Documentation for 28399, 28454, and previous fixes. --- .appveyor.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index c288ad812..f76a9f0a9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,6 +13,7 @@ environment: - target: x86_64-w64-mingw32 compiler_path: mingw64 mingw_prefix: mingw-w64-x86_64 + # hardening doesn't work with mingw-w64-x86_64-gcc, because it's gcc 8 hardening: --disable-gcc-hardening install: @@ -28,11 +29,17 @@ install: { Execute-Command 'c:\msys64\usr\bin\bash' '-e' '-c' $args } + <# mingw packages start with ${env:mingw_prefix} + # unprefixed packages are from MSYS2, which is like Cygwin. Avoid them. + # + # Use pacman --debug to show package downloads and install locations + #> Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- if ($env:compiler -eq "mingw") { + <# use the MSYS2 compiler and user binaries to build and install #> $oldpath = ${env:Path} -split ';' $buildpath = @("C:\msys64\${env:compiler_path}\bin", "C:\msys64\usr\bin") + $oldpath $env:Path = @($buildpath) -join ';' @@ -43,6 +50,10 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" + <# compile for mingw + # mingw zstd doesn't come with a pkg-config file, so we manually + # configure its flags. liblzma just works. + #> Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" @@ -51,6 +62,7 @@ build_script: test_script: - ps: >- if ($env:compiler -eq "mingw") { + <# use the MSYS2 compiler binaries to make check #> $oldpath = ${env:Path} -split ';' $buildpath = @("C:\msys64\${env:compiler_path}\bin") + $oldpath $env:Path = $buildpath -join ';' @@ -61,14 +73,17 @@ test_script: on_failure: - ps: >- if ($env:compiler -eq "mingw") { + <# use the MSYS2 user binaries to archive failures #> $oldpath = ${env:Path} -split ';' $buildpath = @("C:\msys64\usr\bin") + $oldpath $env:Path = @($buildpath) -join ';' Set-Location "${env:build}" + <# store logs as appveyor artifacts: see the artifacts tab #> Execute-Bash "7z a logs.zip config.log || true" Execute-Bash "7z a logs.zip test-suite.log || true" Execute-Bash "appveyor PushArtifact logs.zip || true" Execute-Bash "tail -1000 config.log || true" Execute-Bash "cat test-suite.log || true" } +# notify the IRC channel of any failures - cmd: C:\Python27\python.exe %APPVEYOR_BUILD_FOLDER%\scripts\test\appveyor-irc-notify.py irc.oftc.net:6697 tor-ci failure

1 0

[tor/maint-0.3.5] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1 Merge: d598d834f 27b917047 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 09:06:18 2018 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 .appveyor.yml | 21 +++++++++++++++++---- changes/bug28399 | 4 ++++ changes/bug28454 | 4 ++++ 3 files changed, 25 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.5] Appveyor: manually add zstd flags to configure
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 83c1baca168fdd0595e9c9633e031f3bdb8df8ed Author: teor <teor(a)torproject.org> Date: Thu Nov 15 18:32:52 2018 +1000 Appveyor: manually add zstd flags to configure The mingw zstd from MSYS2 doesn't come with a pkg-config file. Fixes 28454 on Tor 0.3.4.1-alpha. --- .appveyor.yml | 2 +- changes/bug28454 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index fdf831686..c288ad812 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -43,7 +43,7 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/bug28454 b/changes/bug28454 new file mode 100644 index 000000000..ca46ae277 --- /dev/null +++ b/changes/bug28454 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Manually configure the zstd compiler options, when building using + mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not + come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.

1 0

[tor/maint-0.3.5] Appveyor: remove incorrect OpenSSL path
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 540c833f20934ca0219579b96fae87c65bc1534e Author: teor <teor(a)torproject.org> Date: Thu Nov 15 14:32:53 2018 +1000 Appveyor: remove incorrect OpenSSL path Fixes 28399 on 0.3.4.1-alpha. --- .appveyor.yml | 4 +--- changes/bug28399 | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 4069a5396..fdf831686 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,12 +8,10 @@ environment: matrix: - target: i686-w64-mingw32 compiler_path: mingw32 - openssl_path: /c/OpenSSL-Win32 mingw_prefix: mingw-w64-i686 hardening: - target: x86_64-w64-mingw32 compiler_path: mingw64 - openssl_path: /c/OpenSSL-Win64 mingw_prefix: mingw-w64-x86_64 hardening: --disable-gcc-hardening @@ -45,7 +43,7 @@ build_script: Set-Location "${env:build}" Execute-Bash "which ${env:target}-gcc" Execute-Bash "${env:target}-gcc --version" - Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}" + Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } diff --git a/changes/bug28399 b/changes/bug28399 new file mode 100644 index 000000000..9096db70b --- /dev/null +++ b/changes/bug28399 @@ -0,0 +1,4 @@ + o Minor bugfixes (continuous integration, Windows): + - Stop using an external OpenSSL install, and stop installing MSYS2 + packages, when building using mingw on Appveyor Windows CI. + Fixes bug 28399; bugfix on 0.3.4.1-alpha.

1 0

[tor/master] Appveyor: Improve diagnostics
by nickm＠torproject.org 15 Nov '18

15 Nov '18

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2018