[tdelibs][master,r14.0.x] edcf1665,eeb8782f,0e071064,dd36ea0a,90562f7b,9a830d4d,ab1c9711,1a46b7db...

2019-07-20 13:50:50

Michele Calgaro

Removed sync dbus call code in tdenetworkmanager to align to latest
dbus-1-tqt code.

Signed-off-by: Michele Calgaro <michele.calgaro@...>

M tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

index a7ca751..851710c 100644

--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

@@ -1597,18 +1597,6 @@

 	TQ_UINT32 ret;

 	TQT_DBusError error;

-#ifndef USE_ASYNC_DBUS_CALLS

-	// Obtain connection settings from the path specified

-	DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath);

-	connectionSettings.setConnection(TQT_DBusConnection::systemBus());

-	TQT_DBusTQStringDataMap connectionSettingsMap;

-	ret = connectionSettings.GetSettings(connectionSettingsMap, error);

-	if (ret && error.isValid()) {

-		ret = 0;

-		PRINT_ERROR((error.name() + ": " + error.message()))

-	}

-	if (ret) {

-#else // USE_ASYNC_DBUS_CALLS

 	// Obtain connection settings from the path specified

 	DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath);

 	connectionSettings.setConnection(TQT_DBusConnection::systemBus());

@@ -1640,7 +1628,6 @@

 		if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) {

 			d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID);

-#endif // USE_ASYNC_DBUS_CALLS

 		// Parse settings to find connection type

 		TQT_DBusTQStringDataMap::const_iterator it2;

@@ -1939,18 +1926,6 @@

 				printf("[network-manager comm debug] %s\n", (*it).data()); fflush(stdout);

 #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS

-#ifndef USE_ASYNC_DBUS_CALLS

-				// Obtain connection settings from the path specified

-				DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it));

-				connectionSettings.setConnection(TQT_DBusConnection::systemBus());

-				TQT_DBusTQStringDataMap connectionSettingsMap;

-				ret = connectionSettings.GetSettings(connectionSettingsMap, error);

-				if (ret && error.isValid()) {

-					ret = 0;

-					PRINT_ERROR((error.name() + ": " + error.message()))

-				}

-				if (ret) {

-#else // USE_ASYNC_DBUS_CALLS

 				// Obtain connection settings from the path specified

 				DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it));

 				connectionSettings.setConnection(TQT_DBusConnection::systemBus());

@@ -1983,7 +1958,6 @@

 					if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) {

 						d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID);

-#endif // USE_ASYNC_DBUS_CALLS

 #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS

 					printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout);

@@ -3079,17 +3053,6 @@

 	TQT_DBusTQStringDataMap connectionSecretsMap(TQT_DBusData::String);

 	ret = d->m_networkManagerSettings->GetConnectionByUuid(uuid, existingConnection, error);

 	if (ret) {

-#ifndef USE_ASYNC_DBUS_CALLS

-		// Obtain connection settings from the path specified

-		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);

-		connectionSettings.setConnection(TQT_DBusConnection::systemBus());

-		ret = connectionSettings.GetSecrets(group, connectionSecretsMap, error);

-		if (ret && error.isValid()) {

-			ret = 0;

-			PRINT_ERROR((error.name() + ": " + error.message()))

-		}

-		if (ret) {

-#else // USE_ASYNC_DBUS_CALLS

 		// Obtain connection secrets from the path specified

 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);

 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());

@@ -3121,7 +3084,6 @@

 			if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) {

 				d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID);

-#endif // USE_ASYNC_DBUS_CALLS

 #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS

 			printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout);

@@ -3296,17 +3258,6 @@

 	existing = false;

 	ret = d->m_networkManagerSettings->GetConnectionByUuid(connection->UUID, existingConnection, error);

 	if (ret) {

-#ifndef USE_ASYNC_DBUS_CALLS

-		// Obtain connection settings from the path specified

-		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);

-		connectionSettings.setConnection(TQT_DBusConnection::systemBus());

-		ret = connectionSettings.GetSettings(connectionSettingsMap, error);

-		if (ret && error.isValid()) {

-			ret = 0;

-			PRINT_ERROR((error.name() + ": " + error.message()))

-		}

-		if (ret) {

-#else // USE_ASYNC_DBUS_CALLS

 		// Obtain connection settings from the path specified

 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);

 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());

@@ -3339,7 +3290,6 @@

 			if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) {

 				d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID);

-#endif // USE_ASYNC_DBUS_CALLS

 			existing = true;

eeb8782f

2019-07-21 14:23:40

Anton Repko

Fix incorrect translations of language names.

Signed-off-by: Anton Repko <anton@...>

M tdecore/all_languages.desktop

tdecore/all_languages.desktop

diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop

index 3c3483e..3c96471 100644

--- a/tdecore/all_languages.desktop

+++ b/tdecore/all_languages.desktop

@@ -3871,7 +3871,7 @@

 Name[ru]=Верхнелужицкий

 Name[rw]=Ikinyasorubiya cyo hejuru

 Name[se]=Bajil Sorbiagiella

-Name[sk]=dolnolužická srbčina

+Name[sk]=hornolužická srbčina

 Name[sl]=zgornjesorbijsko

 Name[sr]=Горње лужичко српски

 Name[sr@Latn]=Gornje lužičko srpski

@@ -6612,7 +6612,7 @@

 Name[ru]=Малайский

 Name[rw]=Ikimalayi

 Name[se]=Malaigiella

-Name[sk]=malajálamčina

+Name[sk]=malajčina

 Name[sl]=malajsko

 Name[sq]=Malanisht

 Name[sr]=Малајски

0e071064

2019-07-21 17:13:47

Chris

Fix remaining brandings in tdelibs and adopt to modern age.

Signed-off-by: Chris <xchrisx@...>

M tdeio/kssl/ksslcertdlg.cc
M tdeio/tdeio/global.cpp
M tdeprint/cups/kptextpage.cpp
M tdeprint/kmspecialmanager.cpp
M tdeprint/kpcopiespage.cpp

tdeio/kssl/ksslcertdlg.cc

diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc

index 53904f1..7431d4c 100644

--- a/tdeio/kssl/ksslcertdlg.cc

+++ b/tdeio/kssl/ksslcertdlg.cc

@@ -81,7 +81,7 @@

    connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont()));

 #ifndef TQT_NO_WIDGET_TOPEXTRA

-   setCaption(i18n("KDE SSL Certificate Dialog"));

+   setCaption(i18n("TDE SSL Certificate Dialog"));

 #endif

tdeio/tdeio/global.cpp

diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp

index 4a5819b..ff51ac1 100644

--- a/tdeio/tdeio/global.cpp

+++ b/tdeio/tdeio/global.cpp

@@ -688,11 +688,10 @@

       causes << i18n( "The requested protocol may not be supported." )

         << i18n( "The versions of the %1 protocol supported by this computer and "

         "the server may be incompatible." ).arg( protocol );

-      solutions << i18n( "You may perform a search on the Internet for a TDE "

-        "program (called a tdeioslave or ioslave) which supports this protocol. "

-        "Places to search include <a href=\"http://kde-apps.org/\">"

-        "http://kde-apps.org/</a> and <a href=\"http://freshmeat.net/\">"

-        "http://freshmeat.net/</a>." )

+      solutions << i18n( "You may perform a search on the Trinity website for a TDE "

+        "program (called a tdeioslave, ioslave or tdeio) which supports this protocol. "

+        "Places to search include <a href=\"https://mirror.git.trinitydesktop.org/cgit/\">"

+        "https://mirror.git.trinitydesktop.org/cgit/</a> or the repos for your distribution." )

         << sUpdate << sSysadmin;

       break;

tdeprint/cups/kptextpage.cpp

diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp

index 955434d..6fb0652 100644

--- a/tdeprint/cups/kptextpage.cpp

+++ b/tdeprint/cups/kptextpage.cpp

@@ -89,7 +89,7 @@

 			" <p>These settings control the appearance of text on printouts. They are only valid for "

 			" printing text files or input directly through kprinter. </p> "

 			" <p><b>Note:</b> These settings have no effect whatsoever for other input formats than "

-			" text, or for printing from applications such as the KDE Advanced Text Editor. (Applications "

+			" text, or for printing from applications such as the TDE Advanced Text Editor. (Applications "

 			" in general send PostScript to the print system, and 'kate' in particular has its own "

 			" knobs to control the print output. </p>."

 			" <hr> "

@@ -109,8 +109,8 @@

 			" <p><b>Margins</b></p> "

 			" <p>These settings control the margins of printouts on the paper. They are not valid for "

 			" jobs originating from applications which define their own page layout internally and "

-			" send PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p> "

-			" <p>When printing from KDE applications, such as KMail and Konqueror, or printing an ASCII text "

+			" send PostScript to TDEPrint (such as KOffice, OpenOffice or LibreOffice). </p> "

+			" <p>When printing from TDE applications, such as KMail and Konqueror, or printing an ASCII text "

 			" file through kprinter, you can choose your preferred margin settings here. </p> "

 			" <p>Margins may be set individually for each edge of the paper. The combo box at the bottom lets you change "

 			" the units of measurement between Pixels, Millimeters, Centimeters, and Inches. </p> "

tdeprint/kmspecialmanager.cpp

diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp

index 910de49..16a0ab6 100644

--- a/tdeprint/kmspecialmanager.cpp

+++ b/tdeprint/kmspecialmanager.cpp

@@ -51,7 +51,7 @@

 			// seems there's a problem here

 			m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your "

-						"local KDE directory. This file probably comes from a previous KDE "

+						"local TDE directory. This file probably comes from a previous TDE "

 						"release and should be removed in order to manage global pseudo "

 						"printers."));

 			return false;

tdeprint/kpcopiespage.cpp

diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp

index 10eb6e2..27b6472 100644

--- a/tdeprint/kpcopiespage.cpp

+++ b/tdeprint/kpcopiespage.cpp

@@ -53,10 +53,11 @@

 						" </p>"

 						" </qt>" );

 	TQString whatsThisCurrentPagesLabel = i18n(  " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want "

-						" to print the page currently visible in your KDE application.</p>"

+						" to print the page currently visible in your TDE application.</p>"

 						" <p><b>Note:</b> this field is disabled if you print from"

-						" non-TDE applications like Mozilla or OpenOffice.org, since here TDEPrint has no"

-						" means to determine which document page you are currently viewing.</p></qt>" );

+						" non-TDE applications like Firefox, PaleMoon, SeaMonkey or OpenOffice and"

+						" LibreOffice, since here TDEPrint has no means to determine which document page"

+						" you are currently viewing.</p></qt>" );

 	TQString whatsThisPageRangeLabel = i18n(  " <qt><b>Page Range:</b> Choose a \"Page Range\" to select a subset of the"

 						" complete document pages"

 						" to be printed. The format is <em>\"n,m,o-p,q,r,s-t, u\"</em>.</p>"

dd36ea0a

2019-07-21 17:40:08

Anton Repko

Fix incorrect translations of language names.

Signed-off-by: Anton Repko <anton@...>

M tdecore/all_languages.desktop

tdecore/all_languages.desktop

diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop

index 3c96471..487b8da 100644

--- a/tdecore/all_languages.desktop

+++ b/tdecore/all_languages.desktop

@@ -1581,7 +1581,7 @@

 Name[ru]=Чешский

 Name[rw]=Ikinyaceke

 Name[se]=Čehkagiella

-Name[sk]=korzičtina

+Name[sk]=čeština

 Name[sl]=češko

 Name[sq]=Çekisht

 Name[sr]=Чешки

90562f7b

2019-07-24 00:28:28

Chris

Replace Qt branding with TQt ones.

Signed-off-by: Chris <xchrisx@...>

M tdecore/tde-config.cpp.cmake

tdecore/tde-config.cpp.cmake

diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake

index 36e752f..e200f80 100644

--- a/tdecore/tde-config.cpp.cmake

+++ b/tdecore/tde-config.cpp.cmake

@@ -179,7 +179,7 @@

             "locale", I18N_NOOP("Translation files for TDELocale"),

             "mime", I18N_NOOP("Mime types"),

             "module", I18N_NOOP("Loadable modules"),

-            "qtplugins", I18N_NOOP("Qt plugins"),

+            "qtplugins", I18N_NOOP("TQt plugins"),

             "services", I18N_NOOP("Services"),

             "servicetypes", I18N_NOOP("Service types"),

             "sound", I18N_NOOP("Application sounds"),

ab1c9711	2019-07-21 17:17:02	Chris
Fix remaining brandings in tdelibs and adopt to modern age. Signed-off-by: Chris <xchrisx@...> (cherry picked from commit 0e071064b91e64638e14f3756d477f9e2fd3317e)
M tdeio/kssl/ksslcertdlg.cc M tdeio/tdeio/global.cpp M tdeprint/cups/kptextpage.cpp M tdeprint/kmspecialmanager.cpp M tdeprint/kpcopiespage.cpp
Diff limit reached (max: 250 lines)
1a46b7db	2019-07-21 17:40:23	Anton Repko
Fix incorrect translations of language names. Signed-off-by: Anton Repko <anton@...> (cherry picked from commit dd36ea0a096fded7473ad4e64bd88252737012fe)
M tdecore/all_languages.desktop
Diff limit reached (max: 250 lines)
5617d914	2019-07-24 04:39:55	Chris
Replace Qt branding with TQt ones. Signed-off-by: Chris <xchrisx@...> (cherry picked from commit 90562f7b8a02f050dbe5fffec3d8c709b10713c4)
M tdecore/tde-config.cpp.cmake
Diff limit reached (max: 250 lines)

Branch: master

tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

tdecore/all_languages.desktop

tdeio/kssl/ksslcertdlg.cc

tdeio/tdeio/global.cpp

tdeprint/cups/kptextpage.cpp

tdeprint/kmspecialmanager.cpp

tdeprint/kpcopiespage.cpp

tdecore/all_languages.desktop

tdecore/tde-config.cpp.cmake

Branch: r14.0.x

edcf1665	2019-07-20 13:50:50	Michele Calgaro
Removed sync dbus call code in tdenetworkmanager to align to latest dbus-1-tqt code. Signed-off-by: Michele Calgaro <michele.calgaro@...>
M tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
tdecore/tdehw/networkbackends/network-manager/network-manager.cpp diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp index a7ca751..851710c 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp @@ -1597,18 +1597,6 @@ TQ_UINT32 ret; TQT_DBusError error; -#ifndef USE_ASYNC_DBUS_CALLS - // Obtain connection settings from the path specified - DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath); - connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - TQT_DBusTQStringDataMap connectionSettingsMap; - ret = connectionSettings.GetSettings(connectionSettingsMap, error); - if (ret && error.isValid()) { - ret = 0; - PRINT_ERROR((error.name() + ": " + error.message())) - } - if (ret) { -#else // USE_ASYNC_DBUS_CALLS // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); @@ -1640,7 +1628,6 @@ if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) { d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID); } -#endif // USE_ASYNC_DBUS_CALLS // Parse settings to find connection type TQT_DBusTQStringDataMap::const_iterator it2; @@ -1939,18 +1926,6 @@ printf("[network-manager comm debug] %s\n", (it).data()); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS -#ifndef USE_ASYNC_DBUS_CALLS - // Obtain connection settings from the path specified - DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (it)); - connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - TQT_DBusTQStringDataMap connectionSettingsMap; - ret = connectionSettings.GetSettings(connectionSettingsMap, error); - if (ret && error.isValid()) { - ret = 0; - PRINT_ERROR((error.name() + ": " + error.message())) - } - if (ret) { -#else // USE_ASYNC_DBUS_CALLS // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it)); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); @@ -1983,7 +1958,6 @@ if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) { d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID); } -#endif // USE_ASYNC_DBUS_CALLS #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout); @@ -3079,17 +3053,6 @@ TQT_DBusTQStringDataMap connectionSecretsMap(TQT_DBusData::String); ret = d->m_networkManagerSettings->GetConnectionByUuid(uuid, existingConnection, error); if (ret) { -#ifndef USE_ASYNC_DBUS_CALLS - // Obtain connection settings from the path specified - DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); - connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - ret = connectionSettings.GetSecrets(group, connectionSecretsMap, error); - if (ret && error.isValid()) { - ret = 0; - PRINT_ERROR((error.name() + ": " + error.message())) - } - if (ret) { -#else // USE_ASYNC_DBUS_CALLS // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); @@ -3121,7 +3084,6 @@ if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) { d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID); } -#endif // USE_ASYNC_DBUS_CALLS #ifdef DEBUG_NETWORK_MANAGER_COMMUNICATIONS printf("[network-manager comm debug] received DBUS object structure map follows:\n"); fflush(stdout); @@ -3296,17 +3258,6 @@ existing = false; ret = d->m_networkManagerSettings->GetConnectionByUuid(connection->UUID, existingConnection, error); if (ret) { -#ifndef USE_ASYNC_DBUS_CALLS - // Obtain connection settings from the path specified - DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); - connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - ret = connectionSettings.GetSettings(connectionSettingsMap, error); - if (ret && error.isValid()) { - ret = 0; - PRINT_ERROR((error.name() + ": " + error.message())) - } - if (ret) { -#else // USE_ASYNC_DBUS_CALLS // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); @@ -3339,7 +3290,6 @@ if (d->nmConnectionSettingsAsyncSettingsResponse.contains(asyncCallID)) { d->nmConnectionSettingsAsyncSettingsResponse.remove(asyncCallID); } -#endif // USE_ASYNC_DBUS_CALLS existing = true; } }
eeb8782f	2019-07-21 14:23:40	Anton Repko
Fix incorrect translations of language names. Signed-off-by: Anton Repko <anton@...>
M tdecore/all_languages.desktop
tdecore/all_languages.desktop diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop index 3c3483e..3c96471 100644 --- a/tdecore/all_languages.desktop +++ b/tdecore/all_languages.desktop @@ -3871,7 +3871,7 @@ Name[ru]=Верхнелужицкий Name[rw]=Ikinyasorubiya cyo hejuru Name[se]=Bajil Sorbiagiella -Name[sk]=dolnolužická srbčina +Name[sk]=hornolužická srbčina Name[sl]=zgornjesorbijsko Name[sr]=Горње лужичко српски Name[sr@Latn]=Gornje lužičko srpski @@ -6612,7 +6612,7 @@ Name[ru]=Малайский Name[rw]=Ikimalayi Name[se]=Malaigiella -Name[sk]=malajálamčina +Name[sk]=malajčina Name[sl]=malajsko Name[sq]=Malanisht Name[sr]=Малајски
0e071064	2019-07-21 17:13:47	Chris
Fix remaining brandings in tdelibs and adopt to modern age. Signed-off-by: Chris <xchrisx@...>
M tdeio/kssl/ksslcertdlg.cc M tdeio/tdeio/global.cpp M tdeprint/cups/kptextpage.cpp M tdeprint/kmspecialmanager.cpp M tdeprint/kpcopiespage.cpp
tdeio/kssl/ksslcertdlg.cc diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc index 53904f1..7431d4c 100644 --- a/tdeio/kssl/ksslcertdlg.cc +++ b/tdeio/kssl/ksslcertdlg.cc @@ -81,7 +81,7 @@ connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA - setCaption(i18n("KDE SSL Certificate Dialog")); + setCaption(i18n("TDE SSL Certificate Dialog")); #endif } tdeio/tdeio/global.cpp diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index 4a5819b..ff51ac1 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -688,11 +688,10 @@ causes << i18n( "The requested protocol may not be supported." ) << i18n( "The versions of the %1 protocol supported by this computer and " "the server may be incompatible." ).arg( protocol ); - solutions << i18n( "You may perform a search on the Internet for a TDE " - "program (called a tdeioslave or ioslave) which supports this protocol. " - "Places to search include <a href=\"http://kde-apps.org/\">" - "http://kde-apps.org/</a> and <a href=\"http://freshmeat.net/\">" - "http://freshmeat.net/</a>." ) + solutions << i18n( "You may perform a search on the Trinity website for a TDE " + "program (called a tdeioslave, ioslave or tdeio) which supports this protocol. " + "Places to search include <a href=\"https://mirror.git.trinitydesktop.org/cgit/\">" + "https://mirror.git.trinitydesktop.org/cgit/</a> or the repos for your distribution." ) << sUpdate << sSysadmin; break; tdeprint/cups/kptextpage.cpp diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 955434d..6fb0652 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -89,7 +89,7 @@ " <p>These settings control the appearance of text on printouts. They are only valid for " " printing text files or input directly through kprinter. </p> " " <p><b>Note:</b> These settings have no effect whatsoever for other input formats than " - " text, or for printing from applications such as the KDE Advanced Text Editor. (Applications " + " text, or for printing from applications such as the TDE Advanced Text Editor. (Applications " " in general send PostScript to the print system, and 'kate' in particular has its own " " knobs to control the print output. </p>." " <hr> " @@ -109,8 +109,8 @@ " <p><b>Margins</b></p> " " <p>These settings control the margins of printouts on the paper. They are not valid for " " jobs originating from applications which define their own page layout internally and " - " send PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p> " - " <p>When printing from KDE applications, such as KMail and Konqueror, or printing an ASCII text " + " send PostScript to TDEPrint (such as KOffice, OpenOffice or LibreOffice). </p> " + " <p>When printing from TDE applications, such as KMail and Konqueror, or printing an ASCII text " " file through kprinter, you can choose your preferred margin settings here. </p> " " <p>Margins may be set individually for each edge of the paper. The combo box at the bottom lets you change " " the units of measurement between Pixels, Millimeters, Centimeters, and Inches. </p> " tdeprint/kmspecialmanager.cpp diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index 910de49..16a0ab6 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -51,7 +51,7 @@ { // seems there's a problem here m_mgr->setErrorMsg(i18n("A file share/tdeprint/specials.desktop was found in your " - "local KDE directory. This file probably comes from a previous KDE " + "local TDE directory. This file probably comes from a previous TDE " "release and should be removed in order to manage global pseudo " "printers.")); return false; tdeprint/kpcopiespage.cpp diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 10eb6e2..27b6472 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -53,10 +53,11 @@ " </p>" " </qt>" ); TQString whatsThisCurrentPagesLabel = i18n( " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want " - " to print the page currently visible in your KDE application.</p>" + " to print the page currently visible in your TDE application.</p>" " <p><b>Note:</b> this field is disabled if you print from" - " non-TDE applications like Mozilla or OpenOffice.org, since here TDEPrint has no" - " means to determine which document page you are currently viewing.</p></qt>" ); + " non-TDE applications like Firefox, PaleMoon, SeaMonkey or OpenOffice and" + " LibreOffice, since here TDEPrint has no means to determine which document page" + " you are currently viewing.</p></qt>" ); TQString whatsThisPageRangeLabel = i18n( " <qt><b>Page Range:</b> Choose a \"Page Range\" to select a subset of the" " complete document pages" " to be printed. The format is <em>\"n,m,o-p,q,r,s-t, u\"</em>.</p>"
dd36ea0a	2019-07-21 17:40:08	Anton Repko
Fix incorrect translations of language names. Signed-off-by: Anton Repko <anton@...>
M tdecore/all_languages.desktop
tdecore/all_languages.desktop diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop index 3c96471..487b8da 100644 --- a/tdecore/all_languages.desktop +++ b/tdecore/all_languages.desktop @@ -1581,7 +1581,7 @@ Name[ru]=Чешский Name[rw]=Ikinyaceke Name[se]=Čehkagiella -Name[sk]=korzičtina +Name[sk]=čeština Name[sl]=češko Name[sq]=Çekisht Name[sr]=Чешки
90562f7b	2019-07-24 00:28:28	Chris
Replace Qt branding with TQt ones. Signed-off-by: Chris <xchrisx@...>
M tdecore/tde-config.cpp.cmake
tdecore/tde-config.cpp.cmake diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 36e752f..e200f80 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -179,7 +179,7 @@ "locale", I18N_NOOP("Translation files for TDELocale"), "mime", I18N_NOOP("Mime types"), "module", I18N_NOOP("Loadable modules"), - "qtplugins", I18N_NOOP("Qt plugins"), + "qtplugins", I18N_NOOP("TQt plugins"), "services", I18N_NOOP("Services"), "servicetypes", I18N_NOOP("Service types"), "sound", I18N_NOOP("Application sounds"),