Commit 02beb054 authored by Cyril 'kibi' Brulebois's avatar Cyril 'kibi' Brulebois
Browse files

Merge branch 'web/release-4.9' (Closes: #17833)

Conflicts:
	wiki/src/contribute/how/documentation/release_notes/template.mdwn
parents 1738cc3e 66fd7dfe
......@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-06-18 12:35+0000\n"
"Last-Translator: Transifex Bot <>\n"
"POT-Creation-Date: 2020-07-27 05:58+0200\n"
"PO-Revision-Date: 2020-06-29 00:35+0000\n"
"Last-Translator: erinm\n"
"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"Language: km\n"
"MIME-Version: 1.0\n"
......@@ -47,7 +47,7 @@ msgid ""
msgstr ""
#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
msgid "Additional Software"
msgstr ""
......@@ -93,12 +93,12 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:68
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr "ចាប់ផ្ដើម"
#: config/chroot_local-includes/usr/local/bin/electrum:69
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr "ចេញ"
......@@ -386,52 +386,56 @@ msgstr ""
msgid "Back"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
msgid "_Administration Password"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187
msgid "_MAC Address Spoofing"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250
msgid "_Network Connection"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
msgid "Direct (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261
msgid "Bridge & Proxy"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:263
msgid "Offline"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
msgid "On (default)"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:333
msgid "_Unsafe Browser"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
msgid "On"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:342
msgid "Enabled"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
msgid "Off"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:344
msgid "Disabled (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
msgid "Off (default)"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
msgid "On (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
msgid "Shutdown"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
msgid "On"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
msgid "_Start Tails"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:399
msgid "Off"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:401
msgid "Off (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
......@@ -466,30 +470,30 @@ msgid ""
"{stderr}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:66
msgid "Unlocking…"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:92
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:94
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:462
msgid "Unlock"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:97
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:99
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:164
msgid "_Language"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:207
msgid "_Formats"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:244
msgid "_Keyboard Layout"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
......@@ -553,7 +557,7 @@ msgid "Passphrase can't be empty"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Step/Bootstrap.pm:233
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:326
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:394
msgid "Show Passphrase"
msgstr ""
......@@ -661,78 +665,88 @@ msgid "Keep files stored in the `Persistent' directory"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70
msgid "Browser Bookmarks"
msgid "Welcome Screen"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72
msgid "Bookmarks saved in the Tor Browser"
msgid ""
"Beta: only the additional setting to enable the Unsafe Browser is made "
"persistent"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
msgid "Network Connections"
msgid "Browser Bookmarks"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:87
msgid "Configuration of network devices and connections"
msgid "Bookmarks saved in the Tor Browser"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
msgid "Network Connections"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:102
msgid "Configuration of network devices and connections"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:117
msgid "Software installed when starting Tails"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:120
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
msgid "Printers"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:122
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
msgid "Printers configuration"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:135
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
msgid "Thunderbird"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:137
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
msgid "Thunderbird emails, feeds, and settings"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:150
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
msgid "GnuPG"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:152
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
msgid "GnuPG keyrings and configuration"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:165
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
msgid "Bitcoin Client"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:167
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
msgid "Electrum's bitcoin wallet and configuration"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:180
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
msgid "Pidgin"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:182
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
msgid "Pidgin profiles and OTR keyring"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:195
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
msgid "SSH Client"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:197
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
msgid "SSH keys, configuration and known hosts"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:210
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:225
msgid "Dotfiles"
msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:212
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:227
msgid ""
"Symlink into $HOME every file or directory found in the `dotfiles' directory"
msgstr ""
......@@ -749,7 +763,7 @@ msgstr ""
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Setup.pm:481
#: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:223
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:74
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:25
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28
msgid "Error"
msgstr "កំហុស"
......@@ -852,14 +866,14 @@ msgid ""
"{error}"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
msgid "Key Imported"
msgid_plural "Keys Imported"
msgstr[0] ""
#. Translators: Don't translate {uids}, it's a placeholder and
#. will be replaced.
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53
#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56
#, python-brace-format
msgid "Imported a key for {uids}"
msgid_plural "Imported keys for {uids}"
......@@ -1146,12 +1160,12 @@ msgstr "កំណែ​របស់ Tails នេះ​គឺ​ស្គាល
msgid "Known security issues"
msgstr ""
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:56
#, sh-format
msgid "Network card ${nic} disabled"
msgstr "បាន​បិទ​កាត​បណ្ដាញ ${nic}"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:57
#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}) so it is "
......@@ -1159,11 +1173,11 @@ msgid ""
"You might prefer to restart Tails and disable MAC spoofing."
msgstr ""
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:66
msgid "All networking disabled"
msgstr "បាន​បិទការ​ភ្ជាប់​​បណ្ដាញ​ទាំងអស់"
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63
#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:67
#, sh-format
msgid ""
"MAC spoofing failed for network card ${nic_name} (${nic}). The error "
......@@ -1185,7 +1199,7 @@ msgid ""
msgstr ""
#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:73
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:24
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
msgid "error:"
msgstr "កំហុស៖"
......@@ -1385,30 +1399,31 @@ msgstr ""
msgid "Choose File Container"
msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35
msgid "Do you really want to launch the Unsafe Browser?"
msgstr "តើ​អ្នក​ពិតជា​ចង់​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព​មែន​ឬ?"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
#, fuzzy
msgid "Launch the Unsafe Browser?"
msgstr "កំពុង​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40
msgid ""
"Network activity within the Unsafe Browser is <b>not anonymous</b>.\\nOnly "
"use the Unsafe Browser if necessary, for example\\nif you have to login or "
"register to activate your Internet connection."
"The Unsafe Browser is not anonymous and the websites that you visit can see "
"your real IP address.\\n\\nOnly use the Unsafe Browser to log in to a "
"captive portal or browse trusted web pages on the local network."
msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:51
msgid "Starting the Unsafe Browser..."
msgstr "កំពុង​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
msgid "This may take a while, so please be patient."
msgstr "វា​អាច​ប្រើ​ពេល​មួយ​រយៈ ដូច្នេះ​សូម​មេត្តា​អត់ធ្មត់។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
msgid "Shutting down the Unsafe Browser..."
msgstr "កំពុង​បិទ​កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព..."
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:55
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
msgid ""
"This may take a while, and you may not restart the Unsafe Browser until it "
"is properly shut down."
......@@ -1416,16 +1431,26 @@ msgstr ""
"វា​អាច​ប្រើ​ពេល​មួយ​រយៈ ដូច្នេះ​អ្នក​មិន​ត្រូវ​ចាប់ផ្ដើម​កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព​ឡើងវិញ​ឡើយ រហូតដល់​វា​បាន​"
"បិទ​ដោយ​ត្រឹមត្រូវ។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
msgid "Failed to restart Tor."
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ចាប់ផ្ដើម Tor ។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:84
#: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:510
msgid "Unsafe Browser"
msgstr "កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:88
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:90
msgid ""
"The Unsafe Browser was not enabled in the Welcome Screen.\\n\\nTo use the "
"Unsafe Browser, restart Tails and enable the Unsafe Browser in the "
"additional settings of the Welcome Screen.\\n\n"
"To always enable the Unsafe Browser, turn on the Welcome Screen feature of "
"the Persistent Storage."
msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:99
msgid ""
"Another Unsafe Browser is currently running, or being cleaned up. Please "
"retry in a while."
......@@ -1433,22 +1458,22 @@ msgstr ""
"កម្មវិធី​អ៊ីនធឺណិត​គ្មាន​សុវត្ថិភាព​ផ្សេង​បច្ចុប្បន្ន​កំពុង​​ដំណើរការ ឬ​កំពុង​ត្រូវ​បាន​សម្អាត។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​"
"ពេល​បន្ទាប់។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:107
msgid "Failed to setup chroot."
msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំឡើង chroot ។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:103
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:114
msgid "Failed to configure browser."
msgstr ""
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:109
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
msgid ""
"No DNS server was obtained through DHCP or manually configured in "
"NetworkManager."
msgstr ""
"មិន​បាន​ទទួល​ម៉ាស៊ីន​មេ DNS តាម DHCP ឬ​តាម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដោយ​ដៃ​នៅ​ក្នុង​កម្មវិធី​គ្រប់គ្រង​បណ្ដាញ។"
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:120
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:131
msgid "Failed to run browser."
msgstr ""
......@@ -1541,7 +1566,7 @@ msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:625
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:693
msgid "Administration Password"
msgstr ""
......@@ -1565,7 +1590,7 @@ msgid "Disable"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:629
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697
msgid "MAC Address Spoofing"
msgstr ""
......@@ -1586,7 +1611,7 @@ msgid "Don't spoof MAC addresses"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:633
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:701
msgid "Network Configuration"
msgstr ""
......@@ -1609,51 +1634,83 @@ msgstr ""
msgid "Disable all networking"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:526
msgid ""
"The Unsafe Browser allows you to log in to a captive portal.\n"
"\n"
"A captive portal is a web page that is displayed before you can access the "
"Internet. Captive portals usually require to log in to the network or enter "
"information such as an email address.\n"
"\n"
"The Unsafe Browser is not anonymous and can deanonymize you. Use it only to "
"log in to captive portals."
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572
msgid "Disable the Unsafe Browser (default)"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617
msgid "Enable the Unsafe Browser"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
msgid "Settings were loaded from the persistent storage."
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168
msgid ""
"You will configure the Tor bridge and local proxy later on after connecting "
"to a network."
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:220
msgid "Welcome to Tails!"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:254
msgid "Language & Region"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:290
msgid "Default Settings"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:353
msgid "Encrypted _Persistent Storage"
msgstr ""
#. The label for this placeholder text is not very big, so keep this string short.
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:379
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:447
msgid "Enter your passphrase to unlock the persistent storage"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:427
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:495
msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:465
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:533
msgid "_Additional Settings"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:548
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:616
msgid "Add an additional setting"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:597
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:665
msgid ""
"The default settings are safe in most situations. To add a custom setting, "
"press the \"+\" button below."
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:709
msgid "Shutdown"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:720
msgid "_Start Tails"
msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
......@@ -1695,3 +1752,6 @@ msgstr ""
#: ../config/chroot_local-includes/usr/local/share/mime/packages/unlock-veracrypt-volumes.xml.in.h:1
msgid "TrueCrypt/VeraCrypt container"
msgstr ""
#~ msgid "Do you really want to launch the Unsafe Browser?"
#~ msgstr "តើ​អ្នក​ពិតជា​ចង់​ចាប់ផ្ដើម​កម្មវិធី​គ្មាន​សុវត្ថិភាព​មែន​ឬ?"
......@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-06-04 13:11+0200\n"
"PO-Revision-Date: 2020-06-18 12:35+0000\n"
"Last-Translator: Transifex Bot <>\n"
"POT-Creation-Date: 2020-07-27 05:58+0200\n"
"PO-Revision-Date: 2020-06-29 00:35+0000\n"
"Last-Translator: erinm\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/"
"ko/)\n"
"Language: ko\n"
......@@ -54,7 +54,7 @@ msgid ""
msgstr ""
#: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:8
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:100
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:115
#: ../config/chroot_local-includes/usr/share/applications/org.boum.tails.additional-software-config.desktop.in.h:1
msgid "Additional Software"
msgstr ""
......@@ -100,12 +100,12 @@ msgid "Do you want to start Electrum anyway?"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:68
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
msgid "_Launch"
msgstr ""
#: config/chroot_local-includes/usr/local/bin/electrum:69
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:39
#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
msgid "_Exit"
msgstr ""
......@@ -393,52 +393,56 @@ msgstr ""
msgid "Back"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:64
msgid "_Administration Password"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:187
msgid "_MAC Address Spoofing"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:250
msgid "_Network Connection"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:259
msgid "Direct (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:261
msgid "Bridge & Proxy"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:263
msgid "Offline"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
msgid "On (default)"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:333
msgid "_Unsafe Browser"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
msgid "On"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:342
msgid "Enabled"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
msgid "Off"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:344
msgid "Disabled (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
msgid "Off (default)"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:395
msgid "On (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:171
msgid "Shutdown"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:397
msgid "On"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:176
msgid "_Start Tails"
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:399
msgid "Off"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:401
msgid "Off (default)"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
......@@ -473,30 +477,30 @@ msgid ""
"{stderr}"
msgstr ""
#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63