[Tails-dev] [PATCH] Fix incorrect usage of "discrete"

Nachricht löschen

Nachricht beantworten
Autor: Steve Dougherty
Datum:  
To: tails-dev@boum.org
Betreff: [Tails-dev] [PATCH] Fix incorrect usage of "discrete"
This doesn't retroactively fix news posts. Via Wiktionary:

discrete (comparative more discrete, superlative most discrete)

1. Separate; distinct; individual; non-continuous.

       a government with three discrete divisions


2. That can be perceived individually, not as connected to, or part of, something else.

discreet (comparative more discreet or discreeter, superlative most discreet or discreetest)

  1. Respectful of privacy or secrecy; exercising caution in order to
     avoid causing embarrassment; quiet; diplomatic.


       With a discreet gesture, she reminded him to mind his manners.


       John just doesn't understand that laughing at Mary all day is not
       very discreet.


2. Not drawing attention, anger or challenge; inconspicuous.

Although cognate and identical in the Middle English period, the term
has become distinct from discrete.
---
 config/chroot_local-includes/usr/share/tails/tca/main.ui.in | 2 +-
 po/tails.pot                                                | 2 +-
 wiki/src/doc/anonymous_internet/tor.mdwn                    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/config/chroot_local-includes/usr/share/tails/tca/main.ui.in b/config/chroot_local-includes/usr/share/tails/tca/main.ui.in
index f77be556cd..59ca2b8e5b 100644
--- a/config/chroot_local-includes/usr/share/tails/tca/main.ui.in
+++ b/config/chroot_local-includes/usr/share/tails/tca/main.ui.in
@@ -1498,7 +1498,7 @@ Choose this option if you already know that you need a bridge. Otherwise, Tails
             <property name="margin-top">12</property>
             <property name="label" translatable="yes">Tails will only connect to Tor after you configured a Tor bridge. Bridges are secret Tor relays that hide that you are connecting to Tor.


-Our team is doing its best to help you connect to Tor using the most discrete types of Tor bridges.
+Our team is doing its best to help you connect to Tor using the most discreet types of Tor bridges.

 You will have to do extra configuration if you don't know any Tor bridges yet, if you connect from a public Wi-Fi network, or if you are in the Eastern Hemisphere.</property>
             <property name="use-markup">True</property>
diff --git a/po/tails.pot b/po/tails.pot
index 82f80aaa9f..29b9a2243a 100644
--- a/po/tails.pot
+++ b/po/tails.pot
@@ -3000,7 +3000,7 @@ msgid ""
 "are secret Tor relays that hide that you are connecting to Tor.\n"
 "\n"
 "Our team is doing its best to help you connect to Tor using the most "
-"discrete types of Tor bridges.\n"
+"discreet types of Tor bridges.\n"
 "\n"
 "You will have to do extra configuration if you don't know any Tor bridges "
 "yet, if you connect from a public Wi-Fi network, or if you are in the "
diff --git a/wiki/src/doc/anonymous_internet/tor.mdwn b/wiki/src/doc/anonymous_internet/tor.mdwn
index a8c2e4f16d..96741a60a6 100644
--- a/wiki/src/doc/anonymous_internet/tor.mdwn
+++ b/wiki/src/doc/anonymous_internet/tor.mdwn
@@ -156,7 +156,7 @@ of exit nodes of the Tor network</a> is public.</p>


</div>

-Our team is doing its best to help you connect to Tor using the most discrete
+Our team is doing its best to help you connect to Tor using the most discreet
types of Tor bridges. That is why, when you decide to hide that you are connecting to Tor:

 <!-- Mention captive portal detection here once we have #5785 -->
@@ -185,7 +185,7 @@ types of Tor bridges. That is why, when you decide to hide that you are connecti
      Even someone who knows your bridge cannot know what you are doing online
      from Tails.


-- You can only use the types of bridges that our team considers discrete enough.
+- You can only use the types of bridges that our team considers discreet enough.

Currently in Tails, only *obfs4* bridges hide that you are using Tor.

--
2.34.1