Switch from "Unregistered" to "Not registered"

jamulussoftware · Dec 30, 2021 · bc5e7bc · bc5e7bc
1 parent f15e9e0
commit bc5e7bc
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 26 deletions.
diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts
@@ -3689,7 +3689,7 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion &apos;Stummschalten&apos
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Nicht registriert</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts
@@ -3753,7 +3753,7 @@ Hemos silenciado tu canal y activado &apos;Silenciarme Yo&apos;. Por favor resue
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Sin registrar</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts
@@ -3169,7 +3169,7 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Non inscrit</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts
@@ -3690,7 +3690,7 @@ E&apos; stato disattivato l&apos;audio del tuo canale ed inserito il &quot;Disat
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Non registrato</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts
@@ -3697,7 +3697,7 @@ We hebben uw kanaal gedempt en &apos;Demp mijzelf&apos; geactiveerd. Los eerst h
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Niet geregistreerd</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts
@@ -3212,7 +3212,7 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Niezarejstrowany</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts
@@ -3728,7 +3728,7 @@ Silenciamos seu canal e ativamos &apos;Silenciar-me&apos;. Resolva o problema de
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Não Registrado</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts
@@ -3717,7 +3717,7 @@ O seu canal foi silenciado e foi activada a função &apos;Silenciar-me&apos;. P
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Não Registado</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_sk_SK.ts b/src/res/translation/translation_sk_SK.ts
@@ -3121,7 +3121,7 @@ Stíšili sme váš kanál a aktivovali nastavenia &apos;Stíšiť ma&apos;. Pro
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Neregistrovaný</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts
@@ -3348,7 +3348,7 @@ Vi stängde av din kanal och aktiverade &apos;Tysta mig själv&apos;. Vänligen
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>Oregistrerad</translation>
     </message>
     <message>

diff --git a/src/res/translation/translation_zh_CN.ts b/src/res/translation/translation_zh_CN.ts
@@ -2696,7 +2696,7 @@ We muted your channel and activated &apos;Mute Myself&apos;. Please solve the fe
     </message>
     <message>
         <location filename="../../util.h" line="594"/>
-        <source>Unregistered</source>
+        <source>Not registered</source>
         <translation>未登记</translation>
     </message>
     <message>

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
@@ -58,7 +58,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
     cbxDirectoryType->setAccessibleName ( strDirectoryTypeAN );
 
     QString strDirectoryTypeWT = "<b>" + tr ( "Directory" ) + ":</b> " +
-                                 tr ( "Select '%1' to leave your server unregistered." ).arg ( DirectoryTypeToString ( AT_NONE ) ) + "<br>" +
+                                 tr ( "Select '%1' not to register your server in a directory." ).arg ( DirectoryTypeToString ( AT_NONE ) ) + "<br>" +
                                  tr ( "Select one of the genres to register in that server list." ) + "<br>" +
                                  tr ( "Or select '%1' and specify a custom directory address on the "
                                       "Options tab to select a custom server list." )
@@ -732,7 +732,7 @@ void CServerDlg::UpdateGUIDependencies()
         }
     }
 
-    if ( eSvrRegStatus == SRS_UNREGISTERED )
+    if ( eSvrRegStatus == SRS_NOT_REGISTERED )
     {
         lblRegSvrStatus->setText ( strStatus );
     }

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
@@ -106,7 +106,7 @@ CServerListManager::CServerListManager ( const quint16  iNPortNum,
     ServerListFileName ( strServerListFileName ),
     strDirectoryAddress ( "" ),
     bIsDirectoryServer ( false ),
-    eSvrRegStatus ( SRS_UNREGISTERED ),
+    eSvrRegStatus ( SRS_NOT_REGISTERED ),
     strMinServerVersion ( "" ), // disable version check with empty version
     pConnLessProtocol ( pNConLProt ),
     iSvrRegRetries ( 0 )
@@ -244,7 +244,7 @@ void CServerListManager::SetServerName ( const QString& strNewName )
     if ( ServerList[0].strName != strNewName )
     {
         ServerList[0].strName = strNewName;
-        SetRegistered ( eSvrRegStatus != SRS_UNREGISTERED );
+        SetRegistered ( eSvrRegStatus != SRS_NOT_REGISTERED );
     }
 }
 
@@ -253,7 +253,7 @@ void CServerListManager::SetServerCity ( const QString& strNewCity )
     if ( ServerList[0].strCity != strNewCity )
     {
         ServerList[0].strCity = strNewCity;
-        SetRegistered ( eSvrRegStatus != SRS_UNREGISTERED );
+        SetRegistered ( eSvrRegStatus != SRS_NOT_REGISTERED );
     }
 }
 
@@ -262,7 +262,7 @@ void CServerListManager::SetServerCountry ( const QLocale::Country eNewCountry )
     if ( ServerList[0].eCountry != eNewCountry )
     {
         ServerList[0].eCountry = eNewCountry;
-        SetRegistered ( eSvrRegStatus != SRS_UNREGISTERED );
+        SetRegistered ( eSvrRegStatus != SRS_NOT_REGISTERED );
     }
 }
 
@@ -353,7 +353,7 @@ void CServerListManager::SetIsDirectoryServer()
 void CServerListManager::Unregister()
 {
     // if not currently registered, nothing needs doing
-    if ( DirectoryType == AT_NONE || ( DirectoryType == AT_CUSTOM && strDirectoryAddress.isEmpty() ) || eSvrRegStatus == SRS_UNREGISTERED )
+    if ( DirectoryType == AT_NONE || ( DirectoryType == AT_CUSTOM && strDirectoryAddress.isEmpty() ) || eSvrRegStatus == SRS_NOT_REGISTERED )
     {
         return;
     }
@@ -387,7 +387,7 @@ void CServerListManager::Register()
     if ( DirectoryType == AT_NONE || ( DirectoryType == AT_CUSTOM && strDirectoryAddress.isEmpty() ) || eSvrRegStatus == SRS_REGISTERED )
     {
         // there are edge cases during registration...
-        // maybe ! ( SRS_UNREGISTERED || SRS_BAD_ADDRESS )
+        // maybe ! ( SRS_NOT_REGISTERED || SRS_BAD_ADDRESS )
         return;
     }
 
@@ -854,7 +854,7 @@ void CServerListManager::SetRegistered ( const bool bIsRegister )
     // any time
     QMutexLocker locker ( &Mutex );
 
-    if ( !bIsRegister && eSvrRegStatus == SRS_UNREGISTERED )
+    if ( !bIsRegister && eSvrRegStatus == SRS_NOT_REGISTERED )
     {
         // not wanting to set registered, not registered, nothing to do
         return;
@@ -863,7 +863,7 @@ void CServerListManager::SetRegistered ( const bool bIsRegister )
     if ( bIsDirectoryServer )
     {
         // this IS the directory, no network message to worry about
-        SetSvrRegStatus ( bIsRegister ? SRS_REGISTERED : SRS_UNREGISTERED );
+        SetSvrRegStatus ( bIsRegister ? SRS_REGISTERED : SRS_NOT_REGISTERED );
         return;
     }
 
@@ -895,7 +895,7 @@ void CServerListManager::SetRegistered ( const bool bIsRegister )
     else
     {
         // unregister server if it is registered - regardless of success of parse
-        SetSvrRegStatus ( SRS_UNREGISTERED );
+        SetSvrRegStatus ( SRS_NOT_REGISTERED );
 
         if ( bDirectoryAddressValid )
         {

diff --git a/src/util.h b/src/util.h
@@ -560,7 +560,7 @@ inline QString DirectoryTypeToString ( EDirectoryType eAddrType )
     switch ( eAddrType )
     {
     case AT_NONE:
-        return QCoreApplication::translate ( "CServerDlg", "Unregistered" );
+        return QCoreApplication::translate ( "CServerDlg", "Not registered" );
 
     case AT_ANY_GENRE2:
         return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 2" );
@@ -591,7 +591,7 @@ inline QString DirectoryTypeToString ( EDirectoryType eAddrType )
 // Server registration state ---------------------------------------------
 enum ESvrRegStatus
 {
-    SRS_UNREGISTERED,
+    SRS_NOT_REGISTERED,
     SRS_BAD_ADDRESS,
     SRS_REQUESTED,
     SRS_TIME_OUT,
@@ -606,8 +606,8 @@ inline QString svrRegStatusToString ( ESvrRegStatus eSvrRegStatus )
 {
     switch ( eSvrRegStatus )
     {
-    case SRS_UNREGISTERED:
-        return QCoreApplication::translate ( "CServerDlg", "Unregistered" );
+    case SRS_NOT_REGISTERED:
+        return QCoreApplication::translate ( "CServerDlg", "Not registered" );
 
     case SRS_BAD_ADDRESS:
         return QCoreApplication::translate ( "CServerDlg", "Bad address" );