Hi,
I prepared patch rebranding KDE to KDE Plasma and fixing "K Desktop Environment"
pre-historic relic. But I'm not sure how to deal with referencing KDE in spins
list - use KDE Plasma? And how to reference it from code + directory etc.,
hostname etc. See ticket #27.
I'm not familiar (yet) with websites infrastructure but I'd like to take
maintainership of KDE/Plasma related web pages (and not to break something :).
Thanks for help,
Jaroslav
--
Jaroslav ÅeznÃk <jreznik@xxxxxxxxxx>
Software Engineer - Base Operating Systems Brno
Office: +420 532 294 275
Mobile: +420 602 797 774
Red Hat, Inc. http://cz.redhat.com/
From 99b31d4679334cd7550d29c74a914ae102be7f2e Mon Sep 17 00:00:00 2001
From: Jaroslav Reznik <jreznik@xxxxxxxxxx>
Date: Tue, 9 Nov 2010 12:56:45 +0100
Subject: [PATCH] KDE Plasma Desktop rebranding
---
spins.fedoraproject.org/data/content/about.html | 2 +-
spins.fedoraproject.org/data/content/index.html | 2 +-
.../data/content/kde/index.html | 44 ++++++++++----------
spins.fedoraproject.org/data/templates/master.html | 2 +-
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/spins.fedoraproject.org/data/content/about.html b/spins.fedoraproject.org/data/content/about.html
index 872c009..21c3358 100644
--- a/spins.fedoraproject.org/data/content/about.html
+++ b/spins.fedoraproject.org/data/content/about.html
@@ -27,7 +27,7 @@
<li>${_('Use a pre-installed selection of software to aid in a particular task right away')}</li>
<p>${_('Some Fedora spins are customized to be used for a specialized task. The <a href="/games/">Fedora Games Spin</a> and the <a href="/fel/">Fedora Electronic Lab</a> are good examples of this kind of spin. There are a lot of packages in Fedora, and it can be time-consuming to look up and install all the software you might need for a particular task. The creators of these kind of spins have done all this legwork for you already, so if you run one of these spins, the software you need will already be installed.')}</p>
<li>${_('Use a pre-installed desktop environment')}</li>
- <p>${_('The default desktop environment of Fedora is GNOME, but if you prefer an alternative desktop environment such as <a href="/kde/">KDE</a> or <a href="/xfce/">XFCE</a>, you can download a spin for your preferred desktop environment and use that to install Fedora, pre-configured for the desktop environment of your choice.')}</p>
+ <p>${_('The default desktop environment of Fedora is GNOME, but if you prefer an alternative desktop environment such as <a href="/kde/">KDE Plasma Desktop</a> or <a href="/xfce/">XFCE</a>, you can download a spin for your preferred desktop environment and use that to install Fedora, pre-configured for the desktop environment of your choice.')}</p>
<li>${_('Repair & Recovery')}</li>
<p>${_('Because spins do not require hard drive access to run, you can use them if you experience hard drive failure or a operating system failure and want to try to try recover files off of your disk. You can also use the spin media to use your computer while you wait for your replacement hard drive to arrive in the mail!')}</p>
<li>${_('Try something new or demo something, no-risk')}</li>
diff --git a/spins.fedoraproject.org/data/content/index.html b/spins.fedoraproject.org/data/content/index.html
index 20c2780..c9a76b0 100644
--- a/spins.fedoraproject.org/data/content/index.html
+++ b/spins.fedoraproject.org/data/content/index.html
@@ -7,7 +7,7 @@
'edu': "A special selection of applications related to educational and scientific purposes.",
'math': "This is math",
'kiosk': "Secure kiosks: no longer an oxymoron.",
- 'kde': "A complete, modern desktop built using the K Desktop Environment (KDE).",
+ 'kde': "A complete, modern desktop built using the KDE Plasma Desktop.",
'xfce': "A complete, well-integrated Xfce desktop.",
'lxde': "A light, fast, less-resource hungry desktop environment.",
'aos': "A scaled-down version of Fedora with a small footprint for running an appliance.",
diff --git a/spins.fedoraproject.org/data/content/kde/index.html b/spins.fedoraproject.org/data/content/kde/index.html
index 72c5406..d955fe2 100644
--- a/spins.fedoraproject.org/data/content/kde/index.html
+++ b/spins.fedoraproject.org/data/content/kde/index.html
@@ -41,13 +41,13 @@ docs_url = [
xmlns:xi="http://www.w3.org/2001/XInclude";>
<xi:include href="../../templates/master.html" />
<head>
- <title>${_('About Spin: KDE')}</title>
+ <title>${_('About Spin: KDE Plasma Desktop')}</title>
</head>
<body>
<!-- the tabs -->
<ul class="tabs">
<li><a id="t1" href="#home">${_('Home')}</a></li>
- <li><a id="t2" href="#about">${_('About KDE')}</a></li>
+ <li><a id="t2" href="#about">${_('About KDE Plasma Desktop')}</a></li>
<li><a id="t3" href="#downloads">${_('Downloads')}</a></li>
<li><a id="t4" href="#support">${_('Support')}</a></li>
</ul>
@@ -57,17 +57,17 @@ docs_url = [
<div>
<h2>${_('It\'s your desktop. Be Free.')}</h2>
<img class="splash-right" src="/static/images/content/kde-screenshot_splashy.png" />
- <p>${_('The Fedora KDE Desktop Edition is a powerful Fedora-based operating system utilizing the K Desktop Environment as the main user interface. Fedora KDE comes with many pre-selected top quality applications that suit all modern desktop use cases - from online communication like web browsing, instant messaging and electronic mail correspondence, through multimedia and entertainment, to an advanced productivity suite, including office applications and enterprise grade personal information management. All KDE applications are well integrated, with a similar look and feel and an easy to use interface, accompanied by an outstanding graphical appearance.')}</p>
- <p>${_('The Fedora KDE Desktop Edition is based on the latest KDE 4 technology as provided by KDE open source community.')}</p>
+ <p>${_('The Fedora KDE Plasma Desktop Edition is a powerful Fedora-based operating system utilizing the KDE Plasma Desktop as the main user interface. Fedora KDE Plasma Desktop comes with many pre-selected top quality applications that suit all modern desktop use cases - from online communication like web browsing, instant messaging and electronic mail correspondence, through multimedia and entertainment, to an advanced productivity suite, including office applications and enterprise grade personal information management. All KDE applications are well integrated, with a similar look and feel and an easy to use interface, accompanied by an outstanding graphical appearance.')}</p>
+ <p>${_('The Fedora KDE Plasma Desktop Edition is based on the latest KDE Platform 4 technology as provided by KDE open source community.')}</p>
<p>${_('It\'s your desktop. <a href="#about">Learn More</a>. >')}</p>
</div>
<div>
- <h2>${_('About KDE')}</h2>
+ <h2>${_('About KDE Plasma Desktop')}</h2>
<h3>${_('Desktop')}</h3>
<h4>${_('Plasma')}</h4>
- <p>${_('Plasma provides the desktop interface for KDE 4, including the application launcher (start menu), the desktop and the desktop panel (often referred to simply as the task bar).')}</p>
+ <p>${_('Plasma Desktop provides the desktop interface, including the application launcher (start menu), the desktop and the desktop panel (often referred to simply as the task bar).')}</p>
<span class="blurb"><img src="/static/images/content/kde-screenshot-01-sm.png" rel="#plasma1" /><br />${_('Click image to enlarge')}</span>
- <p>${_('You can use Plasma as you would use the desktop of any other operating system, by accessing the application menu (K Menu), viewing the currently active programs on the taskbar, accessing icons on the system tray, and so on.')}</p>
+ <p>${_('You can use Plasma as you would use the desktop of any other operating system, by accessing the application menu, viewing the currently active programs on the taskbar, accessing icons on the system tray, and so on.')}</p>
<p>${_('An important part of Plasma are the so-called widgets, and the customization these widgets allow. Widgets are the individual units of the desktop and they include the application menu, icons, the system tray, the clock, along with countless other widgets. Widgets can exist on the desktop itself, or be inserted in the panel. Panels and desktops are actually special kinds of widgets, meant to contain other widgets (in Plasma terms, they are called "Containments").')}</p>
<p>${_('More info available at <a href="http://userbase.kde.org/Plasma">http://userbase.kde.org/Plasma</a>')}</p>
<h4>${_('Desktop Effects')}</h4>
@@ -78,16 +78,16 @@ docs_url = [
<h3>${_('Going online')}</h3>
<p>${_('With the latest technology spearheaded by Red Hat, the NetworkManager set of tools, and its system tray Applet, it\'s just a click and you\'re connected to your wireless LAN router, or online via many supported 3G mobile broadband cards. Explore the World Wide Web with Konqueror, the full featured KDE web browser.')}</p>
<p>${_('Stay connected with your friends and colleagues using <strong>Kopete</strong> Instant Messaging client. It supports all common IM protocols and has a really nice user interface with the ability to group more protocols under one contact. Your contact will be nearly always online!')}</p>
- <p>${_('Are you a downloader? Use <strong>KTorrent</strong> or <strong>KGet</strong> to get new versions of Fedora KDE Desktop Edition!')}</p>
+ <p>${_('Are you a downloader? Use <strong>KTorrent</strong> or <strong>KGet</strong> to get new versions of Fedora KDE Plasma Desktop Edition!')}</p>
<h3>${_('Utilities and configuration')}</h3>
- <p>${_('KDE ships a terminal, of course, the gateway to the real power of any Unix/Linux machine, called Konsole. <strong>Konsole</strong> is perfectly configurable by design, as is every part of KDE. Speaking of configurable, you\'re of course able to configure your KDE Desktop to fit your personal needs via the <strong>System Settings</strong> GUI (Graphical User Interface). No need to know cryptic commands and configuration files. Click the options you like to change and choose the settings that make you happy. This is your desktop and we will never make these decisions for you.')}</p>
+ <p>${_('Fedora KDE Plasma Desktop ships a terminal, of course, the gateway to the real power of any Unix/Linux machine, called Konsole. <strong>Konsole</strong> is perfectly configurable by design, as is every part of KDE Platform. Speaking of configurable, you\'re of course able to configure your KDE Plasma Desktop to fit your personal needs via the <strong>System Settings</strong> GUI (Graphical User Interface). No need to know cryptic commands and configuration files. Click the options you like to change and choose the settings that make you happy. This is your desktop and we will never make these decisions for you.')}</p>
<h3>${_('Office and Productivity Suite')}</h3>
<h4>${_('KOffice')}</h4>
- <p>${_('KOffice is an integrated office suite built on the KDE platform. It utilizes free and open standards like OpenDocument for its document formats, component communication and embedding. KOffice is free software and serves as a great and lightweight alternative to OpenOffice.org. Visit <a href="http://www.koffice.org"; title="http://www.koffice.org">http://www.koffice.org</a> to find out more.')}</p>
+ <p>${_('KOffice is an integrated office suite built on the KDE Platform. It utilizes free and open standards like OpenDocument for its document formats, component communication and embedding. KOffice is free software and serves as a great and lightweight alternative to OpenOffice.org. Visit <a href="http://www.koffice.org"; title="http://www.koffice.org">http://www.koffice.org</a> to find out more.')}</p>
<h4>${_('Kontact')}</h4>
- <p>${_('<strong>Kontact</strong> is the integrated personal information manager of KDE. The Kontact suite unites mature and proven KDE PIM applications under one easy to use application.')}</p>
+ <p>${_('<strong>Kontact</strong> is the integrated personal information manager of KDE Plasma Desktop. The Kontact suite unites mature and proven KDE PIM applications under one easy to use application.')}</p>
<span class="blurb"><img src="/static/images/content/kde-screenshot-02-sm.png" rel="#kontact1" /><br />${_('Click image to enlarge')}</span>
<p>${_('The components of KDE Kontact are tailored to work well with each other. This results in features like intuitive drag-and-drop between appointment handling, task lists and contacts. KDE Kontact also supports various groupware servers, allowing you to easily integrate your work life with your time outside of the daily grind. When using these servers your workgroup has access to features like shared email folders, group task lists, calendar sharing, central addressbooks and meeting scheduling, everything you would expect from full featured commercial applications, and much more.')}</p>
<p>${_('Kontact keeps you informed about all the things going on with a nice overview page. The main Applications used under the roof of Kontact are:')}</p>
@@ -95,13 +95,13 @@ docs_url = [
<li><a href="http://userbase.kde.org/Kmail"; title="http://userbase.kde.org/Kmail";><strong>${_('KMail')}</strong></a> ${_('- the KDE email component.')}</li>
<li><a href="http://userbase.kde.org/KAddressBook"; title="http://userbase.kde.org/KAddressBook";><strong>${_('KAddressBook')}</strong></a>${_(' - a comfortable frontend to organize the addresses of your friends, business partners, etc.')} </li>
<li><a href="http://userbase.kde.org/KOrganizer"; title="http://userbase.kde.org/KOrganizer";><strong>${_('Korganizer')}</strong></a>${_(' - Calendar, scheduling and journal')}</li>
- <li><a href="http://akregator.kde.org/"; title="http://akregator.kde.org/";><strong>${_('Akregator')}</strong></a> ${_('- a RSS/Atom news feed reader for the KDE Desktop.')} </li>
+ <li><a href="http://akregator.kde.org/"; title="http://akregator.kde.org/";><strong>${_('Akregator')}</strong></a> ${_('- a RSS/Atom news feed reader for the KDE Plasma Desktop.')} </li>
<li><a href="http://userbase.kde.org/KJots"; title="http://userbase.kde.org/KJots";><strong>${_('KJots')}</strong></a> ${_('- Organize your ideas in a Notebook.')} </li>
<li><a href="http://userbase.kde.org/Ktimetracker"; title="http://userbase.kde.org/Ktimetracker";><strong>${_('Ktimetracker')}</strong></a> ${_('- Track how much time you spend on various tasks.')}</li>
</ul>
<h3>${_('Multimedia')}</h3>
- <p>${_('Todays world is full of multimedia all around you (whether it\'s music as MP3s or CDs), or streamed online, all kinds of videos (from movies to TV broadcast) and more. Usually it\'s not easy to play it, not to mention organizing and backing up all of it. Fedora KDE Desktop Edition has a solution for you. No more multimedia mess, just enjoy your media!')}</p>
+ <p>${_('Todays world is full of multimedia all around you (whether it\'s music as MP3s or CDs), or streamed online, all kinds of videos (from movies to TV broadcast) and more. Usually it\'s not easy to play it, not to mention organizing and backing up all of it. Fedora KDE Plasma Desktop Edition has a solution for you. No more multimedia mess, just enjoy your media!')}</p>
<p>${_('It\'s just a fact that <strong>Amarok</strong> defines new standards in media players industry. You\'ve probably never had your music so organized as with Amarok. With high quality music collection features you never lose your music anymore! Amarok supports Advanced playlists, including dynamically generated ones, which would remind you of your oldest, almost forgotten songs, with cover art, lyrics and even information on the current track or band, pulled straight from Wikipedia. Amarok also brings great integration with Last.fm and other online music services, allowing you to listen to streaming radio, podcasts, and even purchase music from the Magnatune store, allowing you to support artists directly and enjoy DRM free music. Live your music!')}</p>
<p>${_('<strong>Kaffeine</strong> is a video player and digital TV in one easy to use interface. Watch and record your favorite digital TV stations and enjoy content stored on your machine with this intuitive media player.')}</p>
<p>${_('<strong>K3B</strong> allows you to easily back up your multimedia files as it\'s a full featured CD/DVD writing software. K3B supports writing data CDs/DVDs, audio CDs, video CDs, DVDs, copying, CD ripping and more. Take care, you can get burned ;-)')}</p>
@@ -122,9 +122,9 @@ docs_url = [
<div>
<h2>${_('Downloads')}</h2>
- <h3>Fedora 14 KDE Desktop Spin</h3>
+ <h3>Fedora 14 KDE Plasma Desktop Spin</h3>
<h4>Installable Live Media</h4>
- <p>This is the latest version of the Fedora Linux operating system's KDE Desktop Edition. It's everything you need to try out Fedora's KDE Desktopâyou don't have to erase anything on your current system to try it out, and it won't put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.</p>
+ <p>This is the latest version of the Fedora Linux operating system's KDE Plasma Desktop Edition. It's everything you need to try out Fedora's KDE Plasma Desktopâyou don't have to erase anything on your current system to try it out, and it won't put your files at risk. Take Fedora for a test drive, and if you like it, you can install Fedora directly to your hard drive straight from the Live Media desktop if you like.</p>
<h3>${_('Torrent Download')}</h3>
<span class="download-option" id="opt1">
@@ -156,8 +156,8 @@ docs_url = [
ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ <xi:include href="../../templates/download-tab.html" />
</div>
<div>
- <h2>${_('KDE Desktop Support')}</h2>
- <p>${_('Need help using Fedora KDE Desktop? We\'ve put together a list of resources you can use to get help below. For help downloading, running, and installing spins,')} <a href="/support">${_('please visit the main spins support page')}</a>.</p>
+ <h2>${_('KDE Plasma Desktop Support')}</h2>
+ <p>${_('Need help using Fedora KDE Plasma Desktop? We\'ve put together a list of resources you can use to get help below. For help downloading, running, and installing spins,')} <a href="/support">${_('please visit the main spins support page')}</a>.</p>
<xi:include href="../../templates/support-tab.html" />
</div>
</div>
@@ -169,9 +169,9 @@ docs_url = [
<img src="/static/images/content/kde-screenshot-01-lg.png" />
<!-- image details -->
<div class="details">
- <h3>${_('KDE Desktop')}</h3>
+ <h3>${_('KDE Plasma Desktop')}</h3>
<h4>${_('Plasma')}</h4>
- <p>${_('A screenshot of the KDE 4.0 destkop using Plasma')}</p>
+ <p>${_('A screenshot of the KDE Plasma Desktop 4')}</p>
</div>
</div>
<div class="simple_overlay" id="kontact1">
@@ -179,7 +179,7 @@ docs_url = [
<img src="/static/images/content/kde-screenshot-02-lg.png" />
<!-- image details -->
<div class="details">
- <h3>${_('KDE Desktop')}</h3>
+ <h3>${_('KDE Plasma Desktop')}</h3>
<h4>${_('Kontact')}</h4>
<p>${_('A screenshot of the Kontact with a few features.')}</p>
</div>
@@ -189,9 +189,9 @@ docs_url = [
<img src="/static/images/content/kde-screenshot-03-lg.png" />
<!-- image details -->
<div class="details">
- <h3>${_('KDE Desktop')}</h3>
+ <h3>${_('KDE Plasma Desktop')}</h3>
<h4>${_('Games')}</h4>
- <p>${_('A few of the games available on KDE')}</p>
+ <p>${_('A few of the games available on KDE Plasma Desktop')}</p>
</div>
</div>
diff --git a/spins.fedoraproject.org/data/templates/master.html b/spins.fedoraproject.org/data/templates/master.html
index fb2ee80..a527dd4 100644
--- a/spins.fedoraproject.org/data/templates/master.html
+++ b/spins.fedoraproject.org/data/templates/master.html
@@ -164,7 +164,7 @@ sdata_feature = {
'edu': "A special selection of applications related to educational and scientific purposes.",
'math': "This is math",
'kiosk': "Secure kiosks: no longer an oxymoron.",
- 'kde': "A complete, modern desktop built using the K Desktop Environment (KDE).",
+ 'kde': "A complete, modern desktop built using the KDE Plasma Desktop.",
'xfce': "A complete, well-integrated Xfce desktop.",
'lxde': "A light, fast, less-resource hungry desktop environment.",
'aos': "A scaled-down version of Fedora with a small footprint for running an appliance.",
--
1.7.3.2
--
websites mailing list
websites@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/websites
