[Xfce4-commits] <www:master> Fix typos and validation errors and stuff.

Nick Schermer noreply at xfce.org
Tue Apr 17 20:22:28 CEST 2012


Updating branch refs/heads/master
         to c9a1470fa64e5788ca82810deecc723e15352d5b (commit)
       from aacebf674ad1394022de6e7c62a80e855992c785 (commit)

commit c9a1470fa64e5788ca82810deecc723e15352d5b
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Apr 17 20:19:35 2012 +0200

    Fix typos and validation errors and stuff.

 index.php                              |    2 +-
 lib/core.php                           |   11 ++----
 pages/about/index.php                  |    2 +-
 pages/about/nav.php                    |    6 ++--
 pages/about/releasemodel.php           |    7 ++--
 pages/about/screenshots.php            |   10 +++---
 pages/about/tour44.php                 |    6 ++--
 pages/about/tour46.php                 |    2 +-
 pages/about/tour48.php                 |    2 +-
 pages/download/changelogs/4.3.99.1.php |    8 ++--
 pages/download/changelogs/4.4.2.php    |    5 +--
 pages/download/changelogs/4.5.90.php   |    4 +-
 pages/download/changelogs/4.5.91.php   |   49 ++++----------------------------
 pages/download/changelogs/4.5.93.php   |    4 +-
 pages/download/changelogs/4.6.1.php    |    5 +--
 pages/download/changelogs/4.6.2.php    |   12 ++++----
 pages/download/changelogs/4.8pre1.php  |   20 ++++++-------
 pages/download/changelogs/4.8pre3.php  |    2 +-
 pages/download/changelogs/index.php    |   19 ++++++------
 pages/frontpage.php                    |    2 +-
 pages/getinvolved/index.php            |    4 +-
 pages/header.php                       |    1 +
 22 files changed, 70 insertions(+), 113 deletions(-)

diff --git a/index.php b/index.php
index 1ca962a..a49a752 100644
--- a/index.php
+++ b/index.php
@@ -55,7 +55,7 @@ $page_class = str_replace (array ('pages/', '/'), array ('', '_'),
 include ('pages/header.php');
 
 /* maybe we need to do something with the content first */
-if (str_has_prefix ($uri, 'download/changelogs/'))
+if (strpos ($uri, 'download/changelogs/') == 0)
 {
         /* replace #???? with bug tracker links */
         $bugurl = '<a href="https://bugzilla.xfce.org/show_bug.cgi?id=$1">#$1</a>';
diff --git a/lib/core.php b/lib/core.php
index 4fbaae6..95e74c0 100644
--- a/lib/core.php
+++ b/lib/core.php
@@ -15,6 +15,10 @@ $lang = null;
 function R_($text)
 {
 	global $gettext_reader, $lang;
+
+	if (isset ($_GET['testpo']))
+		return str_repeat ("x ", strlen ($text) / 2);
+
 	if ($gettext_reader)
 		return $gettext_reader->translate($text);
 	else
@@ -126,13 +130,6 @@ function mungify_mail ($email)
 	return '<span class="mungify">'. strrev ($email) .'</span>';
 }
 
-function str_has_prefix ($str, $prefix)
-{
-        if (($result = strpos ($str, $prefix)) === false)
-                return false;
-        return ($result == 0 ? true : false);
-}
-
 /* if no language if found, lookup the accepted browser languages */
 $lang = lookup_key ('lang', $language_codes);
 if (empty ($lang))
diff --git a/pages/about/index.php b/pages/about/index.php
index 9950a9c..0d7b18e 100644
--- a/pages/about/index.php
+++ b/pages/about/index.php
@@ -22,7 +22,7 @@
 <h2><?php E_('Features') ?></h2>
 
 <p>
-  <?php E_('Xfce contains a number of core components for the minimum tasks you\'d expect from a desktop environement:') ?>
+  <?php E_('Xfce contains a number of core components for the minimum tasks you\'d expect from a desktop environment:') ?>
 </p>
 
 <dl>
diff --git a/pages/about/nav.php b/pages/about/nav.php
index 0f2a685..7192f6c 100644
--- a/pages/about/nav.php
+++ b/pages/about/nav.php
@@ -11,9 +11,9 @@
 		</a>
 		
 		<ul>
-			<li><a href="/about/tour48">4.8 Tour</a></li>
-			<li><a href="/about/tour46">4.6 Tour</a></li>
-			<li><a href="/about/tour44">4.4 Tour</a></li>
+			<li><a href="/about/tour48"><?php E_('4.8 Tour') ?></a></li>
+			<li><a href="/about/tour46"><?php E_('4.6 Tour') ?></a></li>
+			<li><a href="/about/tour44"><?php E_('4.4 Tour') ?></a></li>
 		</ul>
 	</li>
 	<li>
diff --git a/pages/about/releasemodel.php b/pages/about/releasemodel.php
index 864c25d..e41f919 100644
--- a/pages/about/releasemodel.php
+++ b/pages/about/releasemodel.php
@@ -33,9 +33,8 @@ $head['title'] = R_('Release Model');
   <li>gtk-xfce-engine</li>
   <li>libxfce4ui</li>
   <li>libxfce4util</li>
-  <li>thunar-vfs</li>
   <li>thunar</li>
-  <li>xfce-utils</li>
+  <li>thunar-volman</li>
   <li>xfce4-appfinder</li>
   <li>xfce4-panel</li>
   <li>xfce4-session</li>
@@ -43,6 +42,9 @@ $head['title'] = R_('Release Model');
   <li>xfconf</li>
   <li>xfdesktop</li>
   <li>xfwm4</li>
+  <li>garcon</li>
+  <li>tumbler</li>
+  <li>xfce4-power-manager</li>
 </ul>
 
 <p>
@@ -54,7 +56,6 @@ $head['title'] = R_('Release Model');
 <ul>
   <li>GTK+</li>
   <li>GLib</li>
-  <li>garcon</li>
 </ul>
 
 <h1 id="cycle"><?php E_('The Release Cycle') ?></h1>
diff --git a/pages/about/screenshots.php b/pages/about/screenshots.php
index 05525ea..6dcd7a6 100644
--- a/pages/about/screenshots.php
+++ b/pages/about/screenshots.php
@@ -20,27 +20,27 @@ function print_shots ($group, $count, $format = 'png')
   <?php E_('Some screenshots of Xfce, ordered by version.') ?>
 </p>
 
-<h2>Xfce 4.8</h2>
+<h2><?php E_('Xfce 4.8') ?></h2>
 <p>
   <?php print_shots ('4.8', 4); ?>
 </p>
 
-<h2>Xfce 4.6</h2>
+<h2><?php E_('Xfce 4.6') ?></h2>
 <p>
   <?php print_shots ('4.6', 7); ?>
 </p>
 
-<h2>Xfce 4.4</h2>
+<h2><?php E_('Xfce 4.4') ?></h2>
 <p>
   <?php print_shots ('4.4', 6); ?>
 </p>
 
-<h2>Xfce 4.2</h2>
+<h2><?php E_('Xfce 4.2') ?></h2>
 <p>
   <?php print_shots ('4.2', 5, 'jpg'); ?>
 </p>
 
-<h2>Xfce 4.0</h2>
+<h2><?php E_('Xfce 4.0') ?></h2>
 <p>
   <?php print_shots ('4.0', 2); ?>
 </p>
diff --git a/pages/about/tour44.php b/pages/about/tour44.php
index 7f38991..9dc3cab 100644
--- a/pages/about/tour44.php
+++ b/pages/about/tour44.php
@@ -215,10 +215,10 @@
 <h2><?php E_('Links') ?></h2>
 
 <ul>
-  <li><a href="http://www.xfce.org/">Xfce website</a></li>
-  <li><a href="http://thunar.xfce.org/">Thunar website</a></li>
+  <li><a href="http://www.xfce.org/"><?php E_('Xfce website') ?></a></li>
+  <li><a href="http://thunar.xfce.org/"><?php E_('Thunar website') ?></a></li>
 </ul>
 
 <h2><?php E_('Credits') ?></h2>
 
-<p>Written by Benedikt Meurer, 21 Jan 2007</p>
+<p><?php E_('Written by Benedikt Meurer, 21 Jan 2007') ?></p>
diff --git a/pages/about/tour46.php b/pages/about/tour46.php
index a24a563..e7e3453 100644
--- a/pages/about/tour46.php
+++ b/pages/about/tour46.php
@@ -116,7 +116,7 @@
 </p>
 
 <p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-wallpaper-plugin.png" title="Set an image in a Thunar folder as wallpaper" alt="" />
+  <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-wallpaper-plugin.png" title="<?php E_('Set an image in a Thunar folder as wallpaper') ?>" alt="" />
 </p>
 
 <p>
diff --git a/pages/about/tour48.php b/pages/about/tour48.php
index e4e38c2..f078c7e 100644
--- a/pages/about/tour48.php
+++ b/pages/about/tour48.php
@@ -2,7 +2,7 @@
 
 <h1><?php echo $head['title'] ?></h1>
 
-<p><?php E_("This tour will introduce you to all the new major visual features in Xfce 4.8. This is only the visual part of what has been done; for a full list of changes, see the <a href=\"/download/changelogs/\">changelogs</a>. The tours of <a href=\"/about/tour46\">Xfce 4.6</a> and <a href=\"/about/tour44\">Xfce 4.4</a> are also still available.") ?></p>
+<p><?php E_("This tour will introduce you to all the new major visual features in Xfce 4.8. This is only the visual part of what has been done; for a full list of changes, see the <a href=\"/download/changelogs/\">changelogs</a>.") ?></p>
 
 <h2><?php E_("Thunar file browser") ?></h2>
 
diff --git a/pages/download/changelogs/4.3.99.1.php b/pages/download/changelogs/4.3.99.1.php
index 5528ae0..dc98476 100644
--- a/pages/download/changelogs/4.3.99.1.php
+++ b/pages/download/changelogs/4.3.99.1.php
@@ -20,7 +20,7 @@
 
 <h2>Extension Library <em>(exo)</em>:</h2>
 <ul>
-  <li>See the release notes at <a href="http://thunar.xfce.org/news.html#2006-09-03">http://thunar.xfce.org/news.html</a>.</li>
+  <li>See the release notes at <a href="http://thunar.xfce.org/news.html">http://thunar.xfce.org/news.html</a>.</li>
 </ul>
 
 
@@ -65,7 +65,7 @@
   <li>Allow panel plugin's menu to be opened at the pointer position (bug #2103).</li>
   <li>Don't allow cut or delete if the file/dir isn't writeable (bug #2081).</li>
   <li>Memory leak fixes (bug #1910).</li>
-  <li>Put the icon context menu on the proper screen (bug #2351).</li></li>
+  <li>Put the icon context menu on the proper screen (bug #2351).</li>
 </ul>
 
 
@@ -105,7 +105,7 @@
 
 <h2>Terminal Emulator <em>(Terminal)</em>:</h2>
 <ul>
-  <li>Parse <tt>file:</tt>-URIs dropped to a Terminal window properly and format them so they can be used in shell commands directly (bug #2076<).</li>
+  <li>Parse <tt>file:</tt>-URIs dropped to a Terminal window properly and format them so they can be used in shell commands directly (bug #2076).</li>
   <li>Use the thumbnail preview support for the background image selection
 that was added with exo 0.3.1.10rc1 (bug #2069).</li>
   <li>Add <tt>'~'</tt> to the default word chars.</li>
@@ -114,7 +114,7 @@ that was added with exo 0.3.1.10rc1 (bug #2069).</li>
 
 <h2>File Manager <em>(Thunar)</em>:</h2>
 <ul>
-  <li>See the release notes at <a href="http://thunar.xfce.org/news.html#2006-09-03">http://thunar.xfce.org/news.html</a>.</li>
+  <li>See the release notes at <a href="http://thunar.xfce.org/news.html">http://thunar.xfce.org/news.html</a>.</li>
 </ul>
 
 
diff --git a/pages/download/changelogs/4.4.2.php b/pages/download/changelogs/4.4.2.php
index 4ac9ad3..ddd954e 100644
--- a/pages/download/changelogs/4.4.2.php
+++ b/pages/download/changelogs/4.4.2.php
@@ -32,7 +32,7 @@
 
 <blockquote><p>
 Please see
-<a href="http://thunar.xfce.org/news.html#2007-12-02">the Thunar website</a>
+<a href="http://thunar.xfce.org/news.html">the Thunar website</a>
 for a list of changes.
 </p></blockquote>
 
@@ -200,14 +200,13 @@ for a list of changes.
         Tegegne Tefera (am), Dimitri Gogelia (ka), Vincent Tunru (nl),
         Pablo Vieira (pt_PT), Fábio Nogueira (pt_PT).</li>
   <li>New translations: RPrieditis (lv).</li>
-</li>
 </ul>
 
 <h2>File manager (Thunar):</h2>
 
 <blockquote><p>
 Please see
-<a href="http://thunar.xfce.org/news.html#2007-12-02">the Thunar website</a>
+<a href="http://thunar.xfce.org/news.html">the Thunar website</a>
 for a list of changes.
 </p></blockquote>
 
diff --git a/pages/download/changelogs/4.5.90.php b/pages/download/changelogs/4.5.90.php
index 1cf2e35..bd0a040 100644
--- a/pages/download/changelogs/4.5.90.php
+++ b/pages/download/changelogs/4.5.90.php
@@ -81,7 +81,7 @@
   <li>Add support for 'zoomed' backdrop mode: fill the screen with the
         backdrop edge-to-edge by scaling and/or cropping as necessary.
         This doesn't mess with the aspect ratio and is pretty nifty.  Patch
-        is from <trondsg at gmail.com> (bug #3138).</li>
+        is from (bug #3138).</li>
   <li>Stop using our forked libnetk from libxfcegui4, and use the much
         better supported original libwnck.  Patch is from Nick Schermer
         (bug #3487).</li>
@@ -184,7 +184,7 @@
   <li>Put /usr/local/share first (bug #2967).</li>
   <li>Fix an issue with the syntax in startxfce4 script (bug #2967).</li>
   <li>Use real GtkComboBoxEntry instead of separate GtkEntry/Button for
-        xfrun4 dialog (bug #3820).<li>
+        xfrun4 dialog (bug #3820).</li>
   <li>Remove Xft.dpi fallback setting since xfsettingsd handles this now.</li>
   <li>Update xinitrc to run xfsettingsd instead of xfce-mcs-manager (only
         used when the user has disabled the session manager).</li>
diff --git a/pages/download/changelogs/4.5.91.php b/pages/download/changelogs/4.5.91.php
index bfbd642..45ff008 100644
--- a/pages/download/changelogs/4.5.91.php
+++ b/pages/download/changelogs/4.5.91.php
@@ -64,7 +64,7 @@
   <li>Bring back the "show icons in menu" preferences for the desktop
     menu and window list menu.</li>
   <li>Add support for XDG user dirs for the Desktop and Templates
-    directories.  Patch from Andrea Santilli <yawara at quipo.it> (bug #4365) ?>).</li>
+    directories.  Patch from Andrea Santilli (bug #4365) ?>).</li>
   <li>Fix xfdesktop/xfce menu crashing when installing new applications that
     install .desktop files and icons (bug #3615) ?>).</li>
   <li>Fix occasional "double menu" after menu/icon files change on disk
@@ -211,64 +211,27 @@
 <ul>
   <li>Man page created for orage and globaltime</li>
   <li>Globaltime added.</li>
-    <ul>
-      <li>shows several clocks from different timezones</li>
-      <li>can be raised and hidden by clicking middle mouse
-            button on orage clock panel plugin</li>
-      <li>has timetune feature, which makes it easy to see what
-            the time is in other clocks on certain time</li>
-    </ul>
   <li>All visible dates are now in country native format (strftime (%x))</li>
   <li>All parameters now visible in preferences</li>
-    <ul>
-      <li>restructured parameter screens</li>
-    </ul>
   <li>New appointment types: TODO and JOURNAL</li>
-    <ul>
-      <li>TODO can be used to remember things that needs to done</li>
-      <li>JOURNALs are for notes and things to remember</li>
-    </ul>
   <li>Possible to rename Orage calendar files</li>
-  <li>External files can be used</li>
-    <ul>
-      <li>it is possible to add files from other sources
-            and Orage keeps track on those.</li>
-    </ul>
+  <li>External files can be used it is possible to add files from other sources
+      and Orage keeps track on those.</li>
   <li>Export and import appointments.</li>
   <li>Text search in event list</li>
   <li>Orage is now dependent on local libical.</li>
-    <ul>
-      <li>standard libical cannot be used due to several fixes
-            done to Orage's private copy</li>
-    </ul>
   <li>Daylist view</li>
-    <ul>
-      <li>possible to see calendar in day view format in addition 
-            to the old list view.</li>
-    </ul>
-  <li>New alarms.</li>
+  <li>New alarms.
     <ul>
       <li>libnotify alarms</li>
       <li>script type alarms</li>
-    </ul>
+    </ul></li>
   <li>Possibility to set alarm based on end time also</li>
   <li>Possible to define default alarm</li>
   <li>Persistent alarms</li>
-    <ul>
-      <li>persistent alarms are raised after Orage is started
-            even if your computer or Orage has been turned off when the 
-            alarm happened.</li>
-    </ul>
   <li>Orage and orageclock now only wake up when needed.</li>
-    <ul>
-      <li>saves battery in laptops when timer wakes up only when
-            needed instead of regularly every second.</li>
-    </ul>
   <li>Main calendar now has list of events and todos.</li>
   <li>Better compatibility with evolution ical files</li>
-  <li>Categories added</li>
-    <ul>
-      <li>also possible to give colour to certain category
+  <li>Categories added also possible to give colour to certain category
             and then colour is shown in even list view</li>
-    </ul>
 </ul>
diff --git a/pages/download/changelogs/4.5.93.php b/pages/download/changelogs/4.5.93.php
index 8cffc74..c7f6961 100644
--- a/pages/download/changelogs/4.5.93.php
+++ b/pages/download/changelogs/4.5.93.php
@@ -24,7 +24,7 @@
 
 <h2>Extension Library <em>(exo)</em>:</h2>
 <ul>
-  <li>Don't setup bindings for <Shift>n and <Shift>p in ExoIconView so that
+  <li>Don't setup bindings for <Shift>n and <Shift>p in ExoIconView so that
   type-ahead search works as expected (bug #4633).</li>
   <li>Remove GenericName and "Xfce 4" prefix from
   exo-preferred-applications.desktop.</li>
@@ -57,7 +57,7 @@
   <li>Fix smart placement not working for windows with height or width larger than
   actual screen size (Bug# 3126).</li>
   <li>Remove maximization if a client updates its size max size hint (bug #4706).</li>
-  <li>String review by Josh Saddler <nightmorph at gentoo.org> (bug #4703).</li>
+  <li>String review by Josh Saddler (bug #4703).</li>
   <li>Fix fill horizontally and vertically not working as expected (bug #4712).</li>
   <li>Prevent "fill" from expanding beyond physical monitor.</li>
   <li>Do not mark gtk+ stock labels as translatable (bug #4722).</li>
diff --git a/pages/download/changelogs/4.6.1.php b/pages/download/changelogs/4.6.1.php
index 89f7941..298916f 100644
--- a/pages/download/changelogs/4.6.1.php
+++ b/pages/download/changelogs/4.6.1.php
@@ -32,7 +32,7 @@
 <h2>Window Manager <em>(xfwm4)</em>:</h2>
 <ul>
   <li>Reduce repaint timeout in the compositor (bug #5080)</li>
-  <li>Fix applications getting focused when focus on map is unset even without focus stealing prevention enabled (bug #5044)
+  <li>Fix applications getting focused when focus on map is unset even without focus stealing prevention enabled (bug #5044)</li>
   <li>Reduce minimum timeout for focus delay in focus follow mouse (100ms was way too much)</li>
   <li>Fix raise delay settings in xfwm4 dialog being totally ignored</li>
   <li>Avoid unecessary warnings about timestamps at startup</li>
@@ -90,7 +90,6 @@
   <li>Updated translations: pl, es, it, gl, pl, pt, uk</li>
 </ul>
 
-<!------------------------------------>
 <h2>File Manager <em>(thunar)</em>:</h2>
 <ul>
   <li>Put quotes around filenames in thunar-wallpaper-plugin (bug #5056)</li>
@@ -99,7 +98,7 @@
 
 <h2>Mixer <em>(xfce4-mixer)</em>:</h2>
 <ul>
-  <li>Make <Control>q and <Control>s trigger the corresponding actions.</li>
+  <li>Make <Control>q and <Control>s trigger the corresponding actions.</li>
   <li>Minor cosmetic fixes (row spacing of 6px in tables).</li>
   <li>Add missing AudioVideo category which is obligatory if you use the Audio category (bug #4933).</li>
   <li>Display mute/record state properly on startup (bug #5002). </li>
diff --git a/pages/download/changelogs/4.6.2.php b/pages/download/changelogs/4.6.2.php
index d88fa96..1251edd 100644
--- a/pages/download/changelogs/4.6.2.php
+++ b/pages/download/changelogs/4.6.2.php
@@ -12,7 +12,7 @@
 
 <h2>Widget Library <em>(libxfcegui4)</em>:</h2>
 <p>Note that there have been <a href="http://git.xfce.org/xfce/libxfcegui4/plain/NEWS?h=xfce-4.6">standalone releases</a>
-   of this packages after 4.6.1, hence the version number 4.6.4 in Xfce 4.6.2.<p>
+   of this packages after 4.6.1, hence the version number 4.6.4 in Xfce 4.6.2.</p>
 <ul>
   <li>Build fixes for GIT.</li>
   <li>Fix make distcheck.</li>
@@ -21,7 +21,7 @@
 
 <h2>Extension Library <em>(exo)</em>:</h2>
 <p>Note that there have been <a href="http://git.xfce.org/xfce/exo/plain/NEWS?h=xfce-4.6">standalone releases</a>
-   for this packages after 4.6.1, hence the version number 0.3.107 in Xfce 4.6.2.<p>
+   for this packages after 4.6.1, hence the version number 0.3.107 in Xfce 4.6.2.</p>
 <ul>
   <li>Make the treeview work again with gtk 2.20 (bug #6230).</li>
   <li>Fix compilation error (bug #6421).</li>
@@ -38,7 +38,7 @@
 
 <h2>Window Manager <em>(xfwm4)</em>:</h2>
 <ul>
-  <li>Build fixes for GIT.
+  <li>Build fixes for GIT.</li>
   <li>Fix mixed RTL/LTR text not rendering properly in title and tabwin.</li>
   <li>Place windows on top of stack even when not focused in focus follow mouse (bug #5479).</li>
   <li>Increase menu button height and redice width bug #5567).</li>
@@ -73,7 +73,7 @@
 
 <h2>Panel <em>(xfce4-panel)</em>:</h2>
 <p>Note that there have been <a href="http://git.xfce.org/xfce/xfce4-panel/plain/NEWS?h=xfce-4.6">standalone releases</a>
-   for this packages after 4.6.1, hence the version number 4.6.4 in Xfce 4.6.2.<p>
+   for this packages after 4.6.1, hence the version number 4.6.4 in Xfce 4.6.2.</p>
 <ul>
   <li>Destroy windowlist menu in an idle (bug #3853).</li>
   <li>Link directly to libm (bug #6233).</li>
@@ -91,7 +91,7 @@
 
 <h2>Settings Manager <em>(xfce4-settings)</em>:</h2>
 <p>Note that there have been <a href="http://git.xfce.org/xfce/xfce4-settings/plain/NEWS?h=xfce-4.6">standalone releases</a>
-   for this packages after 4.6.1, hence the version number 4.6.5 in Xfce 4.6.2.<p>
+   for this packages after 4.6.1, hence the version number 4.6.5 in Xfce 4.6.2.</p>
 <ul>
   <li>Port to libxklavier 5.0 API.</li>
   <li>Fix linking issues (bug #6236).</li>
@@ -110,7 +110,7 @@
 
 <h2>File Manager <em>(thunar)</em>:</h2>
 <p>Note that there has been an <a href="http://git.xfce.org/xfce/thunar/plain/NEWS?h=xfce-4.6">individual release</a>
-   for this packages after 4.6.1, hence the version number 1.0.2 in Xfce 4.6.2.<p>
+   for this packages after 4.6.1, hence the version number 1.0.2 in Xfce 4.6.2.</p>
 <ul>
   <li>Build fixes for GIT and some cleanups.</li>
   <li>Fix make distcheck.</li>
diff --git a/pages/download/changelogs/4.8pre1.php b/pages/download/changelogs/4.8pre1.php
index 6dd3bed..ef0b9af 100644
--- a/pages/download/changelogs/4.8pre1.php
+++ b/pages/download/changelogs/4.8pre1.php
@@ -60,7 +60,7 @@
   <li>Fix broken translations in applications using libxfce4util (bug #5842).</li>
   <li>Performance optimizations.</li>
   <li>Improve xfce_expand_variables to expand ~ in more cases (bug #6742).</li>
-  <li>Deprecate XfceDesktopEntry.</lI>
+  <li>Deprecate XfceDesktopEntry.</li>
   <li>Updated translations.</li>
 </ul>
 
@@ -152,7 +152,7 @@
   <li>Port to libxfce4ui and GIO.</li>
   <li>Rework the tooltip string code a little.</li>
   <li>Don't watch category changes in xfconf (bug #6043).</li>
-  <li>Launch items with startup notification.<li>
+  <li>Launch items with startup notification.</li>
   <li>Implement monitoring by reloading all contents on menu change events.</li>
   <li>Updated translations.</li>
 </ul>
@@ -169,23 +169,21 @@
   <li>Item (plugin) editor in the preferences dialog, so you can  easily add, move, delete and edit plugins that are sometimes hard to  reach.</li>
   <li>Using Xfconf for storing the panel settings. Panels also  watches the Xfconf channel for changes, except for adding and removing  panels.</li>
   <li>New code for monitor/screen positioning. This should work a lot better with randr.</li>
-  <li>DND of desktop-files on the panel to create new launchers.</Ii>
+  <li>DND of desktop-files on the panel to create new launchers.</li>
   <li>Possibility to add new plugins from the command line, including startup arguments.</li>
   <li>External plugins are automatically restarted if they have not  crashed in the last 60 seconds. If they crash more then once in this  time window, the user is asked what to do (restart or  remove).</li>
-  <li>Gtk style properties for popup/popdown delay (bug #5707).
+  <li>Gtk style properties for popup/popdown delay (bug #5707).</li>
   <li>Hidden option to disable struts for windows on a screen edge,  so the space is used by the window manager for other  windows.</li>
   <li>Plugin API should still be the same, however the ABI changed  so you need to recompile plugins against this version of the  panel.</li>
   <li>New way to run plugins compiled as modules externally.  Whether a plugin runs internal or external is controlled by a boolean in  the desktop-file of the plugin. This does not affect the 'old' external  plugins that are compiled as binaries, it is however recommended to  port plugins to this new framework (only Makefile and macro change)  since it is more flexible.</li>
   <li>Communication between the panel and wrapper (that embeds  plugins to run external) is handled through D-Bus.</li>
   <li>New way to build plugins as GObjects with XfcePanelPlugin as  parent type. This gives all advantages of GObject like type  checking.</li>
-  <li>New settings dialog for the actions plugin  that allows one or two actions in the plugin
-  in each order you want.</li>
+  <li>New settings dialog for the actions plugin  that allows one or two actions in the plugin in each order you want.</li>
   <li>New application menu plugin.</li>
   <li>New fuzzy clock mode and improved vertical orientation for the clock plugin.</li>
   <li>New directory menu plugin: menu that provides a directory  tree in a menu. It allows to quickly open a Terminal or File Manager for  some directory.</li>
   <li>Support to create a launcher from the command line with a number of desktop files as argument.</li>
-  <li>New dialogs to configure launchers, with an application finder like interface to add new 
-  applications and using the Exo item editor for modifying launchers.</li>
+  <li>New dialogs to configure launchers, with an application finder like interface to add new  applications and using the Exo item editor for modifying launchers.</li>
   <li>Button to quickly access the Xfwm4 workspace settings in the pager plugin preferences.</li>
   <li>Support for transparent tray icons (requires at least Gtk 2.16).</li>
   <li>Option to only show icons in the Windows Button plugin. This drops the Icon Box plugin.</li>
@@ -278,7 +276,7 @@
   <li>Don't use consolekit when it's not enabled.</li>
   <li>Remove consolekit session creation in xfce4-session.</li>
   <li>Use cairo to draw the fadeout.</li>
-  <li>Remove obsolete gtk_tooltip_* calls and other < gtk 2.14 code.</li>
+  <li>Remove obsolete gtk_tooltip_* calls and other < gtk 2.14 code.</li>
   <li>Fix the check for legacy sm.</li>
   <li>Fix configure build options.</li>
   <li>Print build config after running configure.</li>
@@ -376,8 +374,8 @@
   <li>Add new keyboard shortcut to switch between windows of the same application.</li>
   <li>Add new keyboard shortcut to switch between windows of different applications only.</li>
   <li>Port to libxfce4ui + GtkBuilder and drop libxfcegui4 dependency.</li>
-  <li>Display an application switcher window per physical monitor (bug #5229).
-  <li>Fix opacity for newly mapped window not focused by default (bug #5706).
+  <li>Display an application switcher window per physical monitor (bug #5229).</li>
+  <li>Fix opacity for newly mapped window not focused by default (bug #5706).</li>
   <li>Add new option "cycle_apps_only" to switch between regular  toplevels only (avoiding dialogs - This option coupled with the new  shortcut allows for faster window selection through  keyboard).</li>
   <li>Implement prelinminary support for snap on resize.</li>
   <li>Implement a workaround to avoid loosing key release events.</li>
diff --git a/pages/download/changelogs/4.8pre3.php b/pages/download/changelogs/4.8pre3.php
index 787944c..269268b 100644
--- a/pages/download/changelogs/4.8pre3.php
+++ b/pages/download/changelogs/4.8pre3.php
@@ -32,7 +32,7 @@
 <h2>File Manager <em>(thunar)</em>:</h2>
 
 <ul>
-  <li>Fix unused variable warning when building with GLib < 2.20.</li>
+  <li>Fix unused variable warning when building with GLib < 2.20.</li>
   <li>Fix file operation status icon not disappearing by hiding the icon prior to destroying it (bug #6891). Patch by Xavier D.</li>
   <li>Fix Gtk 2.16 function.</li>
   <li>Fix twp plugin for images with a quote in file name (bug #5056).</li>
diff --git a/pages/download/changelogs/index.php b/pages/download/changelogs/index.php
index 944c13a..5e082f7 100644
--- a/pages/download/changelogs/index.php
+++ b/pages/download/changelogs/index.php
@@ -3,11 +3,11 @@
 $head['title'] = R_('Changelogs');
 
 $major_versions = array (
-        '4.10' => 'Xfce 4.10',
-        '4.8' => 'Xfce 4.8',
-        '4.6' => 'Xfce 4.6',
-        '4.4' => 'Xfce 4.4',
-        '4.2' => 'Xfce 4.2');
+        '/^4\.10(\.|pre)/' => R_('Xfce 4.10'),
+        '/^4\.8(\.|pre)/' => R_('Xfce 4.8'),
+        '/^4\.[56]\./' => R_('Xfce 4.6'),
+        '/^4\.[34]\./' => R_('Xfce 4.4'),
+        '/^4\.[12]\./' => R_('Xfce 4.2'));
 
 $path = 'pages/download/changelogs/';
 $versions = array ();
@@ -38,15 +38,14 @@ rsort ($versions);
 
 $printed = 0;
 
-foreach ($major_versions as $id => $name)
+foreach ($major_versions as $pattern => $name)
 {
-	echo '<h2 id="'.$id.'">'.$name.'</h2>';
+	echo '<h2>'.$name.'</h2>';
 	echo '<ul>';
 
-	$oddid = sprintf ('%0.1f', floatval ($id) - 0.1);
 	foreach ($versions as $version)
 	{
-		if (str_has_prefix ($version, $id) || str_has_prefix ($version, $oddid))
+		if (preg_match ($pattern, $version))
 		{
 			echo '<li><a href="/download/changelogs/'.$version.'">'.$version.'</a></li>';
 			$printed++;
@@ -57,5 +56,5 @@ foreach ($major_versions as $id => $name)
 }
 
 if ($printed != count ($versions))
-	echo 'Warning, not all changelog versions were printed!'
+	echo '<p>Warning, not all changelog versions were printed!</p>';
 ?>
diff --git a/pages/frontpage.php b/pages/frontpage.php
index 65b1b09..fdaa8cf 100644
--- a/pages/frontpage.php
+++ b/pages/frontpage.php
@@ -3,7 +3,7 @@
 include ('pages/news-array.php');
 include ('pages/versions.php');
 
-$head['description'] = 'Xfce Desktop Environment';
+$head['description'] = 'Xfce is a lightweight desktop environment for UNIX-like operating systems. It aims to be fast and low on system resources, while still being visually appealing and user friendly.';
 $head['keywords'] = 'desktop environment, window manager, desktop, speed, lightweight, gtk+, open source, xforms common environment';
 $head['feed'] = 'http://www.xfce.org/feed?lang='.$lang;
 ?>
diff --git a/pages/getinvolved/index.php b/pages/getinvolved/index.php
index 7471700..ab8fe93 100644
--- a/pages/getinvolved/index.php
+++ b/pages/getinvolved/index.php
@@ -11,13 +11,13 @@
 
 <h2><?php E_('Documentation') ?></h2>
 <p>
-  <?php E_('There\'s lots of people using and testing Xfce. By providing useful and up-to-date documentation, you will make a big impact on helping people understand how to make the most of the Xfce Desktop Environement.') ?>
+  <?php E_('There\'s lots of people using and testing Xfce. By providing useful and up-to-date documentation, you will make a big impact on helping people understand how to make the most of the Xfce Desktop Environment.') ?>
   <a href="http://docs.xfce.org/wiki/documentation"><?php E_('Learn More →') ?></a>
 </p>
 
 <h2><?php E_('Translation') ?></h2>
 <p>
-  <?php E_('Are you fluent in multiple languages? By contributing your translations of text to the Xfce Desktop Environement, you will help Xfce be a better part of the global market and more accessible to the millions of potential users out there.') ?>
+  <?php E_('Are you fluent in multiple languages? By contributing your translations of text to the Xfce Desktop Environment, you will help Xfce be a better part of the global market and more accessible to the millions of potential users out there.') ?>
   <a href="/getinvolved/translation"><?php E_('Learn More →') ?></a>
 </p>
 
diff --git a/pages/header.php b/pages/header.php
index 45dd732..8ab778c 100644
--- a/pages/header.php
+++ b/pages/header.php
@@ -13,6 +13,7 @@ else
 	<title><?php echo $title ?></title>
 	<link rel="shortcut icon" href="/style/favicon.png" type="image/png" />
 	<link rel="stylesheet" media="screen" href="/style/css.php" type="text/css" />
+	<meta name="content-language" content="<?php echo $lang ?>" />
 <?php
 	if (isset ($head['description']))
 		echo "\t<meta name=\"description\" content=\"".$head['description']."\" />\n";


More information about the Xfce4-commits mailing list