Updating branch refs/heads/master
         to f2245d6fac654eb3ed66b6f78c296c0dd15bcee8 (commit)
       from 15ef72960a89f5ffba6d25c15031bbc16e9ab267 (commit)

commit f2245d6fac654eb3ed66b6f78c296c0dd15bcee8
Author: Nick Schermer <[email protected]>
Date:   Sat Apr 21 12:58:56 2012 +0200

    Add more 4.10 tour stuff.

 pages/about/tour.php                           |   47 +++++++++--
 pages/about/tour44.php                         |   53 +++++++-----
 pages/about/tour46.php                         |  108 ++++++++----------------
 pages/about/tour48.php                         |   37 +++++---
 static/about/tour/4.10/appfinder-collapsed.png |  Bin 0 -> 12415 bytes
 static/about/tour/4.10/appfinder-expanded.png  |  Bin 0 -> 59635 bytes
 static/about/tour/4.10/panel-actions.png       |  Bin 0 -> 9684 bytes
 static/about/tour/4.10/panel-deskbar.png       |  Bin 0 -> 16796 bytes
 static/about/tour/4.10/panel-rows.png          |  Bin 0 -> 21240 bytes
 static/about/tour/4.10/session-autostart.png   |  Bin 0 -> 63629 bytes
 static/about/tour/4.10/settings-editor.png     |  Bin 0 -> 54900 bytes
 static/about/tour/4.10/settings-manager.png    |  Bin 0 -> 43521 bytes
 static/about/tour/4.10/settings-mime.png       |  Bin 0 -> 42709 bytes
 static/about/tour/4.10/settings-mouse.png      |  Bin 0 -> 35904 bytes
 14 files changed, 133 insertions(+), 112 deletions(-)

diff --git a/pages/about/tour.php b/pages/about/tour.php
index eb33598..abb841b 100644
--- a/pages/about/tour.php
+++ b/pages/about/tour.php
@@ -1,4 +1,15 @@
-<?php $head['title'] = R_('Tour') ?>
+<?php
+
+$head['title'] = R_('Xfce 4.10 tour');
+
+function print_img ($file, $title)
+{
+  global $static_media;
+
+  echo '<p class="image"><img 
src="'.$static_media.'/about/tour/4.10/'.$file.'" alt="" title="'.$title.'" 
/></p>';
+}
+
+?>
 
 <h1><?php echo $head['title'] ?></h1>
 
@@ -13,6 +24,10 @@
 <h2><?php E_("Application Finder") ?> <em>(xfce4-appfinder)</em></h2>
 
   <p><?php E_("The application finder has been completely rewritten and merges 
the functionality of the old appfinder and xfrun4. It also allows to create 
custom actions that match a prefix or a regex pattern.") ?></p>
+  
+  <?php print_img ("appfinder-collapsed.png", R_("")) ?>
+  
+  <?php print_img ("appfinder-expanded.png", R_("")) ?>
 
 <h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
 
@@ -20,17 +35,23 @@
 
     <p><?php E_("In 4.10 there is a general setting to configure the number of 
rows of a panel. Rows are used to keep some plugins small (Launchers) and give 
other plugins more space (like the Window Buttons).") ?></p>
 
+    <?php print_img ("panel-rows.png", R_("")) ?>
+
   <h3><?php E_("Deskbar Mode") ?></h3>
 
     <p><?php E_("The panel features a new display mode called Deskbar. In 
Deskbar mode the panel is aligned vertical, but the orientation of the plugins 
is horizontal. In combination with the new rows setting, this allows to create 
panels that are suitable for wide-screen setups.") ?></p>
+    
+    <?php print_img ("panel-deskbar.png", R_("")) ?>
 
   <h3><?php E_("Actions Plugin") ?></h3>
 
     <p><?php E_("This plugin have been rewritten and merges the functionality 
of the session plugin that was previously shipped with the xfce4-session 
package.") ?></p>
+    
+    <?php print_img ("panel-actions.png", R_("")) ?>
 
   <h3><?php E_("Window Buttons") ?></h3>
 
-    <p><?php E_("The Window Buttons plugin does not expand anymore to gives 
users more freedom with positioning the plugin. Use a separator plugin with 
Expand enabled to align plugins on the panel.") ?></p>
+    <p><?php E_("The Window Buttons plugin does not expand anymore to give 
users more freedom with positioning the plugin. Use a separator plugin with 
<strong>Expand</strong> enabled to align plugins on the panel.") ?></p>
 
 <h2><?php E_("File Manager") ?> <em>(thunar)</em></h2>
 
@@ -43,31 +64,43 @@
   <h3><?php E_("Applications Autostart") ?></h3>
 
     <p><?php E_("Another noticeable change is the way GNOME and KDE 
compatibility work. The compatibility check boxes only enable the services that 
need to be started before other applications (<em>gnome-keyring</em> and 
<em>gconf</em> for GNOME and <em>kdeinit</em> for KDE). All other autostart 
applications are always visible in the <strong>Applications Autostart</strong>, 
but listed cursive and not enabled by default if they are for a non-Xfce 
desktop.") ?></p>
+    
+    <?php print_img ("session-autostart.png", R_("")) ?>
 
 <h2><?php E_("Settings") ?> <em>(xfce4-settings)</em></h2>
 
   <h3><?php E_("Settings Manager") ?></h3>
 
     <p><?php E_("The Settings dialog has support for categories and searching. 
Most of the dialogs are also embedded in the window (this was a compile-time 
option in 4.8).") ?></p>
+    
+    <?php print_img ("settings-manager.png", R_("")) ?>
 
   <h3><?php E_("Settings Editor") ?></h3>
 
     <p><?php E_("The Settings Editor has been modified to reload the changed 
properties per-cell instead of reloading the entire tree, so it does not 
collapse when you modify a property. It also has in-line editing of the values 
(for most value types), making it easier to quickly adjust a setting.") ?></p>
+    
+    <?php print_img ("settings-editor.png", R_("")) ?>
 
     <p><?php E_("Another new feature in the settings editor is channel 
monitoring. If you right-click a channel in the main window, you can open a 
<strong>Monitor</strong> dialog which will show the property activity in a 
channel.") ?></p>
 
-  <h3><?php E_("MIME Type-editor") ?></h3>
+  <h3><?php E_("MIME Type Editor") ?></h3>
 
-    <p><?php E_("") ?></p>
+    <p><?php E_("A lot of people ask for an editor to manage their file 
associations in the last couple of years, so there is it is: a simple MIME Type 
Editor. The editor does not allow to modify MIME information (add/remove types 
or modify icons), but allows you to easily assign a default application to a 
type, show your local modifications and reset to the default.") ?></p>
+    
+    <?php print_img ("settings-mime.png", R_("")) ?>
 
   <h3><?php E_("Mouse and Touchpad") ?></h3>
 
-    <p><?php E_("") ?></p>
+    <p><?php E_("The pointer settings dialog has support for handling the 
basic Synaptics and Wacom properties. In the background the settings daemon has 
support for setting all kinds of <em>device properties</em>, which is explained 
in the <a href=\"http://docs.xfce.org/xfce/xfce4-settings/mouse\";>mouse 
settings</a> wiki.") ?></p>
+    
+    <?php print_img ("settings-mouse.png", R_("")) ?>
 
 <h2><?php E_("Desktop Manager") ?> <em> (xfdesktop)</em></h2>
 
-  <p><?php E_("") ?></p>
+  <p><?php E_("The initial plan for 4.10 was to integrate the desktop in 
Thunar, but since we couldn't agree on the implementation Xfdesktop has gained 
some new features as well. The most visible improvements are single-click 
support, automated background cycling and thumbnail rendering.") ?></p>
+  
+  <p><?php E_("Xfdesktop also has a new default background and all old 
backgrounds have been removed from the package.") ?></p>
 
 <h2><?php E_("Window Manager") ?> <em>(xfwm4)</em></h2>
 
-  <p><?php E_("") ?></p>
+  <p><?php E_("Xfwm4 has optional support for tiling when you drag a window to 
the screen edge. The tab window (Alt+Tab) has better theming options and arrow 
key navigation.") ?></p>
diff --git a/pages/about/tour44.php b/pages/about/tour44.php
index 9dc3cab..8624414 100644
--- a/pages/about/tour44.php
+++ b/pages/about/tour44.php
@@ -1,4 +1,15 @@
-<?php $head['title'] = R_('Xfce 4.4 tour') ?>
+<?php
+
+$head['title'] = R_('Xfce 4.4 tour');
+
+function print_img ($file, $title)
+{
+  global $static_media;
+
+  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.4/'.$file.'" 
alt="" title="'.$title.'" /></p>';
+}
+
+?>
 
 <h1><?php echo $head['title'] ?></h1>
 
@@ -12,13 +23,13 @@
   <?php E_('One of the most often requested features during the 4.0 and 4.2 
was support for icons on the desktop. Now, with Xfce 4.4.0, this feature was 
finally added to the desktop manager <b>Xfdesktop</b>.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/desktop-icons.png" alt="Desktop Icons" /></p>
+<?php print_img ('desktop-icons.png', R_('Desktop Icons')) ?>
 
 <p>
   <?php E_('The desktop manager utilizes <b>Thunar</b>\'s libraries to handle 
application launchers and regular files/folders on the desktop. The desktop 
manager is also able to display icons for minimized windows on the desktop, 
which is quite a popular feature from the CDE world. Of course, you can disable 
the desktop icons altogether if you prefer a clean desktop.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/desktop-settings.png" alt="Desktop Settings" /></p>
+<?php print_img ('desktop-settings.png', R_('Desktop Settings')) ?>
 
 <p>
   <?php E_('<b>Xfdesktop</b> also continues to provide access to the 
applications menu, as it did in the previous Xfce releases.') ?>
@@ -31,7 +42,7 @@
   <?php E_('The desktop icon support goes hand in hand with the new file 
manager <a href="http://thunar.xfce.org/";>Thunar</a> which replaces the 
previous file manager <b>Xffm</b>.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/thunar.png" alt="Thunar File Manager" /></p>
+<?php print_img ('thunar.png', R_('Thunar File Manager')) ?>
 
 <p>
   <?php E_('<b>Thunar</b> was written from scratch to provide an easy to use, 
but still very lightweight file manager for Xfce. Its user interface was 
designed to look similar to the file chooser which was introduced with GTK+ 
2.4, and other file managers such as <b>Nautilus</b> and <b>pcmanfm</b> already 
picked up that idea as well.') ?>
@@ -41,7 +52,7 @@
   <?php E_('<b>Thunar</b> supports all the file management functionality which 
users will expect, and also several advanced features. For example, a so-called 
<i>Bulk Renamer</i> is included which allows users to rename multiple files at 
once using a certain criterion.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/thunar-bulk-rename.png" alt="Thunar Bulk Rename" /></p>
+<?php print_img ('thunar-bulk-rename.png', R_('Thunar Bulk Rename')) ?>
 
 <h2><?php E_('Removable Drives and Media') ?></h2>
 
@@ -49,7 +60,7 @@
   <?php E_('Xfce 4.4.0 provides easy access to data on removable drives and 
media. Just insert the media into the drive or plug the new drive in to the 
computer and an icon representing the removable volume will appear on the 
desktop and in <b>Thunar</b>\'s side pane.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/removable-volumes.png" alt="Removable Volumes" /></p>
+<?php print_img ('removable-volumes.png', R_('Removable Volumes')) ?>
 
 <p>
   <?php E_('Click on the icon to automatically mount the volume. Right-click 
the icon to unmount the drive or eject the media from the drive. Note however 
that this feature requires <a 
href="http://freedesktop.org/wiki/Software_2fhal";>HAL</a> and is therefore only 
available for Linux 2.6.x and FreeBSD 6.x and above at the time of this writing 
(there is limited removable media support for FreeBSD 4.x and 5.x which does 
not require HAL).') ?>
@@ -62,7 +73,7 @@
   <?php E_('The new text editor <b>MousePad</b> is included with this release. 
<b>MousePad</b> provides all the basic editor functionality, nothing more, 
nothing less.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/mousepad.png" alt="MousePad" /></p>
+<?php print_img ('mousepad.png', R_('MousePad')) ?>
 
 <p>
   <?php E_('You can think of <b>MousePad</b> as the equivalent to 
<b>NotePad</b> on Windows. It starts up very fast, usually in less than one 
second, even on older systems.') ?>
@@ -74,25 +85,25 @@
   <?php E_('<b>Xfwm4</b> continues to be the window manager of the hearts.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfwm4-argb32.png" alt="Xfwm4 ARGB32" /></p>
+<?php print_img ('xfwm4-argb32.png', R_('Xfwm4 ARGB32')) ?>
 
 <p>
   <?php E_('This release features an enhanced compositor, supporting 
transparent ARGB windows, shadows, window frame transparency and much more.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfwm4-switcher.png" alt="Xfwm4 Switcher" /></p>
+<?php print_img ('xfwm4-switcher.png', R_('Xfwm4 Switcher')) ?>
 
 <p>
   <?php E_('<b>Xfwm4</b> also includes a brand new application switcher, as 
shown in the screenshot above, which displays all windows from the current 
workspace with icons and window titles.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfwm4-themes.png" alt="Xfwm4 Themes" /></p>
+<?php print_img ('xfwm4-themes.png', R_('Xfwm4 Themes')) ?>
 
 <p>
   <?php E_('Further on support for multiple image formats for window 
decoration themes was added, including <tt>PNG</tt>, <tt>GIF</tt> and 
<tt>SVG</tt> images.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfwm4-tweaks.png" alt="Xfwm4 Tweaks" /></p>
+<?php print_img ('xfwm4-tweaks.png', R_('Xfwm4 Tweaks')) ?>
 
 <p>
   <?php E_('Advanced controls for the window manager were also added, allowing 
thorough tweaking of window behavior.') ?>
@@ -105,19 +116,19 @@
   <?php E_('The <b>Xfce4-panel</b> was completely rewritten for the Xfce 4.4 
release. Multiple panels are supported <i>out of the box</i> now and can easily 
be configured using the new <b>Panel Manager</b> shown in the screenshot 
below.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/panel-manager.png" alt="Panel Manager" /></p>
+<?php print_img ('panel-manager.png', R_('Panel Manager')) ?>
 
 <p>
   <?php E_('One of the major problems in previous Xfce releases was that every 
plugin had to be run in the same process as the panel, and hence every plugin 
was able to crash the whole panel. To address this issue, support for external 
plugins was added to the panel.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/panel-additem.png" alt="Panel Add Item Dialog" /></p>
+<?php print_img ('panel-additem.png', R_('Panel Add Item Dialog')) ?>
 
 <p>
   <?php E_('Developers of panel plugins can now decide whether the plugin 
should run as external process or as part of the panel process, depending on 
the stability of the plugin.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/panel-iconbox.png" alt="Panel Icon Box Plugin" /></p>
+<?php print_img ('panel-iconbox.png', R_('Panel Icon Box Plugin')) ?>
 
 <p>
   <?php E_('Since there is now support for multiple panels, the separate 
<b>Xftaskbar4</b> and <b>Xfce4-iconbox</b> utilities are no longer required. 
Instead, both the taskbar and the iconbox are available as panel plugins now.') 
?>
@@ -134,7 +145,7 @@
   <?php E_('The new time management application <b>Orage</b> replaces the 
<b>Xfcalendar</b>, which was introduced with Xfce 4.2.0. <b>Orage</b> provides 
several features to efficiently manage your time.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/orage.png" alt="Orage" /></p>
+<?php print_img ('orage.png', R_('Orage')) ?>
 
 <p>
   <?php E_('While <b>Orage</b> is very lightweight and easy to use, it 
supports all the important features found in larger calendar applications like 
<b>Outlook</b> or <b>Evolution</b>. While <b>Xfcalendar</b> used the custom 
<tt>dbh</tt> format in the past to store your settings, <b>Orage</b> is based 
on <tt>ical</tt> and therefore compatible with other calendar applications.') ?>
@@ -147,7 +158,7 @@
   <?php E_('While <b>Terminal</b> was already available during the 4.2 days, 
it was not mature enough at that time to be part of the core. With this major 
release, it was moved into the core desktop.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/terminal.png" alt="Terminal" /></p>
+<?php print_img ('terminal.png', R_('Terminal')) ?>
 
 <p>
   <?php E_('Besides the basic features which you might expect from a terminal 
emulator, it includes some nice additional features, like multiple tabs per 
window, customizable toolbars and the ability to configure nearly every aspect 
of the application via <i>hidden options</i>. As can be seen in the screenshot 
above, this release also supports real transparency using <b>Xfwm4</b>\'s 
integrated composition manager.') ?>
@@ -160,13 +171,13 @@
   <?php E_('<b>Xfprint</b>, the Xfce printing management application, saw 
several small improvements with this release. First, the <tt>a2ps</tt> 
converter is not mandatory anymore, whilst still recommended. Support for 
<tt>CUPS</tt> 1.2 was added and <b>Xfprint</b> is now able to display the 
printer state with the <tt>CUPS</tt>-backend.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfprint.png" alt="Xfce Printing" /></p>
+<?php print_img ('xfprint.png', R_('Xfce Printing')) ?>
 
 <p>
   <?php E_('<b>Xfprint</b> also integrates with <b>MousePad</b> to provide 
generic printing support for different kinds of text documents using the 
<tt>a2ps</tt> converter.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/xfprint-dialog.png" alt="Xfce Print Dialog" /></p>
+<?php print_img ('xfprint-dialog.png', R_('Xfce Print Dialog')) ?>
 
 <p>
   <?php E_('As you can see the print dialog still looks relatively similar to 
that of Xfce 4.2, but the internal workings of the printing support were 
improved, especially the <tt>CUPS</tt> support. Besides that, the printing 
management functionality was moved to a library, so other applications can use 
the API to access the printer configuration.') ?>
@@ -179,7 +190,7 @@
   <?php E_('Xfce 4.4.0 implements the new <a 
href="http://freedesktop.org/wiki/Standards_2fautostart_2dspec";>Autostart 
Specification</a> - actually Xfce was the first desktop to implement said 
feature, but the others were faster to release. ;-)') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/autostart.png" alt="Xfce Autostart Editor" /></p>
+<?php print_img ('autostart.png', R_('Xfce Autostart Editor')) ?>
 
 <p>
   <?php E_('The specification consists of two parts, the <i>Autostart of 
Applications During Startup</i>, which is implemented in <b>xfce4-session</b> 
and the <i>Autostart Of Applications After Mount</i> which is implemented in <a 
href="http://foo-projects.org/~benny/projects/thunar-volman/index.html";>thunar-volman</a>.
 This release also includes the <b>xfce4-autostart-editor</b>, shown in the 
screenshot above, which allows users to easily add, remove or disable 
autostarted applications.') ?>
@@ -192,13 +203,13 @@
   <?php E_('This release introduces new options to customize the desktop to 
your needs. Some examples of new settings dialogs were already shown in the 
sections above.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/preferences-applications.png" alt="Preferred Applications" 
/></p>
+<?php print_img ('preferences-applications.png', R_('Preferred Applications')) 
?>
 
 <p>
   <?php E_('The preferred applications framework, which was previously only 
available in <b>Terminal</b>, was imported into Xfce, so users no longer need 
to edit shell profiles to specify which browser and terminal emulator should be 
used by Xfce applications. The goal was to make it as easy as possible to 
change an application for a certain category (GNOME users may have already 
noticed that GNOME adopted this approach, because it is such simple).') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.4/preferences-keyboard.png" alt="Keyboard Shortcuts" /></p>
+<?php print_img ('preferences-keyboard.png', R_('Keyboard Shortcuts')) ?>
 
 <p>
   <?php E_('And then there was the problem with the keyboard shortcuts in Xfce 
4.2... Xfce 4.2 limited the number of freely available keyboard shortcuts, 
while people wanted to assign any number of keyboard shortcuts. With Xfce 4.4 
this limitation is history and the application shortcuts are now separated from 
the window manager shortcuts.') ?>
diff --git a/pages/about/tour46.php b/pages/about/tour46.php
index 6a0a5ae..92c0e8b 100644
--- a/pages/about/tour46.php
+++ b/pages/about/tour46.php
@@ -1,4 +1,15 @@
-<?php $head['title'] = R_('Xfce 4.6 tour') ?>
+<?php
+
+$head['title'] = R_('Xfce 4.6 tour');
+
+function print_img ($file, $title)
+{
+  global $static_media;
+
+  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.6/'.$file.'" 
alt="" title="'.$title.'" /></p>';
+}
+
+?>
 
 <h1><?php echo $head['title'] ?></h1>
 
@@ -12,15 +23,13 @@
   <?php E_('Since desktop icons have been introduced in Xfce 4.4, people have 
expressed the need to allow the selection of multiple icons (rubber banding). 
With <b>Xfce 4.6</b>, the <b>Xfdesktop</b> manager finally implements this 
feature: you can select multiple icons, remove them, etcetera...') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfdesktop-rubberbanding.png" title="<?php E_('Multiple icons 
selection') ?>" alt="" />
-</p>
+<?php print_img ('xfdesktop-rubberbanding.png', R_('Multiple icons 
selection')) ?>
 
 <p>
   <?php E_('<b>Xfce 4.6</b> features a brand new desktop menu which allows you 
to manipulate files as with the <b>Thunar</b> filemanager contextual menu, but 
also to open applications, exit your session, or access the help 
documentation.') ?>
 </p>
 
-<p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.6/xfdesktop-menu.png" title="<?php E_('New desktop menu') ?>" 
alt="" /></p>
+<?php print_img ('xfdesktop-menu.png', R_('New desktop menu')) ?>
 
 <h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
 
@@ -28,9 +37,7 @@
   <?php E_('A lot of long standing bugs have been fixed in <b>Xfce4 Panel</b>, 
particularly for multiple screen setups, but this new release also brings an 
improved set of panel plugins.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-panel-clock.png" 
title="<?php E_('New binary clock') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-panel-clock.png', R_('New binary clock')) ?>
 
 <p>
   <?php E_('The <b>clock plugin</b> has been rewritten to consume fewer system 
resources and to fix some display bugs, but there is also a new clock mode for 
the geek in you: binary clock! The new <b>notification area plugin</b> allows 
you to hide selected notification icons to keep your notification area clean 
and readable.') ?>
@@ -42,9 +49,7 @@
 <?php E_('<b>Xfce4 Mixer</b> has been rewritten from scratch to use <a 
href="http://www.gstreamer.net/";>Gstreamer</a>. This allows us to more easily 
support multiple sound systems, the user interface is more polished, and you 
can manage several different sound cards. Additionally, a panel plugin allows 
you to set the system sound quickly using the mouse scroll wheel.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-mixer.png" 
title="<?php E_('New sound mixer') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-mixer.png', R_('New sound mixer')) ?>
 
 <h2><?php E_("Session Manager") ?> <em>(xfce4-session)</em></h2>
 
@@ -52,17 +57,13 @@
   <?php E_('<b>Xfce 4.6</b> comes with an enhanced session manager: your 
session should be started faster, and the settings dialog has been reworked to 
ease the management of session-aware applications.  Additionally, the session 
manager will now automatically restart session applications which crashed so 
that you are not left without a desktop, panel, window manager, etcetera, if a 
crash occurs. ') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-session-settings.png" title="<?php E_('Session settings 
dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-session-settings.png', R_('Session settings dialog')) 
?>
 
 <p>
   <?php E_('The session manager also includes a new long-awaited feature: 
support for <b>suspend</b> and <b>hibernate</b> "out of the box."  The logout 
dialog now has two additional buttons which offer to suspend or hibernate your 
computer.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-session-logout.png" title="<?php E_('Session logout 
dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-session-logout.png', R_('Session logout dialog')) ?>
 
 <h2><?php E_("Window Manager") ?> <em>(xfwm4)</em></h2>
 
@@ -73,41 +74,31 @@
 <p><?php E_('In addition to some other new features, <b>Xfwm4</b> is now able 
to detect windows that do not respond and offer to terminate them.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-net-ping.png" 
title="<?php E_('Dialog to terminate busy applications') ?>" alt="" />
-</p>
+<?php print_img ('xfwm4-net-ping.png', R_('Dialog to terminate busy 
applications')) ?>
 
 <p>
   <?php E_('There is also a new <b>actions menu</b> which allows you to 
quickly move and resize windows, put them above or below other windows, or 
fullscreen them.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-new-menu.png" 
title="<?php E_('New actions menu') ?>" alt="" />
-</p>
+<?php print_img ('xfwm4-new-menu.png', R_('New actions menu')) ?>
 
 <p>
   <?php E_('A new <b>fill</b> operation has been implemented; it expands a 
given window to the available space without overlapping other adjacent 
windows.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfwm4-fill-operation.png" title="<?php E_('Fill operation') 
?>" alt="" />
-</p>
+<?php print_img ('xfwm4-fill-operation.png', R_('Fill operation')) ?>
 
 <p>
   <?php E_('The <b>compositor</b> has been optimized to reduce window 
flickering duringresize operations.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-resize.png" 
title="<?php E_('Flicker free resizing') ?>" alt="" />
-</p>
+<?php print_img ('xfwm4-resize.png', R_('Flicker free resizing')) ?>
 
 <p>
   <?php E_('Some <b>tweakable options</b> have also been added: for example, 
you can now disable the blinking of windows when they receive an urgency 
hint.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfwm4-new-tweaks.png" 
title="<?php E_('New tweakable options') ?>" alt="" />
-</p>
+<?php print_img ('xfwm4-new-tweaks.png', R_('New tweakable options')) ?>
 
 <h2><?php E_("File Manager") ?> <em>(thunar)</em></h2>
 
@@ -115,33 +106,25 @@
   <?php E_('There have been many bug fixes and performance improvements in 
<b>Thunar</b>. It can use the mouse forward and backward buttons (if available) 
to navigate, and it includes a new plugin that allows you to set an image as 
wallpaper from the context menu.') ?>
 </p>
 
-<p class="image">
-  <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>
+<?php print_img ('thunar-wallpaper-plugin.png', R_('Set an image in a Thunar 
folder as wallpaper')) ?>
 
 <p>
   <?php E_('<b>Thunar</b> now follows the <a 
href="http://freedesktop.org/wiki/Software/xdg-user-dirs";> XDG user 
directories</a> specification; this allows you to have themed and localized 
user folders to store your music, documents, videos, templates, etcetera...') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/thunar-xdg-user-dirs.png" title="<?php E_('Thunar menu for 
user directories') ?>" alt="" />
-</p>
+<?php print_img ('thunar-xdg-user-dirs.png', R_('Thunar menu for user 
directories')) ?>
 
 <p>
   <?php E_('<b>Thunar</b> will now display a translucent icon for drives or 
volumes that are not mounted, so that you can distinguish them from the mounted 
ones.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-mounting.png" 
title="<?php E_('Translucent icons for unmounted drives and volumes') ?>" 
alt="" />
-</p>
+<?php print_img ('thunar-mounting.png', R_('Translucent icons for unmounted 
drives and volumes')) ?>
 
 <p>
   <?php E_('Last, but not least, <b>Thunar</b> now supports encrypted 
devices!') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/thunar-encrypted.png" 
title="<?php E_('Thunar support for encrypted devices') ?>" alt="" />
-</p>
+<?php print_img ('thunar-encrypted.png', R_('Thunar support for encrypted 
devices')) ?>
 
 <h2><?php E_("Settings") ?> <em>(xfce4-settings)</em></h2>
 
@@ -149,15 +132,11 @@
   <?php E_('Xfce 4.6 features a new settings interface, <b>Xfce Settings 
Manager</b>, which allows you to configure your desktop environment much more 
easily than before. The dialogs which are accessible by single clicking on the 
icons have been designed to be more compact and to allow you to customize your 
desktop quickly and in a more intuitive way.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-settings-manager.png" title="<?php E_('Xfce4 Settings 
Manager') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-settings-manager.png', R_('Xfce4 Settings Manager')) ?>
 
 <h3><?php E_('Accessibility settings') ?></h3>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-accessibility-settings.png" title="<?php 
E_('Accessibility settings dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-accessibility-settings.png', R_('Accessibility 
settings dialog')) ?>
 
 <p>
   <?php E_('The <b>Accessibility settings</b> dialog allows you to set the 
accessibility related mouse and keyboard options, such as sticky keys, bounce 
keys, or mouse emulation.') ?>
@@ -165,18 +144,15 @@
 
 <h3><?php E_('Appearance settings') ?></h3>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-appearance-settings.png" title="<?php E_('Appearance 
settings dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-appearance-settings.png', R_('Appearance settings 
dialog')) ?>
 
 <p>
   <?php E_('The <b>Appearance settings</b> dialog allows you to set the widget 
style, the icon theme, and font, toolbar and menu options.') ?>
 </p>
 
 <h3><?php E_('Display settings') ?></h3>
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-display-settings.png" title="<?php E_('Display settings 
dialog') ?>" alt="" />
-</p>
+
+<?php print_img ('xfce4-display-settings.png', R_('Display settings dialog')) 
?>
 
 <p>
   <?php E_('The <b>Display settings</b> dialog allows you to set the 
resolution, refresh rate, and the rotation for each screen that is connected.') 
?>
@@ -184,17 +160,13 @@
 
 <h3><?php E_('Keyboard settings') ?></h3>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-keyboard-settings-layout.png" title="<?php E_('Keyboard 
settings dialog, layout tab') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-keyboard-settings-layout.png', R_('Keyboard settings 
dialog, layout tab')) ?>
 
 <p>
   <?php E_('The <b>Keyboard settings</b> dialog allows you to set keyboard 
preferences such as key repeating, keyboard shortcuts, and your keyboard 
layout.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-keyboard-settings-shortcuts.png" title="<?php 
E_('Keyboard settings dialog, shortcuts tab') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-keyboard-settings-shortcuts.png', R_('Keyboard 
settings dialog, shortcuts tab')) ?>
 
 <p>
   <?php E_('You can now configure shortcuts more simply, and any shortcut 
conflicts are automatically detected.') ?>
@@ -202,9 +174,7 @@
 
 <h3><?php E_('Mouse settings') ?></h3>
 
-<p class="image">
-  <img src="<?php echo $static_media 
?>/about/tour/4.6/xfce4-mouse-settings.png" title="<?php E_('Mouse settings 
dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-mouse-settings.png', R_('Mouse settings dialog')) ?>
 
 <p>
   <?php E_('The <b>Mouse settings</b> dialog allows you to configure the 
different mice connected to your computer: button order, acceleration, 
double-click speed, mouse cursor theme, etcetera...') ?>
@@ -212,9 +182,7 @@
 
 <h3><?php E_('Desktop settings') ?></h3>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfdesktop-settings.png" 
title="<?php E_('Desktop settings dialog') ?>" alt="" />
-</p>
+<?php print_img ('xfdesktop-settings.png', R_('Desktop settings dialog')) ?>
 
 <p>
   <?php E_('The <b>Desktop settings</b> dialog is now much more compact; it 
allows you to configure per-screen settings: wallpaper, brightness, desktop 
menu, displayed icons, etcetera...') ?>
@@ -226,9 +194,7 @@
   <?php E_('<b>Xfce 4.6</b> also comes with a brand new application finder 
which features a cleaner user interface.  It is also easier to use it with the 
keyboard, and it monitors installed applications to update the list "on the 
fly."  It also allows you to create panel launchers quickly by dragging an 
application icon to the launcher creation window.') ?>
 </p>
 
-<p class="image">
-  <img src="<?php echo $static_media ?>/about/tour/4.6/xfce4-appfinder.png" 
title="<?php E_('New application finder') ?>" alt="" />
-</p>
+<?php print_img ('xfce4-appfinder.png', R_('New application finder')) ?>
 
 <h2><?php E_('Links') ?></h2>
 
diff --git a/pages/about/tour48.php b/pages/about/tour48.php
index d5d3726..dfe3c62 100644
--- a/pages/about/tour48.php
+++ b/pages/about/tour48.php
@@ -1,4 +1,15 @@
-<?php $head['title'] = R_('Xfce 4.8 tour') ?>
+<?php
+
+$head['title'] = R_('Xfce 4.8 tour');
+
+function print_img ($file, $title)
+{
+  global $static_media;
+
+  echo '<p class="image"><img src="'.$static_media.'/about/tour/4.8/'.$file.'" 
alt="" title="'.$title.'" /></p>';
+}
+
+?>
 
 <h1><?php echo $head['title'] ?></h1>
 
@@ -10,19 +21,19 @@
 
     <p><?php E_("Thunar now has optional support for GVFS which will allow you 
to browse remote shares using Thunar: FTP, Windows Shares, WebDav and SSH 
servers...") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/thunar-remote.png" alt="<?php E_("Thunar browsing a remote 
share") ?>" /></p>
+    <?php print_img ("thunar-remote.png", R_("Thunar browsing a remote 
share")) ?>
 
   <h3><?php E_("New file operations progress dialog") ?></h3>
 
     <p><?php E_("When several file operations (copy or move) are being handled 
in parallel, Thunar now shows a single progress dialog which displays all the 
relevant information.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/thunar-progress.png" alt="<?php E_("Progress dialog") ?>" 
/></p>
+    <?php print_img ("thunar-progress.png", R_("Progress dialog")) ?>
 
   <h3><?php E_("Eject button for removable devices") ?></h3>
 
     <p><?php E_("It is is now possible to eject removable devices by clicking 
the eject button near each removable device label in the side pane.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/thunar-eject.png" alt="<?php E_("Eject button") ?>" /></p>
+    <?php print_img ("thunar-eject.png", R_("Eject button")) ?>
 
 <h2><?php E_("Panel") ?> <em>(xfce4-panel)</em></h2>
 
@@ -36,13 +47,13 @@
 
     <p><?php E_("The panel is now able to draw transparent panel backgrounds 
with non transparent items. Your panel items will remain readable and you will 
enjoy a nice panel look.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/panel-transparent.png" alt="<?php E_("Transparent panel 
background") ?>" /></p>
+    <?php print_img ("panel-transparent.png", R_("Transparent panel 
background")) ?>
 
   <h3><?php E_("New item editor") ?></h3>
 
     <p><?php E_("The panel now features an item editor which allows to modify, 
move, add and remove items quickly. This is particularly useful for items which 
are hard to right click and gives you an easy way to change your panel layout 
from a single place.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/panel-editor.png" alt="<?php E_("Panel item editor") ?>" 
/></p>
+    <?php print_img ("panel-editor.png", R_("Panel item editor")) ?>
 
   <h3><?php E_("Drag and drop to create launchers") ?></h3>
 
@@ -56,13 +67,13 @@
 
     <p><?php E_("An Xfce release without a new clock mode would not be a true 
Xfce release. Let us introduce you the 'fuzzy' clock mode!") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/panel-fuzzy-clock.png" alt="<?php E_("New fuzzy clock mode") 
?>" /></p>
+    <?php print_img ("panel-fuzzy-clock.png", R_("New fuzzy clock mode")) ?>
 
   <h3><?php E_("New directory menu plugin") ?></h3>
 
     <p><?php E_("The directory menu plugin provides a menu reproducing the 
arborescence of a particular folder. This allows you to open a terminal or a 
file manager in a sub-folder in a very fast and efficient way.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/panel-directorymenu.png" alt="<?php E_("Directory menu 
plugin") ?>" /></p>
+    <?php print_img ("panel-directorymenu.png", R_("Directory menu plugin")) ?>
 
   <h3><?php E_("Applications menu edition") ?></h3>
 
@@ -76,29 +87,29 @@
 
     <p><?php E_("You can enable and disable plugged screens, set their 
resolution, refresh rate, rotation and reflection, clone screens or extend 
desktops.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/display-settings.png" alt="<?php E_("New display settings 
dialog") ?>" /></p>
+    <?php print_img ("display-settings.png", R_("New display settings 
dialog")) ?>
 
     <h4><?php E_("Timed confirmation") ?></h4>
 
       <p><?php E_("Any change made with the settings dialog will have to be 
confirmed within ten seconds or they will be reverted. This prevents broken 
video drivers from leaving your computer unusable.") ?></p>
 
-      <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/display-settings-confirmation.png" alt="<?php E_("Timed 
confirmation for display settings changes") ?>" /></p>
+      <?php print_img ("display-settings-confirmation.png", R_("Timed 
confirmation for display settings changes")) ?>
 
     <h4><?php E_("Quick setup dialog") ?></h4>
 
       <p><?php E_("The quick setup dialog allows you to configure a dual 
screen setup in a second. Plug the second screen, press the display key or 
Windows + p and select the wanted layout. Done!") ?></p>
 
-      <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/minimal-display-settings.png" alt="<?php E_("Quick multihead 
setup") ?>" /></p>
+      <?php print_img ("minimal-display-settings.png", R_("Quick multihead 
setup")) ?>
 
   <h3><?php E_("Settings edition in the Xfce Settings Editor") ?></h3>
 
     <p><?php E_("The Xfce Settings Editor now deserves its name, it is no 
longer a simpler Xfconf settings viewer. You can now modify, delete, add and 
reset settings through its interface. It also monitors changes to update its 
view.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/settings-editor.png" alt="<?php E_("Editing Xfconf properties 
with the Settings Editor") ?>" /></p>
+    <?php print_img ("settings-editor.png", R_("Editing Xfconf properties with 
the Settings Editor")) ?>
 
   <h3><?php E_("Improved keyboard layout selection") ?></h3>
 
     <p><?php E_("The layout selection dialog received a lot of love: it no 
longer displays cryptic language/variants codes but uses localized 
languages/variants names. Layout edition was also made easier by prefilling the 
dialogs with the current values.") ?></p>
 
-    <p class="image"><img src="<?php echo $static_media 
?>/about/tour/4.8/keyboard-settings-list.png" alt="<?php E_("Layouts and 
variants list") ?>" /></p>
+    <?php print_img ("keyboard-settings-list.png", R_("Layouts and variants 
list")) ?>
 
diff --git a/static/about/tour/4.10/appfinder-collapsed.png 
b/static/about/tour/4.10/appfinder-collapsed.png
new file mode 100644
index 0000000..f62e9a1
Binary files /dev/null and b/static/about/tour/4.10/appfinder-collapsed.png 
differ
diff --git a/static/about/tour/4.10/appfinder-expanded.png 
b/static/about/tour/4.10/appfinder-expanded.png
new file mode 100644
index 0000000..0c6d5ee
Binary files /dev/null and b/static/about/tour/4.10/appfinder-expanded.png 
differ
diff --git a/static/about/tour/4.10/panel-actions.png 
b/static/about/tour/4.10/panel-actions.png
new file mode 100644
index 0000000..1f9a567
Binary files /dev/null and b/static/about/tour/4.10/panel-actions.png differ
diff --git a/static/about/tour/4.10/panel-deskbar.png 
b/static/about/tour/4.10/panel-deskbar.png
new file mode 100644
index 0000000..821d399
Binary files /dev/null and b/static/about/tour/4.10/panel-deskbar.png differ
diff --git a/static/about/tour/4.10/panel-rows.png 
b/static/about/tour/4.10/panel-rows.png
new file mode 100644
index 0000000..dd45955
Binary files /dev/null and b/static/about/tour/4.10/panel-rows.png differ
diff --git a/static/about/tour/4.10/session-autostart.png 
b/static/about/tour/4.10/session-autostart.png
new file mode 100644
index 0000000..bc93519
Binary files /dev/null and b/static/about/tour/4.10/session-autostart.png differ
diff --git a/static/about/tour/4.10/settings-editor.png 
b/static/about/tour/4.10/settings-editor.png
new file mode 100644
index 0000000..28d9027
Binary files /dev/null and b/static/about/tour/4.10/settings-editor.png differ
diff --git a/static/about/tour/4.10/settings-manager.png 
b/static/about/tour/4.10/settings-manager.png
new file mode 100644
index 0000000..42290f5
Binary files /dev/null and b/static/about/tour/4.10/settings-manager.png differ
diff --git a/static/about/tour/4.10/settings-mime.png 
b/static/about/tour/4.10/settings-mime.png
new file mode 100644
index 0000000..0a798ca
Binary files /dev/null and b/static/about/tour/4.10/settings-mime.png differ
diff --git a/static/about/tour/4.10/settings-mouse.png 
b/static/about/tour/4.10/settings-mouse.png
new file mode 100644
index 0000000..9dfc2ca
Binary files /dev/null and b/static/about/tour/4.10/settings-mouse.png differ
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to