Branch: master

894e9e5e 2019-07-11 20:04:37 Chris
Replace Qt branding with TQt ones.

Signed-off-by: Chris <xchrisx@...>
M tdewidgets/maketdewidgets.cpp

tdewidgets/maketdewidgets.cpp

diff --git a/tdewidgets/maketdewidgets.cpp b/tdewidgets/maketdewidgets.cpp
index 535ad05..d890433 100644
--- a/tdewidgets/maketdewidgets.cpp
+++ b/tdewidgets/maketdewidgets.cpp
@@ -12,7 +12,7 @@
 #include <tqbuffer.h>
 #include <tqimage.h>
 
-static const char description[] = I18N_NOOP( "Builds Qt widget plugins from an ini style description file." );
+static const char description[] = I18N_NOOP( "Builds TQt widget plugins from an ini style description file." );
 static const char version[] = "0.2";
 static const char classHeader[] = 	"/**\n"
 					"* This file was autogenerated by maketdewidgets. Any changes will be lost!\n"
e53c04d5 2019-07-13 05:38:33 Chris
Update and promote new TDE websites, replace branding and do slight refactoring.

Signed-off-by: Chris <xchrisx@...>
M interfaces/tdescript/scriptloader.cpp
M tdecore/tdeaboutdata.cpp
M tdestyles/klegacy/plugin.cpp
M tdeui/tdeabouttde.cpp

interfaces/tdescript/scriptloader.cpp

diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 803feb3..c21f1f7 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -37,7 +37,7 @@
 {
 	m_parent = parent;
 	m_scripts.clear();
-  	m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
+	m_theAction = new TDESelectAction ( i18n("TDE Scripts"),
 		0,
 		this,
 		TQT_SLOT(runAction()),

tdecore/tdeaboutdata.cpp

diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index d337db9..bf9a175 100644
--- a/tdecore/tdeaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -385,10 +385,12 @@
 TDEAboutData::aboutTranslationTeam()
 {
     return i18n("replace this with information about your translation team",
-            "<p>KDE is translated into many languages thanks to the work "
+            "<p>TDE is translated into many languages thanks to the work "
             "of the translation teams all over the world.</p>"
-            "<p>For more information on KDE internationalization "
-            "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+            "<p>For more information on TDE internationalization "
+            "visit the <a href=\"https://wiki.trinitydesktop.org/"
+            "TDE_Weblate_Translation_Workspace\">TDE Weblate"
+            "Translation Workspace (TWTW)</a></p>"
             );
 }
 

tdestyles/klegacy/plugin.cpp

diff --git a/tdestyles/klegacy/plugin.cpp b/tdestyles/klegacy/plugin.cpp
index 558b54e..918470d 100644
--- a/tdestyles/klegacy/plugin.cpp
+++ b/tdestyles/klegacy/plugin.cpp
@@ -25,5 +25,5 @@
 
 const char *description()
 {
-    return(i18n("KDE LegacyStyle plugin").utf8());
+    return(i18n("TDE LegacyStyle plugin").utf8());
 }

tdeui/tdeabouttde.cpp

diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp
index d52165f..64d9fa9 100644
--- a/tdeui/tdeabouttde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -32,55 +32,55 @@
 		 parent, name, modal )
 {
   const TQString text1 = i18n(""
-    "The <b>Trinity Desktop Environment</b> was born as a fork of the "
+    "<p>The <b>Trinity Desktop Environment</b> was born as a fork of the "
     "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
     "a world-wide network of software engineers committed to <a "
     "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
     "development. The name <i>Trinity</i> was chosen because the word means "
-    "<i>Three</i> as in <i>continuation of KDE 3</i>.<br><br>Since then, TDE has evolved to "
+    "<i>Three</i> as in <i>continuation of KDE 3</i>.</p><p>Since then, TDE has evolved to "
     "be an independent and standalone computer desktop environment project. The developers "
     "have molded the code to its own identity without giving up on the efficiency, "
     "productivity and traditional user interface experience characteristic of the "
-    "original KDE 3 series.<br><br>No single group, company or organization controls the "
-    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
-    "HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information "
-    "about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> "
-    "for more information on the KDE project. ");
+    "original KDE 3 series.</p><p>No single group, company or organization controls the "
+    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <a "
+    "href=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</a> for more information "
+    "about Trinity, and <a href=\"http://www.kde.org\">http://www.kde.org</a> "
+    "for more information on the KDE project.</p>");
 
   const TQString text2 = i18n(""
-    "Software can always be improved, and the Trinity Team is ready to "
+    "<p>Software can always be improved, and the Trinity Team is ready to "
     "do so. However, you - the user - must tell us when "
-    "something does not work as expected or could be done better.<br><br>"
+    "something does not work as expected or could be done better.</p><p>"
     "The Trinity Desktop Environment has a bug tracking system. Visit "
     "<a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a> or "
-    "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
+    "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.</p><p>"
     "If you have a suggestion for improvement then you are welcome to use "
     "the bug tracking system to register your wish. Make sure you use the "
-    "severity called \"Wishlist\"." );
+    "severity called \"Wishlist\".</p>" );
 
   const TQString text3 = i18n(""
-    "You do not have to be a software developer to be a member of the "
+    "<p>You do not have to be a software developer to be a member of the "
     "Trinity team. You can join the national teams that translate "
     "program interfaces. You can provide graphics, themes, sounds, and "
     "improved documentation. You decide!"
-    "<br><br>"
+    "</p><p>"
     "Visit the "
-    "<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
-    "webpage to find out how you can contribute or mail us using one of the "
-    "available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</A>."
-    "<br><br>"
+    "<a href=\"https://wiki.trinitydesktop.org/TDE_Gitea_Workspace\">TDE Gitea Workspace (TGW)</a> "
+    "to find out how you can contribute or mail us using one of the "
+    "available <a href=\"http://www.trinitydesktop.org/mailinglist.php\">mailing lists</a>."
+    "</p><p>"
     "If you need more information or documentation, then a visit to "
-    "<A HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</A> "
-    "will provide you with what you need.");
+    "<a href=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</a> "
+    "will provide you with what you need.</p>");
 
   const TQString text4 = i18n(""
-    "TDE is available free of charge, but making it is not free.<br><br>"
+    "<p>TDE is available free of charge, but making it is not free.</p><p>"
     "The Trinity team <i>does need</i> financial support. The money is used to "
     "support the expenses incurred to keep the TDE servers running, so that you - "
     "the user - can access them at any time. You are encouraged to support Trinity "
     "through a financial or hardware donation, using one of the ways described at "
     "<a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
-    "<br><br>Thank you very much in advance for your support!");
+    "</p><p>Thank you very much in advance for your support!</p>");
 
   setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null );
   setTitle(i18n("Trinity Desktop Environment. Release %1").

Branch: r14.0.x

e0acaa29 2019-07-13 05:39:15 Chris
Update and promote new TDE websites, replace branding and do slight refactoring.

Signed-off-by: Chris <xchrisx@...>
(cherry picked from commit e53c04d5d3f91cc4857d647d0a39c350a1c9eed7)
M interfaces/tdescript/scriptloader.cpp
M tdecore/tdeaboutdata.cpp
M tdestyles/klegacy/plugin.cpp
M tdeui/tdeabouttde.cpp

interfaces/tdescript/scriptloader.cpp

diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index 803feb3..c21f1f7 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -37,7 +37,7 @@
 {
 	m_parent = parent;
 	m_scripts.clear();
-  	m_theAction = new TDESelectAction ( i18n("KDE Scripts"),
+	m_theAction = new TDESelectAction ( i18n("TDE Scripts"),
 		0,
 		this,
 		TQT_SLOT(runAction()),

tdecore/tdeaboutdata.cpp

diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index d337db9..bf9a175 100644
--- a/tdecore/tdeaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -385,10 +385,12 @@
 TDEAboutData::aboutTranslationTeam()
 {
     return i18n("replace this with information about your translation team",
-            "<p>KDE is translated into many languages thanks to the work "
+            "<p>TDE is translated into many languages thanks to the work "
             "of the translation teams all over the world.</p>"
-            "<p>For more information on KDE internationalization "
-            "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+            "<p>For more information on TDE internationalization "
+            "visit the <a href=\"https://wiki.trinitydesktop.org/"
+            "TDE_Weblate_Translation_Workspace\">TDE Weblate"
+            "Translation Workspace (TWTW)</a></p>"
             );
 }
 

tdestyles/klegacy/plugin.cpp

diff --git a/tdestyles/klegacy/plugin.cpp b/tdestyles/klegacy/plugin.cpp
index 558b54e..918470d 100644
--- a/tdestyles/klegacy/plugin.cpp
+++ b/tdestyles/klegacy/plugin.cpp
@@ -25,5 +25,5 @@
 
 const char *description()
 {
-    return(i18n("KDE LegacyStyle plugin").utf8());
+    return(i18n("TDE LegacyStyle plugin").utf8());
 }

tdeui/tdeabouttde.cpp

diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp
index d52165f..64d9fa9 100644
--- a/tdeui/tdeabouttde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -32,55 +32,55 @@
 		 parent, name, modal )
 {
   const TQString text1 = i18n(""
-    "The <b>Trinity Desktop Environment</b> was born as a fork of the "
+    "<p>The <b>Trinity Desktop Environment</b> was born as a fork of the "
     "K Desktop Environment version 3.5, which was originally written by the KDE Team, "
     "a world-wide network of software engineers committed to <a "
     "href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
     "development. The name <i>Trinity</i> was chosen because the word means "
-    "<i>Three</i> as in <i>continuation of KDE 3</i>.<br><br>Since then, TDE has evolved to "
+    "<i>Three</i> as in <i>continuation of KDE 3</i>.</p><p>Since then, TDE has evolved to "
     "be an independent and standalone computer desktop environment project. The developers "
     "have molded the code to its own identity without giving up on the efficiency, "
     "productivity and traditional user interface experience characteristic of the "
-    "original KDE 3 series.<br><br>No single group, company or organization controls the "
-    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <A "
-    "HREF=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A> for more information "
-    "about Trinity, and <A HREF=\"http://www.kde.org\">http://www.kde.org</A> "
-    "for more information on the KDE project. ");
+    "original KDE 3 series.</p><p>No single group, company or organization controls the "
+    "Trinity source code. Everyone is welcome to contribute to Trinity.<br><br>Visit <a "
+    "href=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</a> for more information "
+    "about Trinity, and <a href=\"http://www.kde.org\">http://www.kde.org</a> "
+    "for more information on the KDE project.</p>");
 
   const TQString text2 = i18n(""
-    "Software can always be improved, and the Trinity Team is ready to "
+    "<p>Software can always be improved, and the Trinity Team is ready to "
     "do so. However, you - the user - must tell us when "
-    "something does not work as expected or could be done better.<br><br>"
+    "something does not work as expected or could be done better.</p><p>"
     "The Trinity Desktop Environment has a bug tracking system. Visit "
     "<a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a> or "
-    "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
+    "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.</p><p>"
     "If you have a suggestion for improvement then you are welcome to use "
     "the bug tracking system to register your wish. Make sure you use the "
-    "severity called \"Wishlist\"." );
+    "severity called \"Wishlist\".</p>" );
 
   const TQString text3 = i18n(""
-    "You do not have to be a software developer to be a member of the "
+    "<p>You do not have to be a software developer to be a member of the "
     "Trinity team. You can join the national teams that translate "
     "program interfaces. You can provide graphics, themes, sounds, and "
     "improved documentation. You decide!"
-    "<br><br>"
+    "</p><p>"
     "Visit the "
-    "<A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
** Diff limit reached (max: 250 lines) **