- tor-commits - lists.torproject.org

[tor-launcher/master] Bug 13252 - Do not store data in the app bundle
by gk＠torproject.org 19 Mar '16

19 Mar '16

commit 64d3139e72587372223d0795ca715991d7423adb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 14 11:15:43 2016 -0400 Bug 13252 - Do not store data in the app bundle Add support for a "side-by-side" directory structure where the writable data is stored in the TorBrowser-Data/ directory next to the application directory. --- src/chrome/locale/en/torlauncher.properties | 6 +- src/components/tl-process.js | 232 +++++++++++++++++++++------- src/defaults/preferences/prefs.js | 9 +- 3 files changed, 184 insertions(+), 63 deletions(-) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 02be756..0ef4437 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. +torlauncher.torrc_missing=The torrc file is missing and could not be created. +torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S diff --git a/src/components/tl-process.js b/src/components/tl-process.js index bb327dc..ccbee12 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2015, The Tor Project, Inc. +// Copyright (c) 2016, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -16,6 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", + "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { @@ -287,7 +289,11 @@ TorProcessService.prototype = mProtocolSvc: null, mTorProcess: null, // nsIProcess mTorProcessStartTime: null, // JS Date.now() - mTorFileBaseDir: null, // nsIFile (cached) + // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. + // (cached; access via this._isUserDataOutsideOfAppDir) + mIsUserDataOutsideOfAppDir: undefined, + mAppDir: null, // nsIFile (cached; access via this._appDir) + mDataDir: null, // nsIFile (cached; access via this._dataDir) mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. @@ -305,10 +311,13 @@ TorProcessService.prototype = // Ideally, we would cd to the Firefox application directory before // starting tor (but we don't know how to do that). Instead, we // rely on the TBB launcher to start Firefox from the right place. - var exeFile = this._getTorFile("tor"); - var torrcFile = this._getTorFile("torrc"); - var torrcDefaultsFile = this._getTorFile("torrc-defaults"); - var dataDir = this._getTorFile("tordatadir"); + + // Get the Tor data directory first so it is created before we try to + // construct paths to files that will be inside it. + var dataDir = this._getTorFile("tordatadir", true); + var exeFile = this._getTorFile("tor", false); + var torrcFile = this._getTorFile("torrc", true); + var torrcDefaultsFile = this._getTorFile("torrc-defaults", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); var detailsKey; @@ -331,11 +340,13 @@ TorProcessService.prototype = return; } - var geoipFile = dataDir.clone(); - geoipFile.append("geoip"); - var geoip6File = dataDir.clone(); - geoip6File.append("geoip6"); + // The geoip and geoip6 files are in the same directory as torrc-defaults. + var geoipFile = torrcDefaultsFile.clone(); + geoipFile.leafName = "geoip"; + + var geoip6File = torrcDefaultsFile.clone(); + geoip6File.leafName = "geoip6"; var args = []; if (torrcDefaultsFile) @@ -663,25 +674,65 @@ TorProcessService.prototype = }, // Returns an nsIFile. - // If file doesn't exist, null is returned. - _getTorFile: function(aTorFileType) + // If aCreate is true and the file doesn't exist, it is created. + _getTorFile: function(aTorFileType, aCreate) { if (!aTorFileType) return null; - var isRelativePath = true; - var prefName = "extensions.torlauncher." + aTorFileType + "_path"; - var path = TorLauncherUtil.getCharPref(prefName); + let isRelativePath = true; + let isUserData = (aTorFileType != "tor") && + (aTorFileType != "torrc-defaults"); + let prefName = "extensions.torlauncher." + aTorFileType + "_path"; + let path = TorLauncherUtil.getCharPref(prefName); if (path) { - var re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; + let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; isRelativePath = !re.test(path); } else { // Get default path. - if (TorLauncherUtil.isWindows) + if (this._isUserDataOutsideOfAppDir) { + // This block is used for the TorBrowser-Data/ case. + if (TorLauncherUtil.isWindows) + { + if ("tor" == aTorFileType) + path = "TorBrowser\\Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser\\Tor\\torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor\\torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else if (TorLauncherUtil.isMac) + { + if ("tor" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Contents/Resources/TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + else // Linux and others. + { + if ("tor" == aTorFileType) + path = "TorBrowser/Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "TorBrowser/Tor/torrc-defaults"; + else if ("torrc" == aTorFileType) + path = "Tor/torrc"; + else if ("tordatadir" == aTorFileType) + path = "Tor"; + } + } + else if (TorLauncherUtil.isWindows) + { + // This block is used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor\\tor.exe"; else if ("torrc-defaults" == aTorFileType) @@ -693,6 +744,7 @@ TorProcessService.prototype = } else // Linux, Mac OS and others. { + // This block is also used for the non-TorBrowser-Data/ case. if ("tor" == aTorFileType) path = "Tor/tor"; else if ("torrc-defaults" == aTorFileType) @@ -700,7 +752,7 @@ TorProcessService.prototype = else if ("torrc" == aTorFileType) path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) - path = "Data/Tor/"; + path = "Data/Tor"; } } @@ -709,51 +761,20 @@ TorProcessService.prototype = try { - var f; + let f; if (isRelativePath) { - // Turn into an absolute path. - if (!this.mTorFileBaseDir) + // Turn 'path' into an absolute path. + if (this._isUserDataOutsideOfAppDir) { - var topDir; - var appInfo = Cc["@mozilla.org/xre/app-info;1"] - .getService(Ci.nsIXULAppInfo); - if (appInfo.ID == this.kThunderbirdID || appInfo.ID == this.kInstantbirdID) - { - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - topDir.append("extensions"); - topDir.append(this.kTorLauncherExtPath); - } - else - { - // For Firefox, paths are relative to the top of the TBB install. - var tbbBrowserDepth = 0; // Windows and Linux - if (TorLauncherUtil.isAppVersionAtLeast("21.0")) - { - // In FF21+, CurProcD is the "browser" directory that is next to - // the firefox binary, e.g., <TorFileBaseDir>/Browser/browser - ++tbbBrowserDepth; - } - if (TorLauncherUtil.isMac) - tbbBrowserDepth += 2; - - topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - while (tbbBrowserDepth > 0) - { - var didRemove = (topDir.leafName != "."); - topDir = topDir.parent; - if (didRemove) - tbbBrowserDepth--; - } - } - - topDir.append("TorBrowser"); - this.mTorFileBaseDir = topDir; + let baseDir = isUserData ? this._dataDir : this._appDir; + f = baseDir.clone(); + } + else + { + f = this._appDir.clone(); + f.append("TorBrowser"); } - - f = this.mTorFileBaseDir.clone(); f.appendRelativePath(path); } else @@ -762,6 +783,22 @@ TorProcessService.prototype = f.initWithPath(path); } + if (!f.exists() && aCreate) + { + try + { + if ("tordatadir" == aTorFileType) + f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + else + f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + } + catch (e) + { + TorLauncherLogger.safelog(4, "unable to create " + f.path + ": ", e); + return null; + } + } + if (f.exists()) { try { f.normalize(); } catch(e) {} @@ -780,6 +817,83 @@ TorProcessService.prototype = return null; // File not found or error (logged above). }, // _getTorFile() + get _isUserDataOutsideOfAppDir() + { + if (this.mIsUserDataOutsideOfAppDir == undefined) + { + // Determine if we are using a "side-by-side" data model by checking + // for the existence of the TorBrowser-Data/ directory. + try + { + let f = this._appDir.parent; + f.append("TorBrowser-Data"); + this.mIsUserDataOutsideOfAppDir = f.exists() && f.isDirectory(); + } + catch (e) + { + this.mIsUserDataOutsideOfAppDir = false; + } + } + + return this.mIsUserDataOutsideOfAppDir; + }, // get _isUserDataOutsideOfAppDir + + // Returns an nsIFile that points to the application directory. + // May throw. + get _appDir() + { + if (!this.mAppDir) + { + let topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + let appInfo = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo); + if ((appInfo.ID == this.kThunderbirdID) || + (appInfo.ID == this.kInstantbirdID)) + { + // For TorBirdy and Tor Messenger the Tor Launcher extension + // directory is returned. + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + } + else // Tor Browser + { + // On Linux and Windows, we want to return the Browser/ directory. + // Because topDir ("CurProcD") points to Browser/browser on those + // platforms, we need to go up one level. + // On Mac OS, we want to return the TorBrowser.app/ directory. + // Because topDir points to Contents/Resources/browser on Mac OS, + // we need to go up 3 levels. + let tbbBrowserDepth = (TorLauncherUtil.isMac) ? 3 : 1; + while (tbbBrowserDepth > 0) + { + let didRemove = (topDir.leafName != "."); + topDir = topDir.parent; + if (didRemove) + tbbBrowserDepth--; + } + } + + this.mAppDir = topDir; + } + + return this.mAppDir; + }, // get _appDir + + // Returns an nsIFile that points to the TorBrowser-Data/ directory. + // May throw. + get _dataDir() + { + if (!this.mDataDir) + { + let f = this._appDir.parent.clone(); + f.append("TorBrowser-Data"); + this.mDataDir = f; + } + + return this.mDataDir; + }, // get _dataDir + _getpid: function() { // Use nsIXULRuntime.processID if it is available. diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index 3057f6a..2c0a95e 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -12,8 +12,15 @@ pref("extensions.torlauncher.control_port", 9151); pref("extensions.torlauncher.start_tor", true); pref("extensions.torlauncher.prompt_at_startup", true); -// All path prefs. are relative to the firefox executable's directory +// The tor_path is relative to the application directory. On Linux and +// Windows this is the Browser/ directory that contains the firefox +// executables, and on Mac OS it is the TorBrowser.app directory. pref("extensions.torlauncher.tor_path", ""); + +// The torrc_path and tordatadir_path are relative to the data directory, +// which is TorBrowser-Data/ if it exists as a sibling of the application +// directory. If TorBrowser-Data/ does not exist, these paths are relative +// to the TorBrowser/ directory within the application directory. pref("extensions.torlauncher.torrc_path", ""); pref("extensions.torlauncher.tordatadir_path", "");

1 0

[torbutton/master] Bug 13252: Do not store data in the app bundle
by gk＠torproject.org 19 Mar '16

19 Mar '16

commit ccf71174bcd6037560436280b93a7dfed84a7d3f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 4 14:21:10 2016 -0500 Bug 13252: Do not store data in the app bundle Add profileMigrationFailed string that is used by Tor Browser. --- src/chrome/locale/en/torbutton.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 76c0c0d..67c630b 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -76,3 +76,4 @@ profileProblemTitle=%S Profile Problem profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. +profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used.

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit f342e16a7694d40c61ecc1c0477b96ef1d52c193 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 16:46:38 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- sv/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sv/irc.properties b/sv/irc.properties index 13c550a..ef6f6ef 100644 --- a/sv/irc.properties +++ b/sv/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=Ett fel uppstod när det senaste meddelandet skickades. # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=Du kan inte gå in i %1$S, och skickades automatiskt vidare till %2$S. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' är inte ett giltigt användarläge på den här servern. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit b48e0ca2990b43467c17b3107bebda338d9422d5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 16:46:33 2016 +0000 Update translations for tor-messenger-ircproperties --- sv/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/irc.properties b/sv/irc.properties index 64ef64c..ef6f6ef 100644 --- a/sv/irc.properties +++ b/sv/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Ett fel uppstod när det senaste meddelandet skickades. error.channelForward=Du kan inte gå in i %1$S, och skickades automatiskt vidare till %2$S. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' är inte ett giltigt användarläge på den här servern. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[tor/master] test_options.c: NULL a pointer after free #18447
by nickm＠torproject.org 19 Mar '16

19 Mar '16

commit 45681f695c6096e280bc7ec3bf0a67c27708dbbc Author: Steven Chamberlain <steven(a)pyro.eu.org> Date: Mon Feb 29 14:09:07 2016 +0000 test_options.c: NULL a pointer after free #18447 tdata will be double-freed if none of linux, __FreeBSD__, DARWIN or __OpenBSD__ are defined. (For example, FreeBSD derivatives). --- src/test/test_options.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index d294e60..9ea5718 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1078,6 +1078,7 @@ test_options_validate__transproxy(void *ignored) // Test trans proxy success free_options_test_data(tdata); + tdata = NULL; #if defined(linux) tdata = get_options_test_data("TransProxyType tproxy\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit d2964b8b9a8ce92b3d57721f8abb3ed848216786 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 12:15:15 2016 +0000 Update translations for torcheck_completed --- it/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index d896eaf..c57e57a 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -10,6 +10,7 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 +# Leunam X1 <leunam.x1(a)gmail.com>, 2016 # Mett <okovita(a)autistici.org>, 2015 # Nicholaus <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-02 02:41+0000\n" -"Last-Translator: HostFat <hostfat(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"PO-Revision-Date: 2016-03-19 11:46+0000\n" +"Last-Translator: Leunam X1 <leunam.x1(a)gmail.com>\n" +"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,7 +109,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "Tuttavia, non sembra essere Tor Browser." msgid "Run a Relay" -msgstr "Eseguire un Relay" +msgstr "Gestisci un Relay" msgid "Stay Anonymous" msgstr "Rimani Anonimo"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit 886dc725490d139e10eb6c35be3b9139f8049880 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 12:15:10 2016 +0000 Update translations for torcheck --- it/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index d896eaf..c57e57a 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -10,6 +10,7 @@ # ironbishop <ironbishop(a)fsfe.org>, 2011 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 # Jaggions <jacopo.jannone(a)gmail.com>, 2014 +# Leunam X1 <leunam.x1(a)gmail.com>, 2016 # Mett <okovita(a)autistici.org>, 2015 # Nicholaus <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-02 02:41+0000\n" -"Last-Translator: HostFat <hostfat(a)gmail.com>\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" +"PO-Revision-Date: 2016-03-19 11:46+0000\n" +"Last-Translator: Leunam X1 <leunam.x1(a)gmail.com>\n" +"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,7 +109,7 @@ msgid "However, it does not appear to be Tor Browser." msgstr "Tuttavia, non sembra essere Tor Browser." msgid "Run a Relay" -msgstr "Eseguire un Relay" +msgstr "Gestisci un Relay" msgid "Stay Anonymous" msgstr "Rimani Anonimo"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit 24301a502c1dd245f45ecc588f06e3e458776d29 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 09:16:56 2016 +0000 Update translations for tails-openpgp-applet_completed --- ko/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/openpgp-applet.pot b/ko/openpgp-applet.pot index 2a367fb..4fa7d5b 100644 --- a/ko/openpgp-applet.pot +++ b/ko/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-03 16:47+0000\n" +"PO-Revision-Date: 2016-03-19 09:15+0000\n" "Last-Translator: Chris Park <utopinator(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 19 Mar '16

19 Mar '16

commit e6e7ec10bea6d5efb5b2f0b0f80a0e8e25c51a01 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 09:16:52 2016 +0000 Update translations for tails-openpgp-applet --- ko/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko/openpgp-applet.pot b/ko/openpgp-applet.pot index 2a367fb..4fa7d5b 100644 --- a/ko/openpgp-applet.pot +++ b/ko/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-03 16:47+0000\n" +"PO-Revision-Date: 2016-03-19 09:15+0000\n" "Last-Translator: Chris Park <utopinator(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

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

19 Mar '16

commit 51548925b40c9f8eefb857f8350c28afc556b658 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 19 09:15:48 2016 +0000 Update translations for tails-misc_completed --- ko.po | 263 +++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 140 insertions(+), 123 deletions(-) diff --git a/ko.po b/ko.po index 61d7dc2..aa19d7a 100644 --- a/ko.po +++ b/ko.po @@ -4,32 +4,34 @@ # # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 +# Chris Park <utopinator(a)gmail.com>, 2016 # Dr.what <javrick6(a)naver.com>, 2014 # ryush00 <ryush00(a)gmail.com>, 2014 +# sangmin lee <sangminlee7648(a)gmail.com>, 2016 # Sungjin Kang <potopro(a)gmail.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-11 22:08+0100\n" -"PO-Revision-Date: 2015-02-24 15:42+0000\n" -"Last-Translator: Sungjin Kang <potopro(a)gmail.com>\n" -"Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" +"POT-Creation-Date: 2016-03-17 15:03+0100\n" +"PO-Revision-Date: 2016-03-19 09:15+0000\n" +"Last-Translator: Chris Park <utopinator(a)gmail.com>\n" +"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" -msgstr "Tor 준비됨" +msgstr "Tor가 준비되었습니다." -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40 msgid "You can now access the Internet." -msgstr "인터넷 접속 가능" +msgstr "이제 인터넷에 접속하실수 있습니다." -#: config/chroot_local-includes/etc/whisperback/config.py:64 +#: config/chroot_local-includes/etc/whisperback/config.py:65 #, python-format msgid "" "<h1>Help us fix your bug!</h1>\n" @@ -46,28 +48,30 @@ msgid "" "\n" msgstr "<h1>우리가 버그를 수정할 수 있도록 도와주세요! <h1>\n<a href=\"%s\">버그 리포팅 지침서</a>를 참조하세요.\n필요한 것 이상의 개인정보를 포함하시지 마세요!\n<h2>우리가 이메일 주소를 받는 이유</h2>\n\n우리가 이메일 주소를 받는 것은 문제를 명확하게 하기 위해 연락을 할 수 있기 때문입니다.\n우리가 받는 대부분의 리포팅은 연락처 정보가 필요합니다만, 그런것들의 일부는 연락처 \n정보가 없는 경우가 있기 때문입니다. 다른 한편으로는 당신이 Tails를 사용하여 이메일이나 \n인터넷 제공자처럼 도청자에대한 확인할 수 있는 기회를 제공하기 위함입니다.\n<./p>\n" -#: config/chroot_local-includes/usr/local/bin/electrum:14 +#: config/chroot_local-includes/usr/local/bin/electrum:17 msgid "Persistence is disabled for Electrum" msgstr "지속성은 Electrum을 비활성시킵니다." -#: config/chroot_local-includes/usr/local/bin/electrum:16 +#: config/chroot_local-includes/usr/local/bin/electrum:19 msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your " "Bitcoin wallet. It is strongly recommended to only run Electrum when its " "persistence feature is activated." msgstr "Tails를 다시 부팅할때, Electrum의 모든 데이터는 비트 코인 지갑을 포함하여 없어집니다. 지속성 기능이 활성화 되어있을때 Electrum만 실행하는 것을 추천드립니다." -#: config/chroot_local-includes/usr/local/bin/electrum:18 -msgid "Do you want to start Electrum any way?" -msgstr "Electrum을 어떤 방법으로 시작 하시겠습니까?" +#: config/chroot_local-includes/usr/local/bin/electrum:21 +msgid "Do you want to start Electrum anyway?" +msgstr "그래도 Electrum을 실행하시겠습니까?" -#: config/chroot_local-includes/usr/local/bin/electrum:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 +#: config/chroot_local-includes/usr/local/bin/electrum:23 +#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Launch" -#: config/chroot_local-includes/usr/local/bin/electrum:21 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37 +#: config/chroot_local-includes/usr/local/bin/electrum:24 +#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Exit" @@ -99,135 +103,151 @@ msgstr "_Decrypt/Verify 클립보드" msgid "_Manage Keys" msgstr "_Manage 키" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:244 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:208 +msgid "_Open Text Editor" +msgstr "문서편집 열기(_O) " + +#: config/chroot_local-includes/usr/local/bin/gpgApplet:252 msgid "The clipboard does not contain valid input data." msgstr "클립보드에 유효한 입력 데이터가 포함되어 있지 않습니다." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:295 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:297 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:299 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:307 msgid "Unknown Trust" msgstr "신뢰 수준 - 낮음" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:301 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:309 msgid "Marginal Trust" msgstr "신뢰 수준 - 보통" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:311 msgid "Full Trust" msgstr "신뢰 수준 - 높음" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:313 msgid "Ultimate Trust" -msgstr "신뢰 수준 - 존나 높음" +msgstr "신뢰 수준 - 매우 높음" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:366 msgid "Name" msgstr "이름" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:367 msgid "Key ID" msgstr "Key ID" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:360 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:368 msgid "Status" msgstr "상태" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:392 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:400 msgid "Fingerprint:" msgstr "핑거 프린트:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:395 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] "사용자의 ID들을 적으시오:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:425 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" msgstr "없음 (서명 안 함)" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:488 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 msgid "Select recipients:" msgstr "받는 사람 선택:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Hide recipients" msgstr "받는 사람 숨기기" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:499 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:507 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "암호화 된 메시지를 받는 모든 사람의 사용자 ID를 숨깁니다. 그렇지 않으면 암호화 된 메시지를 도청하는 사람은 받는 사람이 누구인지 볼 수 있습니다." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:505 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:513 msgid "Sign message as:" msgstr "메시지를 다음으로 서명:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:509 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:517 msgid "Choose keys" msgstr "키 선택" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:549 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:557 msgid "Do you trust these keys?" msgstr "이 키를 신뢰하십니까?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:552 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:560 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] "선택된 키들을 충분히 신뢰할 수 없습니다:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:570 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:578 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] "이 키를 사용할만큼 이 키를 신뢰하십니까?" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:583 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:591 msgid "No keys selected" msgstr "키 선택 안 함" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:585 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:593 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "메세지에 서명할 개인 키 또는 공인 암호키를 선택해야 합니다.-둘 다 가능" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:613 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:621 msgid "No keys available" msgstr "사용 가능 키 없음" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:615 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:623 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "메세지에 서명하키 위한 개인키나, 메세지를 암호화 할 수 있는 공개키가 필요합니다." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:743 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" msgstr "GnuPG 오류" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:764 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." msgstr "작업을 수행할 수 없습니다." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:814 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:822 msgid "GnuPG results" msgstr "GnuPG 상태" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:820 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" msgstr "GnuPG 출력" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:845 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" msgstr "GnuPG의 다른 알림" -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 -msgid "Shutdown Immediately" -msgstr "강제 종료" +#: config/chroot_local-includes/usr/local/bin/icedove:19 +msgid "The Claws Mail persistence feature is activated." +msgstr "Claws Mail 의 지속성 기능이 활성화되었습니다." + +#: config/chroot_local-includes/usr/local/bin/icedove:21 +msgid "" +"If you have emails saved in Claws Mail, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" +" your data</a> before starting Icedove." +msgstr "Claws Mail에 이메일이 저장된 것이 있으시다면, <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'> 데이터 이동하기</a>를 Icedove 실행 전에 하셔야 합니다." -#: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 -msgid "Reboot Immediately" -msgstr "강제 재시동" +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 +msgid "Restart" +msgstr "재시작" + +#: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 +#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 +msgid "Power Off" +msgstr "끄기" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -272,70 +292,62 @@ msgstr "업그레이드에 실패했습니다. 이것은 아마도 네트워크 msgid "The upgrade was successful." msgstr "업그레이드 성공" -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" msgstr "시스템 시간 맞추는 중..." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:53 msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." msgstr "Tor에서 적절한 작업을 위해 정확한 시계가 필요하니 잠깐만 기다려 주십시오." -#: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 +#: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" msgstr "시간 맞추기 실패!" -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 -msgid "Network connection blocked?" -msgstr "네트워크 연결이 깨졌나요?" - -#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 -msgid "" -"It looks like you are blocked from the network. This may be related to the " -"MAC spoofing feature. For more information, see the <a " -"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" -" spoofing documentation</a>." -msgstr "네트워크에서 차단 된 것 같습니다. 이것은 MAC 위장에 관계된 경우가 있습니다. 자세한 내용은 <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC 위장 문서</a>를 참조하십시오." - -#: config/chroot_local-includes/usr/local/bin/tails-security-check:151 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:146 msgid "This version of Tails has known security issues:" msgstr "지금 버전 Tails은 보안에 문제가 있습니다." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:37 +#: config/chroot_local-includes/usr/local/bin/tails-security-check:156 +msgid "Known security issues" +msgstr "알려진 보안 문제" + +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52 #, sh-format msgid "Network card ${nic} disabled" msgstr "네트워크 카드 ${nic}가 잘못되었습니다" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:38 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC 위장이 네트워크 카드 ${nic_name} (${nic}) 때문에 실패했기 때문에 일시적으로 비활성화됩니다.\nTails를 다시 시작하여 MAC 위장을 비활성화하고 싶을지도 모릅니다. <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>문서</a>를 참조하십시오." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "네트워크 카드 ${nic_name} (${nic}) 의 MAC 스푸핑이 실패해서 일시적으로 비활성화 되었습니다.\nTails를 다시 키고 MAC 위장을 비활성화하실 수 있습니다." -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:47 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62 msgid "All networking disabled" msgstr "모든 네트워크 연결이 불가능함" -#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:48 +#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:63 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" -"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC 위장이 네트워크 카드 ${nic_name} (${nic})로 인해 실패했습니다. 오류 복구 실패했기 때문에, 모든 네트워크 기능이 해제됩니다.\nTails를 다시 시작하여 MAC 스푸핑을 무효화하고 싶을지도 모릅니다. <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>문서</a>를 참조하십시오." +"You might prefer to restart Tails and disable MAC spoofing." +msgstr "네트워크 카드 ${nic_name} (${nic}) 의 MAC 스푸핑이 실패했습니다. 오류복구도 실패했기 때문에 모든 네트워킹이 비활성화 되었습니다.\nTails를 다시 키고 MAC 위장을 비활성화하실 수 있습니다." -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:22 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 msgid "error:" msgstr "오류:" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:23 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:25 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:28 msgid "Error" msgstr "오류" -#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:45 msgid "" "Not enough memory available to check for upgrades.\n" "\n" @@ -348,69 +360,78 @@ msgid "" "See https://tails.boum.org/doc/first_steps/upgrade#manual" msgstr "업그레이드 확인에 충분한 메모리를 사용할 수 없습니다.\n\n이 시스템이 Tails의 작동 요구 사항을 충족하는지 확인하십시오.\nfile:///usr/share/doc/tails/website/doc/about/requirements.en.html를 참조하십시오.\n\nTails를 다시 시작하고 다시 업그레이드를 확인하십시오.\n\n또는 수동으로 업그레이드해야합니다.\nhttps://tails.boum.org/doc/first_steps/upgrade#manual 을 참조하십시오." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:67 msgid "Warning: virtual machine detected!" msgstr "경고 : 가상 머신을 발견!" -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:69 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." msgstr "호스트 운영 체제 및 가상화 소프트웨어 모두 Tails에서 실시하고있는 것을 확인할 수 있습니다." -#: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:72 +msgid "Warning: non-free virtual machine detected!" +msgstr "경고: 상용 가상 머신 탐지됨!" + +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:74 msgid "" -"<a " -"href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" -" more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>정보</a> " +"Both the host operating system and the virtualization software are able to " +"monitor what you are doing in Tails. Only free software can be considered " +"trustworthy, for both the host operating system and the virtualization " +"software." +msgstr "호스트 운영 체제와 가상 머신 모두 Tails에서 사용자가 하는 것을 볼 수 있을 수 있습니다. 믿을 수 있는 것은 오픈소스 공짜 소프트웨어 뿐이며, 이는 호스트와 가상머신 모두에게 해당됩니다." -#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +#: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:79 +msgid "Learn more" +msgstr "더 알아보기" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:40 msgid "Tor is not ready" msgstr "Tor 준비 안 됨" -#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor는 준비 안 됐는데, 그래도 Tor 브라우저를 실행할까요?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:20 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Start Tor Browser" msgstr "Tor 브라우저 시작" -#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Cancel" msgstr "취소" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:38 msgid "Do you really want to launch the Unsafe Browser?" msgstr "정말 안전하지 않은 브라우저를 시작 하시겠습니까?" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:35 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:40 msgid "" -"Network activity within the Unsafe Browser is not anonymous. Only use" -" the Unsafe Browser if necessary, for example if you have to login or " +"Network activity within the Unsafe Browser is not anonymous.\\nOnly " +"use the Unsafe Browser if necessary, for example\\nif you have to login or " "register to activate your Internet connection." -msgstr "안전하지 않은 브라우저에서 네트워크의 활동 상황은 익명이지 않습니다 . 필요한 경우에만 예를 들어, 인터넷 연결을 활성화하기 위해 로그인 또는 등록해야하는 경우에만 안전하지 않은 브라우저를 사용하십시오." +msgstr "안전하지 않은 브라우져로 하는 네트워크 연결은 익명을 보장할 수 없습니다. \\n정말 필요한 경우에만 사용하세요. 예를 들어 \\n 인터넷 연결을 위해 로그인하거나 등록할 필요가 있는 경우에만 사용하세요" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:47 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52 msgid "Starting the Unsafe Browser..." msgstr "안전하지 않은 브라우저를 실행 중 ..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:48 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 msgid "This may take a while, so please be patient." msgstr "잠시 시간이 걸릴 수 있으므로 기다려주세요." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:53 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Shutting down the Unsafe Browser..." msgstr "안전하지 않은 브라우저를 종료 중 ..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "시간이 좀 걸릴 우려가 있습니다. 적절하게 종료 될 때까지 안전하지 않은 브라우저를 다시 시작할 수 없습니다." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:66 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 msgid "Failed to restart Tor." msgstr "Tor 재시작 실패" @@ -449,40 +470,40 @@ msgstr "브라우저를 구성할 수 없습니다." msgid "Failed to run browser." msgstr "브라우저를 실행시키지 못 했습니다." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:34 msgid "I2P failed to start" msgstr "I2P를 시작할 수 없습니다" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:32 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:35 msgid "" "Something went wrong when I2P was starting. Check the logs in /var/log/i2p " "for more information." msgstr "I2P가 시작될때 뭔가 잘못된 것같습니다. 자세한 정보를 보기위해 /var/log/i2p 로그를 확인하세요." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:52 msgid "I2P's router console is ready" msgstr "I2P 라우터 콘솔 준비됨" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:44 -msgid "You can now access I2P's router console on http://127.0.0.1:7657." -msgstr "http://127.0.0.1:7657의 I2P 라우터 콘솔에 접근했습니다." +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:53 +msgid "You can now access I2P's router console in the I2P Browser." +msgstr "이제 I2P 브라우저에서 I2P의 라우터 콘솔을 열 수 있습니다." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:58 msgid "I2P is not ready" msgstr "I2P 준비 안 됨" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:50 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 msgid "" -"Eepsite tunnel not built within six minutes. Check the router console at " -"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." -" Reconnect to the network to try again." -msgstr "6분안에 Eepsite 터널이 생성되지 않았습니다. http://127.0.0.1:7657/logs에서 라우터 콘솔을 확인하거나 /var/log/i2p 로그에서 확인하세요. 네트워크를 재접속해주세요." +"Eepsite tunnel not built within six minutes. Check the router console in the" +" I2P Browser or the logs in /var/log/i2p for more information. Reconnect to " +"the network to try again." +msgstr "Eepsite 터널이 6분 내에 생성되지 않았습니다. 라우터 콘솔을 I2P 브라우저나 /var/log/i2p에 있는 로그 파일에서 확인하십시오.\n다시 연결하기로 재시도할 수 있습니다." -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:71 msgid "I2P is ready" msgstr "I2P 준비됨" -#: config/chroot_local-includes/usr/local/sbin/tails-i2p:61 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:72 msgid "You can now access services on I2P." msgstr "I2P에서 서비스로 접근가능합니다." @@ -519,10 +540,6 @@ msgstr "재시동" msgid "Immediately reboot computer" msgstr "즉시 컴퓨터를 다시 시작합니다" -#: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 -msgid "Power Off" -msgstr "끄기" - #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:2 msgid "Immediately shut down computer" msgstr "빨리 컴퓨터를 종료합니다"

1 0