Correct unnecessary use of the phrase "whether or not"

Also correct use of nouns in place of verbs in a few areas, and make the
consistent the terminology of signing in/out.

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

1 files changed, 36 insertions, 36 deletions

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 11b5652af..44b278f0a 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -10,7 +10,7 @@
       <locale name="C">
         <short>Show offline contacts</short>
         <long>
-        Whether or not to show contacts that are offline in the contact list.
+        Whether to show contacts that are offline in the contact list.
         </long>
       </locale>
     </schema>
@@ -40,7 +40,7 @@
       <locale name="C">
         <short>Show avatars</short>
         <long>
-        Whether or not to show avatars for contacts in the contact
+        Whether to show avatars for contacts in the contact
         list and chat windows.
         </long>
       </locale>
@@ -55,7 +55,7 @@
       <locale name="C">
         <short>Show protocols</short>
         <long>
-        Whether or not to show protocols for contacts in the contact
+        Whether to show protocols for contacts in the contact
         list.
         </long>
       </locale>
@@ -70,7 +70,7 @@
       <locale name="C">
         <short>Compact contact list</short>
         <long>
-        Whether to show the contact list in compact mode or not. 
+        Whether to show the contact list in compact mode.
         </long>
       </locale>
     </schema>
@@ -112,7 +112,7 @@
       <locale name="C">
          <short>Use notification sounds</short>
          <long>
-         Whether or not to play a sound to notify for events.
+         Whether to play a sound to notify of events.
          </long>
       </locale>
     </schema>
@@ -126,7 +126,7 @@
       <locale name="C">
          <short>Disable sounds when away</short>
          <long>
-         Whether or not to play sound notifications when away or busy.
+         Whether to play sound notifications when away or busy.
          </long>
       </locale>
     </schema>
@@ -140,7 +140,7 @@
       <locale name="C">
          <short>Play a sound for incoming messages</short>
          <long>
-         Whether or not to play a sound to notify for incoming messages.
+         Whether to play a sound to notify of incoming messages.
          </long>
       </locale>
     </schema>
@@ -154,7 +154,7 @@
       <locale name="C">
          <short>Play a sound for outgoing messages</short>
          <long>
-         Whether or not to play a sound to notify for outgoing messages.
+         Whether to play a sound to notify of outgoing messages.
          </long>
       </locale>
     </schema>
@@ -168,7 +168,7 @@
       <locale name="C">
          <short>Play a sound for new conversations</short>
          <long>
-         Whether or not to play a sound to notify for new conversations.
+         Whether to play a sound to notify of new conversations.
          </long>
       </locale>
     </schema>
@@ -182,7 +182,7 @@
       <locale name="C">
          <short>Play a sound when a contact logs in</short>
          <long>
-         Whether or not to play a sound to notify for contacts logging in the
+         Whether to play a sound to notify of contacts logging into the
          network.
          </long>
       </locale>
@@ -197,7 +197,7 @@
       <locale name="C">
          <short>Play a sound when a contact logs out</short>
          <long>
-         Whether or not to play a sound to notify for contacts logging off the
+         Whether to play a sound to notify of contacts logging out of the
          network.
          </long>
       </locale>
@@ -212,7 +212,7 @@
       <locale name="C">
          <short>Play a sound when we log in</short>
          <long>
-         Whether or not to play a sound when logging in a network.
+         Whether to play a sound when logging into a network.
          </long>
       </locale>
     </schema>
@@ -226,7 +226,7 @@
       <locale name="C">
          <short>Play a sound when we log out</short>
          <long>
-         Whether or not to play a sound when logging off a network.
+         Whether to play a sound when logging out of a network.
          </long>
       </locale>
     </schema>
@@ -240,7 +240,7 @@
       <locale name="C">
          <short>Enable popup notifications for new messages</short>
          <long>
-         Whether or not to show a popup notification when receiving a new
+         Whether to show a popup notification when receiving a new
          message.
          </long>
       </locale>
@@ -255,7 +255,7 @@
       <locale name="C">
          <short>Disable popup notifications when away</short>
          <long>
-         Whether or not to show popup notifications when away or busy.
+         Whether to show popup notifications when away or busy.
          </long>
       </locale>
     </schema>
@@ -267,9 +267,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Popup notifications if the chat isn't focused</short>
+         <short>Pop up notifications if the chat isn't focused</short>
          <long>
-         Whether or not to show a popup notification when receiving a new
+         Whether to show a popup notification when receiving a new
          message even if the chat is already opened, but not focused.
          </long>
       </locale>
@@ -282,9 +282,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Popup notifications when a contact sign in</short>
+         <short>Pop up notifications when a contact logs in</short>
          <long>
-         Whether or not to show a popup notification when a contact goes
+         Whether to show a popup notification when a contact goes
          online.
          </long>
       </locale>
@@ -297,9 +297,9 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-         <short>Popup notifications when a contact sign out</short>
+         <short>Pop up notifications when a contact logs out</short>
          <long>
-         Whether or not to show a popup notification when a contact goes
+         Whether to show a popup notification when a contact goes
          offline.
          </long>
       </locale>
@@ -328,7 +328,7 @@
       <locale name="C">
          <short>Use graphical smileys</short>
          <long>
-         Whether or not to convert smileys into graphical images in
+         Whether to convert smileys into graphical images in
          conversations.
          </long>
       </locale>
@@ -343,7 +343,7 @@
       <locale name="C">
          <short>Show contact list in rooms</short>
          <long>
-         Whether or not to show the contact list in chat rooms.
+         Whether to show the contact list in chat rooms.
          </long>
       </locale>
     </schema>
@@ -399,7 +399,7 @@
       <locale name="C">
          <short>Use theme for chat rooms</short>
          <long>
-           Whether to use the theme for chat rooms or not.
+           Whether to use the theme for chat rooms.
          </long>
       </locale>
     </schema>
@@ -427,7 +427,7 @@
       <locale name="C">
         <short>Enable spell checker</short>
         <long>
-        Whether or not to check words typed against the languages you
+        Whether to check words typed against the languages you
       want to check with.
         </long>
       </locale>
@@ -458,7 +458,7 @@
       <locale name="C">
         <short>Empathy should use the avatar of the contact as the chat window icon</short>
         <long>
-        Whether or not Empathy should use the avatar of the contact as the chat window icon.
+        Whether Empathy should use the avatar of the contact as the chat window icon.
         </long>
       </locale>
     </schema>
@@ -472,7 +472,7 @@
       <locale name="C">
         <short>Show hint about closing the main window</short>
         <long>
-        Whether or not to show the message dialog about closing the
+        Whether to show the message dialog about closing the
       main window with the 'x' button in the title bar.
         </long>
       </locale>
@@ -487,7 +487,7 @@
       <locale name="C">
         <short>Salut account is created</short>
         <long>
-        Whether or not the Salut account has been created on the first
+        Whether the Salut account has been created on the first
       Empathy run.
         </long>
       </locale>
@@ -516,7 +516,7 @@
       <locale name="C">
         <short>Connection managers should be used</short>
         <long>
-        Whether or not connectivity managers should be used to automatically
+        Whether connectivity managers should be used to automatically
         disconnect/reconnect.
         </long>
       </locale>
@@ -531,7 +531,7 @@
       <locale name="C">
         <short>Empathy should auto-connect on startup</short>
         <long>
-        Whether or not Empathy should automatically log in to your accounts on startup.
+        Whether Empathy should automatically log into your accounts on startup.
         </long>
       </locale>
     </schema>
@@ -545,7 +545,7 @@
       <locale name="C">
         <short>Empathy has asked about importing accounts</short>
         <long>
-        Whether or not Empathy has asked about importing accounts from other programs.
+        Whether Empathy has asked about importing accounts from other programs.
         </long>
       </locale>
     </schema>
@@ -573,7 +573,7 @@
       <locale name="C">
         <short>Empathy can publish the user's location</short>
         <long>
-        Whether or not Empathy can publish the user's location to his contacts.
+        Whether Empathy can publish the user's location to their contacts.
         </long>
       </locale>
     </schema>
@@ -587,7 +587,7 @@
       <locale name="C">
         <short>Empathy can use the network to guess the location</short>
         <long>
-        Whether or not Empathy can use the network to guess the location.
+        Whether Empathy can use the network to guess the location.
         </long>
       </locale>
     </schema>
@@ -601,7 +601,7 @@
       <locale name="C">
         <short>Empathy can use the cellular network to guess the location</short>
         <long>
-        Whether or not Empathy can use the cellular network to guess the location.
+        Whether Empathy can use the cellular network to guess the location.
         </long>
       </locale>
     </schema>
@@ -615,7 +615,7 @@
       <locale name="C">
         <short>Empathy can use the GPS to guess the location</short>
         <long>
-        Whether or not Empathy can use the GPS to guess the location.
+        Whether Empathy can use the GPS to guess the location.
         </long>
       </locale>
     </schema>
@@ -629,7 +629,7 @@
       <locale name="C">
         <short>Empathy should reduce the location's accuracy</short>
         <long>
-        Whether or not Empathy should reduce the location's accuracy for privacy reasons.
+        Whether Empathy should reduce the location's accuracy for privacy reasons.
         </long>
       </locale>
     </schema>