[Xfce4-commits] r25929 - in terminal/trunk: . doc/C doc/fr doc/ja icons/48x48 po po-doc terminal
Benedikt Meurer
benny at xfce.org
Fri Jul 20 18:54:49 CEST 2007
Author: benny
Date: 2007-07-20 16:54:48 +0000 (Fri, 20 Jul 2007)
New Revision: 25929
Removed:
terminal/trunk/helpers/
terminal/trunk/icons/48x48/stock_terminal-mailreader.png
terminal/trunk/icons/48x48/stock_terminal-webbrowser.png
terminal/trunk/terminal/terminal-helper-dialog.c
terminal/trunk/terminal/terminal-helper-dialog.h
terminal/trunk/terminal/terminal-helper.c
terminal/trunk/terminal/terminal-helper.h
Modified:
terminal/trunk/ChangeLog
terminal/trunk/Makefile.am
terminal/trunk/NEWS
terminal/trunk/Terminal.ui
terminal/trunk/configure.in.in
terminal/trunk/doc/C/Terminal.xml.in
terminal/trunk/doc/fr/Terminal.xml.in
terminal/trunk/doc/ja/Terminal.xml.in
terminal/trunk/icons/48x48/Makefile.am
terminal/trunk/po-doc/ChangeLog
terminal/trunk/po-doc/fr.po
terminal/trunk/po-doc/ja.po
terminal/trunk/po/ChangeLog
terminal/trunk/po/POTFILES.in
terminal/trunk/po/Terminal.pot
terminal/trunk/po/ar.po
terminal/trunk/po/be.po
terminal/trunk/po/ca.po
terminal/trunk/po/cs.po
terminal/trunk/po/de.po
terminal/trunk/po/dz.po
terminal/trunk/po/el.po
terminal/trunk/po/en_GB.po
terminal/trunk/po/eo.po
terminal/trunk/po/es.po
terminal/trunk/po/eu.po
terminal/trunk/po/fi.po
terminal/trunk/po/fr.po
terminal/trunk/po/gl.po
terminal/trunk/po/he.po
terminal/trunk/po/hu.po
terminal/trunk/po/it.po
terminal/trunk/po/ja.po
terminal/trunk/po/ko.po
terminal/trunk/po/lt.po
terminal/trunk/po/nb_NO.po
terminal/trunk/po/nl.po
terminal/trunk/po/pa.po
terminal/trunk/po/pl.po
terminal/trunk/po/pt_BR.po
terminal/trunk/po/pt_PT.po
terminal/trunk/po/ro.po
terminal/trunk/po/ru.po
terminal/trunk/po/sk.po
terminal/trunk/po/sq.po
terminal/trunk/po/sv.po
terminal/trunk/po/tr.po
terminal/trunk/po/uk.po
terminal/trunk/po/vi.po
terminal/trunk/po/zh_CN.po
terminal/trunk/po/zh_TW.po
terminal/trunk/terminal/Makefile.am
terminal/trunk/terminal/terminal-app.c
terminal/trunk/terminal/terminal-dbus.c
terminal/trunk/terminal/terminal-gtk-extensions.c
terminal/trunk/terminal/terminal-gtk-extensions.h
terminal/trunk/terminal/terminal-preferences-dialog.c
terminal/trunk/terminal/terminal-preferences-dialog.h
terminal/trunk/terminal/terminal-preferences.c
terminal/trunk/terminal/terminal-screen.c
terminal/trunk/terminal/terminal-shortcut-editor.c
terminal/trunk/terminal/terminal-stock.c
terminal/trunk/terminal/terminal-stock.h
terminal/trunk/terminal/terminal-tab-header.c
terminal/trunk/terminal/terminal-widget.c
terminal/trunk/terminal/terminal-window.c
Log:
2007-07-20 Benedikt Meurer <benny at xfce.org>
* helpers/, icons/, terminal/, Makefile.am, NEWS, Terminal.ui,
configure.in.in, doc/: Drop the preferred application handling
from Terminal and use the Xfce preferred application directly.
This fixes a security issue, where the URL handling allowed
for remote shell command execution, because the helper scripts
were run via the shell (Bug #3383).
* po/POTFILES.in: Update list of translatable files.
* po/Terminal.pot, po/*.po: Merge new strings.
* po/de.po: Update german translations.
* po-doc/*.po: Merge new translations.
Modified: terminal/trunk/ChangeLog
===================================================================
--- terminal/trunk/ChangeLog 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/ChangeLog 2007-07-20 16:54:48 UTC (rev 25929)
@@ -1,5 +1,18 @@
2007-07-20 Benedikt Meurer <benny at xfce.org>
+ * helpers/, icons/, terminal/, Makefile.am, NEWS, Terminal.ui,
+ configure.in.in, doc/: Drop the preferred application handling
+ from Terminal and use the Xfce preferred application directly.
+ This fixes a security issue, where the URL handling allowed
+ for remote shell command execution, because the helper scripts
+ were run via the shell (Bug #3383).
+ * po/POTFILES.in: Update list of translatable files.
+ * po/Terminal.pot, po/*.po: Merge new strings.
+ * po/de.po: Update german translations.
+ * po-doc/*.po: Merge new translations.
+
+2007-07-20 Benedikt Meurer <benny at xfce.org>
+
* configure.in.in: Fix typo. Be sure to defined NDEBUG if debug
support is minimal or disabled. Fix test for -errwarn=%all.
* terminal/: Several small improvements.
Modified: terminal/trunk/Makefile.am
===================================================================
--- terminal/trunk/Makefile.am 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/Makefile.am 2007-07-20 16:54:48 UTC (rev 25929)
@@ -2,7 +2,6 @@
SUBDIRS = \
doc \
- helpers \
icons \
po \
po-doc \
Modified: terminal/trunk/NEWS
===================================================================
--- terminal/trunk/NEWS 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/NEWS 2007-07-20 16:54:48 UTC (rev 25929)
@@ -1,6 +1,12 @@
0.2.7svn
========
- Close tabs with middle mouse click (Bug #3380).
+- Security fix: URL handling allowed remote shell command execution
+ (Bug #3383).
+- The preferred application handling was completely removed from Terminal.
+ Instead the Xfce Preferred Applications are invoked directly now. The
+ URL highlighting can still be disabled via the hidden option
+ "MiscHighlightUrls" (see the documentation for details).
- Test for support of -Wall, -Werror and -errwarn=%all (Bug #2920).
Modified: terminal/trunk/Terminal.ui
===================================================================
--- terminal/trunk/Terminal.ui 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/Terminal.ui 2007-07-20 16:54:48 UTC (rev 25929)
@@ -3,7 +3,7 @@
<!--
$Id$
- Copyright (c) 2004-2006 os-cillation
+ Copyright (c) 2004-2007 os-cillation
Terminal User Interface description file, parsed by Terminal to create
the menu bar and the right click menu.
@@ -27,7 +27,6 @@
<menuitem action="paste-selection"/>
<separator/>
<menuitem action="edit-toolbars"/>
- <menuitem action="edit-helpers"/>
<menuitem action="preferences"/>
</menu>
<menu action="view-menu">
Modified: terminal/trunk/configure.in.in
===================================================================
--- terminal/trunk/configure.in.in 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/configure.in.in 2007-07-20 16:54:48 UTC (rev 25929)
@@ -281,7 +281,6 @@
doc/ja/Makefile
doc/ja/Terminal.xml
doc/ja/images/Makefile
-helpers/Makefile
icons/Makefile
icons/16x16/Makefile
icons/24x24/Makefile
Modified: terminal/trunk/doc/C/Terminal.xml.in
===================================================================
--- terminal/trunk/doc/C/Terminal.xml.in 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/doc/C/Terminal.xml.in 2007-07-20 16:54:48 UTC (rev 25929)
@@ -484,11 +484,6 @@
</para>
</listitem>
</orderedlist>
-
- <para>
- See <xref linkend="preferred-applications"/> about how to configure
- the preferred Web Browser for Terminal and how to disable this feature.
- </para>
</listitem>
</varlistentry>
@@ -514,11 +509,6 @@
</para>
</listitem>
</orderedlist>
-
- <para>
- See <xref linkend="preferred-applications"/> about how to configure the preferred
- Mail Reader for Terminal and how to disable this feature.
- </para>
</listitem>
</varlistentry>
</variablelist>
@@ -1005,102 +995,6 @@
</sect1>
- <sect1 id="preferred-applications">
- <title>Preferred Applications</title>
-
- <para>
- As of version 0.2.4, &application; supports opening hyperlinks and composing emails using
- an external web browser and mail reader. This section describes how to configure which
- Web Browser and Mail Reader you want to use (see <xref linkend="usage_to-work-with-contents-of-terminal-windows"/> for details how access
- hyperlinks and compose emails).
- </para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-edit-applications.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Applications</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>
- To configure your preferred applications for &application;, choose
- <menuchoice><guimenu>Edit</guimenu><guimenuitem>Applications...</guimenuitem></menuchoice>
- from the main menu bar. This will bring up the the <guilabel>Preferred Applications</guilabel>
- dialog.
- </para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-dialog.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Preferred Applications</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>
- This dialog allows you to choose your preferred Web Browser, which will be used to open
- hyperlinks, and your preferred Mail Reader, which will be used to compose emails. Click
- on the buttons to change the appropriate setting. This will bring up a drop down menu.
- </para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-menu.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Choose preferred application</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>
- If you choose <guimenuitem>Disable this feature</guimenuitem> from the <guilabel>Web
- Browser</guilabel> menu, opening hyperlinks from &application; will be disabled. If
- you choose <guimenuitem>Disable this feature</guimenuitem> from the <guilabel>Mail
- Reader</guilabel> menu, composing emails from &application; will be disabled.
- </para>
-
- <para>
- Next in the menu is a list of default applications - automatically detected on your system
- - you can choose from. Choose <guimenuitem>Other...</guimenuitem> in case your preferred
- application does not show up in the list of default applications or if you want to use
- specific flags to launch an application (Use <parameter>%u</parameter> to represent the
- URL when executed, e.g. <command>browser --newtab %u</command>). This will bring up a
- dialog that lets you enter a custom application.
- </para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-choose-custom-webbrowser.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Choose custom Web Browser</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>
- You can either enter the name or the full path of the application's binary, depending on
- whether the application is installed in the systems search path, or you can press the button
- labeled <guibutton>Browse...</guibutton> to select the application's binary in a graphical
- way.
- </para>
- </sect1>
-
-
<sect1 id="advanced">
<title>Advanced topics</title>
<sect2 id="command-line-options">
@@ -1421,7 +1315,8 @@
MiscInheritGeometry=TRUE
MiscMouseAutohide=FALSE
MiscTabCloseButtons=TRUE
-MiscTabPosition=GTK_POS_TOP</programlisting>
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE</programlisting>
<para>
plus all the options that are controlled through the preferences dialog.
@@ -1542,6 +1437,19 @@
</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>MiscHighlightUrls</varname></term>
+ <listitem>
+ <para>
+ This setting controls whether URLs - both hyperlinks and email addresses - will
+ be highlighted in the text displayed in a terminal window. If you change this
+ option to <literal>FALSE</literal>, URLs won't be highlighted anymore and you
+ will no longer be able to middle-click the URL to open it in the preferred
+ application.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</sect2>
</sect1>
Modified: terminal/trunk/doc/fr/Terminal.xml.in
===================================================================
--- terminal/trunk/doc/fr/Terminal.xml.in 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/doc/fr/Terminal.xml.in 2007-07-20 16:54:48 UTC (rev 25929)
@@ -18,7 +18,7 @@
<year>2005</year>
<year>2006</year>
<holder>os-cillation</holder>
- </copyright><copyright><year>2007.</year><holder>Maximilian Schleiss (maxschleiss at bluewin.ch)</holder></copyright><copyright><year>2007.</year><holder>Mike Massonnet (mmassonnet at gmail.org)</holder></copyright>
+ </copyright><copyright><year>2007.</year><holder>Maximilian Schleiss (maximilian at xfce.org)</holder></copyright><copyright><year>2007.</year><holder>Mike Massonnet (mmassonnet at gmail.org)</holder></copyright>
<legalnotice id="legalnotice">
<para>Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. The complete license text is available from the <ulink type="http" url="http://www.gnu.org/">Free Software Foundation</ulink>.</para>
@@ -329,8 +329,6 @@
<para>Dans ce dernier, choisissez <guimenuitem>Ouvrir le lien</guimenuitem> pour afficher le lien dans la fenêtre de votre navigateur Web.</para>
</listitem>
</orderedlist>
-
- <para>Lisez la section <xref linkend="preferred-applications"/> pour en savoir plus sur la configuration et la désactivation d'applications favorites pour Terminal.</para>
</listitem>
</varlistentry>
@@ -350,8 +348,6 @@
<para>Dans ce dernier, choisissez <guimenuitem>Rédiger un e-mail</guimenuitem> pour créer un nouveau message dans votre application de messagerie favorite.</para>
</listitem>
</orderedlist>
-
- <para>Lisez <xref linkend="preferred-applications"/> pour en savoir plus sur la configuration et la désactivation d'applications favorites pour Terminal.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -740,77 +736,12 @@
</sect1>
- <sect1 id="preferred-applications">
- <title>Applications favorites</title>
-
- <para>À partir de la version 0.2.4, @PACKAGE_NAME@ vous offre la possibilité d'ouvrir des liens internet ou composer des messages électroniques avec vos applications favorites. Cette section vous décris comment configurer quel navigateur internet ou quelle messagerie utiliser pour ces actions (lire <xref linkend="usage_to-work-with-contents-of-terminal-windows"/> pour de plus amples explications concernant les liens internet et la compositions de messages électroniques).</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-edit-applications.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Applications</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>Pour configurer vos applications favorites dans @PACKAGE_NAME@, choisissez <menuchoice><guimenu>Editer</guimenu><guimenuitem>Applications...</guimenuitem></menuchoice> de la barre de menu. Ceci ouvrira la fenêtre de configuration des <guilabel>Applications favorites</guilabel>.</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-dialog.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Applications favorites</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>Cette fenêtre permet de sélectionner le navigateur internet pour les liens hypertexte et l'assistant de messagerie pour le courrier électronique. Cliquez sur les boutons pour faire apparaître une liste déroulante d'où vous pouvez changer les applications.</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-menu.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Choisir l'application préférée</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>Vous pouvez choisir de désactiver la fonction d'ouverture de liens internet et de composition de courrier électronique en choisissant <guimenuitem>Désactiver cette fonction</guimenuitem>.</para>
-
- <para>Dans la liste déroulante vous trouverez toutes les applications détectées automatiquement. Choisissez <guimenuitem>Autre...</guimenuitem> au cas où votre application favorite ne ferait pas partie de la liste ou si vous voulez ajouter des options à l'exécution de la commande (Utilisez <parameter>%u</parameter> pour représenter l'URL lors de l'exécution, e.g. <command>navigateur --newtab %u</command>). Ceci fera apparaître une fenêtre vous permettant d'entrer la commande de votre application.</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-choose-custom-webbrowser.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>Choisir un navigateur Web personnel</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>Vous pouvez soit entrer le nom de l'application ou le chemin d'accès complet de l'exécutable de l'application, pour autant que l'application est installée dans un chemin de recherche du système, ou presser le bouton <guibutton>Naviguer...</guibutton> pour "naviguer" jusqu'à votre application.</para>
- </sect1>
-
-
<sect1 id="advanced">
<title>Configuration avancée</title>
<sect2 id="command-line-options">
<title>Options en ligne de commande</title>
- <para>Lorsque @PACKAGE_NAME@ est lancé depuis la ligne de commande ou depuis un lanceur du panneau, plusieurs options peuvent être spécifiées pour modifié le comportement.</para>
+ <para>Lorsque @PACKAGE_NAME@ est lancé depuis la ligne de commande ou depuis un lanceur du panneau Xfce, plusieurs options peuvent être spécifiées pour modifier le comportement.</para>
<variablelist>
<varlistentry>
@@ -830,7 +761,7 @@
<varlistentry>
<term><option>--disable-server</option></term>
<listitem>
- <para>Ne pas utiliser D-BUS</para>
+ <para>Ne pas utiliser le service D-BUS</para>
</listitem>
</varlistentry>
@@ -865,7 +796,7 @@
<varlistentry>
<term><option>--hold</option></term>
<listitem>
- <para>Ne supprime pas le terminal lorsque le commande est terminée</para>
+ <para>Ne ferme pas le terminal lorsque la commande exécutée se termine</para>
</listitem>
</varlistentry>
@@ -886,7 +817,7 @@
<varlistentry>
<term><option>--role</option> <parameter>rôle</parameter></term>
<listitem>
- <para>Spécifie le rôle de la dernière fenêtre à <parameter>rôle</parameter>. S'applique seulement à une fenêtre et peut être appliqué à chaque fenêtre que vous créez depuis la ligne de commande. C'est principalement utilisé pour la gestion d'une session à l'intérieur de @PACKAGE_NAME at .</para>
+ <para>Spécifie le rôle de la dernière fenêtre à <parameter>rôle</parameter>. S'applique seulement à une fenêtre et peut être appliquée à chaque fenêtre que vous créez depuis la ligne de commande. C'est principalement utilisé en interne pour la gestion d'une session de @PACKAGE_NAME at .</para>
</listitem>
</varlistentry>
@@ -900,68 +831,68 @@
<varlistentry>
<term><option>--fullscreen</option></term>
<listitem>
- <para>Passe la dernière fenêtre en mode plein écran. S'applique uniquement à une fenêtre et peut être appliqué à chaque fenêtre que vous créez depuis la ligne de commande.</para>
+ <para>Passe la dernière fenêtre en mode plein écran. S'applique uniquement à une fenêtre et peut être appliquée à chaque fenêtre que vous créez depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--show-menubar</option></term>
<listitem>
- <para>Affiche la barre de menu pour la dernière fenêtre. Peut être spécifié pour chaque nouvelle fenêtre créée depuis la ligne de commande.</para>
+ <para>Affiche la barre de menu pour la dernière fenêtre. Peut être spécifiée pour chaque nouvelle fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--hide-menubar</option></term>
<listitem>
- <para>Affiche la barre de menu pour la dernière fenêtre. Peut être spécifié pour chaque nouvelle fenêtre créée depuis la ligne de commande.</para>
+ <para>Affiche la barre de menu pour la dernière fenêtre. Peut être spécifiée pour chaque nouvelle fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--show-borders</option></term>
<listitem>
- <para>Affiche la décoration de la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifié pour chaque fenêtre créée depuis la ligne de commande.</para>
+ <para>Affiche la décoration de la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifiée pour chaque fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--hide-borders</option></term>
<listitem>
- <para>Cache la décoration de la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifié pour chaque fenêtre créée depuis la ligne de commande.</para>
+ <para>Cache la décoration de la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifiée pour chaque fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--show-toolbars</option></term>
<listitem>
- <para>Affiche la barre d'outils pour la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifié pour chaque fenêtre créée depuis la ligne de commande.</para>
+ <para>Affiche la barre d'outils pour la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifiée pour chaque fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--hide-toolbars</option></term>
<listitem>
- <para>Cache la barre d'outils pour la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifié pour chaque fenêtre créée depuis la ligne de commande.</para>
+ <para>Cache la barre d'outils pour la dernière fenêtre. S'applique seulement à une fenêtre et peut être spécifiée pour chaque fenêtre créée depuis la ligne de commande.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--tab</option></term>
<listitem>
- <para>Ouvre un nouvel onglet dans la dernière fenêtre. Cette option peut être spécifié plus d'une fois.</para>
+ <para>Ouvre un nouvel onglet dans la dernière fenêtre. Cette option peut être spécifiée plus d'une fois.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--window</option></term>
<listitem>
- <para>Ouvre une nouvelle fenêtre avec seulement un onglet. Cette option peut être spécifié plus d'une fois.</para>
+ <para>Ouvre une nouvelle fenêtre avec seulement un onglet. Cette option peut être spécifiée plus d'une fois.</para>
</listitem>
</varlistentry>
</variablelist>
- <para>Par exemple, si vous voulez ouvrir un nouveau terminal avec deux onglets, où le premier exécuterais <command>mutt</command> et le second <command>mc</command>, et que la fenêtre aurait une géométrie de 80 colonnes par 40 lignes, alors la commande à exécuter @PACKAGE_NAME@ serait :</para>
+ <para>Par exemple, si vous voulez ouvrir un nouveau terminal avec deux onglets, où le premier exécuterait <command>mutt</command> et le second <command>mc</command>, et que la fenêtre aurait une géométrie de 80 colonnes par 40 lignes, alors la commande à exécuter pour @PACKAGE_NAME@ serait :</para>
<screen>Terminal --geometry 80x40 --command mutt --tab --command mc</screen>
@@ -970,7 +901,7 @@
<sect2 id="files-and-env-vars">
<title>Fichiers et Variables d'environnements</title>
- <para>@PACKAGE_NAME@ utilise les spécifications Basedir qui sont définies par <ulink url="http://freedesktop.org/" type="http">Freedesktop.org</ulink> afin de localiser ses données et ses fichiers de configurations. Cela signifie que les chemins vers les fichiers seront spécifiés de manière relative par rapport aux répertoires décrits dans les spécifications.</para>
+ <para>@PACKAGE_NAME@ utilise les spécifications Basedir qui sont définies par <ulink url="http://freedesktop.org/" type="http">Freedesktop.org</ulink> afin de localiser ses données et ses fichiers de configurations. Cela signifie que les chemins vers les fichiers seront spécifiés de manière relatives par rapport aux répertoires décrits dans les spécifications.</para>
<variablelist>
<varlistentry>
@@ -1039,15 +970,16 @@
MiscInheritGeometry=TRUE
MiscMouseAutohide=FALSE
MiscTabCloseButtons=TRUE
-MiscTabPosition=GTK_POS_TOP</programlisting>
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE</programlisting>
- <para>en plus de toutes les options qui sont contrôler depuis la fenêtre des préférences.</para>
+ <para>en plus de toutes les options qui sont contrôlées depuis la fenêtre des préférences.</para>
<variablelist>
<varlistentry>
<term><varname>MiscAlwaysShowTabs</varname></term>
<listitem>
- <para>Si <literal>TRUE</literal> alors l'en-tête des onglets est toujours visible même avec un unique onglet. Cette option est utile si vous ne désirez pas que la fenêtre de votre terminal soit redimensionnée lorsque vous ouvrez un second onglet. Désactivée par défaut.</para>
+ <para>Si <literal>TRUE</literal> alors l'en-tête des onglets est toujours visible même avec un unique onglet. Cette option est utile si vous désirez que la fenêtre de votre terminal ne soit pas redimensionnée lorsque vous ouvrez un second onglet. Désactivée par défaut.</para>
</listitem>
</varlistentry>
@@ -1113,6 +1045,19 @@
<para>Spécifie la position de l'en-tête onglets dans la fenêtre. Peut être <literal>GTK_POS_TOP</literal> (par défaut), <literal>GTK_POS_LEFT</literal>, <literal>GTK_POS_BOTTOM</literal> ou <literal>GTK_POS_RIGHT</literal>. Si vous spécifiez <literal>GTK_POS_LEFT</literal> ou <literal>GTK_POS_RIGHT</literal>, alors le texte dans les onglets sera affiché verticalement au lieu d'horizontalement. Il est vivement recommandé de désactiver <varname>MiscTabCloseButtons</varname> pour les valeurs <literal>GTK_POS_LEFT</literal> et <literal>GTK_POS_RIGHT</literal>.</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>MiscHighlightUrls</varname></term>
+ <listitem>
+ <para>
+ This setting controls whether URLs - both hyperlinks and email addresses - will
+ be highlighted in the text displayed in a terminal window. If you change this
+ option to <literal>FALSE</literal>, URLs won't be highlighted anymore and you
+ will no longer be able to middle-click the URL to open it in the preferred
+ application.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</sect2>
</sect1>
Modified: terminal/trunk/doc/ja/Terminal.xml.in
===================================================================
--- terminal/trunk/doc/ja/Terminal.xml.in 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/doc/ja/Terminal.xml.in 2007-07-20 16:54:48 UTC (rev 25929)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY date "April 2006">
+<!ENTITY date "October 2006">
<!ENTITY version "@PACKAGE_VERSION@">
<!ENTITY application "@PACKAGE_NAME@">
]>
@@ -299,7 +299,11 @@
<para>テキストをクリップボードへコピーしてあるのなら、以下の動作の一つを実行してターミナルにそのテキストを貼り付けることができます:</para>
<itemizedlist>
<listitem>
- <para>選択してコピーしたテキストを貼り付けるだけでしたら、コマンドプロンプトの所でミドルクリックしてください。マウスが3ボタン式でないのなら、X サーバーの文書を参考にしてください。マウスの中央ボタンのエミュレート方法に関する情報があると思います。</para>
+ <para>To paste text that you copied by selection only, middle-click at the
+ command prompt. If you do not have a middle mouse button, refer to the X
+ Server documentation for information about how to emulate the middle mouse button.
+ This is equivalent to using the <menuchoice><guimenuitem>Paste Selection</guimenuitem></menuchoice>
+ item from <menuchoice><guimenu>Edit</guimenu></menuchoice> menu.</para>
</listitem>
<listitem>
<para>明示的にコピーしたテキストを貼り付けるには、<menuchoice><guimenu>編集</guimenu><guimenuitem>貼り付け</guimenuitem></menuchoice>を選びます。</para>
@@ -329,8 +333,6 @@
<para>そこから<guimenuitem>リンクを開く</guimenuitem>を選ぶと、お気に入りのウェブブラウザーが起動してその URL にあるファイルを表示します。</para>
</listitem>
</orderedlist>
-
- <para>Terminalで使用されるお気に入りのウェブブラウザーの設定方法やこの機能を無効にするやり方は<xref linkend="preferred-applications"/>を御覧ください。</para>
</listitem>
</varlistentry>
@@ -350,8 +352,6 @@
<para>そこから<guimenuitem>メールを編集</guimenuitem>を選ぶと、お気に入りのメーラーでメールを編集できます。</para>
</listitem>
</orderedlist>
-
- <para>Terminalで使用されるお気に入りのメーラーの設定方法やこの機能を無効にするやり方は<xref linkend="preferred-applications"/>を御覧ください。</para>
</listitem>
</varlistentry>
</variablelist>
@@ -740,71 +740,6 @@
</sect1>
- <sect1 id="preferred-applications">
- <title>お気に入りのアプリ</title>
-
- <para>バージョン 0.2.4 の時点で、@PACKAGE_NAME@ は外部のウェブブラウザーおよびメーラーを利用して、ハイパーリンクを開いたり、メールを編集することができます。この章では利用したいウェブブラウザーやメーラーの設定方法について説明します (ハイパーリンクへのアクセスやメール編集方法に関する詳細は<xref linkend="usage_to-work-with-contents-of-terminal-windows"/>を御覧ください)。</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-edit-applications.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>アプリケーション</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>@PACKAGE_NAME@ で使用される外部アプリケーションを設定するには、メインのメニューバーから<menuchoice><guimenu>編集</guimenu><guimenuitem>アプリケーション...</guimenuitem></menuchoice>を選択してください。ダイアログ<guilabel>アプリケーション</guilabel>が現れます。</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-dialog.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>お気に入りのアプリ</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>このダイアログで、ハイパーリンクを開くのに使用されるウェブブラウザーや、メールの編集に使われるメーラーを選びます。設定を変更するにはボタンをクリックしてください。これでドロップダウンメニューが表示されます。</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-applications-menu.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>お気に入りのアプリを選択してください</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>メニュー<guilabel>ウェブブラウザー</guilabel>で<guimenuitem>この機能を無効にする</guimenuitem>を選ぶと、@PACKAGE_NAME@ からハイパーリンクを開くことはできなくなります。同様に、<guilabel>メーラー</guilabel>メニューで<guimenuitem>この機能を無効にする</guimenuitem>を選択すると @PACKAGE_NAME@ からはメールを編集できなくなります。</para>
-
- <para>次に選択可能な標準アプリケーションの一覧がメニューに表示されます、これはあなたのシステムで自動的に検出されます。この標準アプリケーションのリストにあなたのお気に入りのアプリケーションが存在しなかったり、特定の引数を渡してアプリケーションを実行させたい (<parameter>%u</parameter> は実行時に URL で置き換えられます、例 <command>browser --newtab %u</command>) のでしたら、<guimenuitem>その他...</guimenuitem>を選びます。これで指定アプリケーションを入力するためのダイアログが現れます。</para>
-
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/terminal-choose-custom-webbrowser.png" format="PNG"/>
- </imageobject>
-
- <textobject>
- <phrase>ウェブブラウザーを選択してください</phrase>
- </textobject>
- </mediaobject>
- </screenshot>
-
- <para>システムの検索パスにそのアプリケーションがインストールされているかどうかによりますが、アプリケーションのバイナリー名かその完全なパスのどちらかを入力できます。あるいは<guibutton>参照...</guibutton>というラベルが付いているボタンを押して、アプリケーションのバイナリーを目で見ながら選択することも可能です。</para>
- </sect1>
-
-
<sect1 id="advanced">
<title>上級者向けの話題</title>
<sect2 id="command-line-options">
@@ -1039,7 +974,8 @@
MiscInheritGeometry=TRUE
MiscMouseAutohide=FALSE
MiscTabCloseButtons=TRUE
-MiscTabPosition=GTK_POS_TOP</programlisting>
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE</programlisting>
<para>これに環境設定ダイアログから変更するオプション全てがプラスされます。</para>
@@ -1113,6 +1049,19 @@
<para>どこにタブヘッダーが表示されるかを指定します。これは <literal>GTK_POS_TOP</literal> (標準)、<literal>GTK_POS_LEFT</literal>, <literal>GTK_POS_BOTTOM</literal> あるいは <literal>GTK_POS_RIGHT</literal> のいずれかになります。ここに <literal>GTK_POS_LEFT</literal> または <literal>GTK_POS_RIGHT</literal> を指定すると、タブヘッダーは横ではなく縦に表示されます。<literal>GTK_POS_LEFT</literal> および <literal>GTK_POS_RIGHT</literal> に対しては <varname>MiscTabCloseButtons</varname> を無効にすることを推奨します。</para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>MiscHighlightUrls</varname></term>
+ <listitem>
+ <para>
+ This setting controls whether URLs - both hyperlinks and email addresses - will
+ be highlighted in the text displayed in a terminal window. If you change this
+ option to <literal>FALSE</literal>, URLs won't be highlighted anymore and you
+ will no longer be able to middle-click the URL to open it in the preferred
+ application.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</sect2>
</sect1>
Modified: terminal/trunk/icons/48x48/Makefile.am
===================================================================
--- terminal/trunk/icons/48x48/Makefile.am 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/icons/48x48/Makefile.am 2007-07-20 16:54:48 UTC (rev 25929)
@@ -11,9 +11,7 @@
stock_terminal-colors.png \
stock_terminal-compose.png \
stock_terminal-general.png \
- stock_terminal-mailreader.png \
- stock_terminal-shortcuts.png \
- stock_terminal-webbrowser.png
+ stock_terminal-shortcuts.png
EXTRA_DIST = \
$(apps_DATA) \
Deleted: terminal/trunk/icons/48x48/stock_terminal-mailreader.png
Deleted: terminal/trunk/icons/48x48/stock_terminal-webbrowser.png
Modified: terminal/trunk/po/ChangeLog
===================================================================
--- terminal/trunk/po/ChangeLog 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/po/ChangeLog 2007-07-20 16:54:48 UTC (rev 25929)
@@ -1,5 +1,11 @@
2007-07-20 Benedikt Meurer <benny at xfce.org>
+ * POTFILES.in: Update list of translatable files.
+ * Terminal.pot, *.po: Merge new strings.
+ * de.po: Update german translations.
+
+2007-07-20 Benedikt Meurer <benny at xfce.org>
+
* Terminal.pot, *.po: Update translations.
2007-07-14 Daichi Kawahata <daichi at xfce.org>
Modified: terminal/trunk/po/POTFILES.in
===================================================================
--- terminal/trunk/po/POTFILES.in 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/po/POTFILES.in 2007-07-20 16:54:48 UTC (rev 25929)
@@ -3,8 +3,7 @@
terminal/terminal-app.c
terminal/terminal-dbus.c
terminal/terminal-dialogs.c
-terminal/terminal-helper-dialog.c
-terminal/terminal-helper.c
+terminal/terminal-gtk-extensions.c
terminal/terminal-image-loader.c
terminal/terminal-options.c
terminal/terminal-preferences-dialog.c
@@ -18,21 +17,3 @@
terminal/terminal-window.c
# files added by intltool-prepare
Terminal.desktop.in
-helpers/balsa.desktop.in
-helpers/epiphany.desktop.in
-helpers/evolution.desktop.in
-helpers/exo-open-browser.desktop.in
-helpers/exo-open-mailer.desktop.in
-helpers/firefox.desktop.in
-helpers/galeon.desktop.in
-helpers/kmail.desktop.in
-helpers/konqueror.desktop.in
-helpers/lynx.desktop.in
-helpers/mozilla-browser.desktop.in
-helpers/mozilla-mailer.desktop.in
-helpers/mutt.desktop.in
-helpers/opera-browser.desktop.in
-helpers/opera-mailer.desktop.in
-helpers/sensible-browser.desktop.in
-helpers/sylpheed-claws.desktop.in
-helpers/thunderbird.desktop.in
Modified: terminal/trunk/po/Terminal.pot
===================================================================
--- terminal/trunk/po/Terminal.pot 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/po/Terminal.pot 2007-07-20 16:54:48 UTC (rev 25929)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 17:37+0200\n"
+"POT-Creation-Date: 2007-07-20 18:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -176,8 +176,8 @@
" directory"
msgstr ""
-#: ../terminal/main.c:140 ../terminal/terminal-preferences.c:1221
-#: ../terminal/terminal-shortcut-editor.c:122 ../Terminal.desktop.in.h:1
+#: ../terminal/main.c:140 ../terminal/terminal-preferences.c:1197
+#: ../terminal/terminal-shortcut-editor.c:121 ../Terminal.desktop.in.h:1
msgid "Terminal"
msgstr ""
@@ -237,93 +237,6 @@
msgid "Failed to open the documentation browser"
msgstr ""
-#: ../terminal/terminal-helper-dialog.c:52
-msgid "Web Browser"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:53
-msgid "Mail Reader"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:58
-msgid ""
-"Choose your preferred Web Browser. The preferred\n"
-"Web Browser opens when you right-click on a URL\n"
-"and select Open Link from the context menu."
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:61
-msgid ""
-"Choose your preferred Mail Reader. The preferred\n"
-"Mail Reader opens when you right-click on an email\n"
-"address and select Compose Email from the context\n"
-"menu."
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:167
-msgid ""
-"Click here to change the selected application or to disable this feature."
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:310
-msgid "Select application"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:348
-msgid "Choose a custom Web Browser"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:349
-msgid "Choose a custom Mail Reader"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:354
-msgid ""
-"Specify the application you want to use as\n"
-"Web Browser in Terminal:"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:355
-msgid ""
-"Specify the application you want to use as\n"
-"Mail Reader in Terminal:"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:430
-msgid "_Browse..."
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:529
-msgid "Disable this feature"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:570
-msgid "Other..."
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:610
-#: ../terminal/terminal-preferences-dialog.c:328
-#: ../terminal/terminal-preferences.c:395
-#: ../terminal/terminal-preferences.c:406
-#: ../terminal/terminal-preferences.c:417
-#: ../terminal/terminal-preferences.c:428
-#: ../terminal/terminal-preferences.c:439
-#: ../terminal/terminal-preferences.c:461
-#: ../terminal/terminal-preferences.c:472
-#: ../terminal/terminal-preferences.c:483
-#: ../terminal/terminal-shortcut-editor.c:210
-#: ../terminal/terminal-shortcut-editor.c:393
-msgid "Disabled"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:627
-msgid "No application selected"
-msgstr ""
-
-#: ../terminal/terminal-helper-dialog.c:777
-msgid "Preferred Applications"
-msgstr ""
-
#: ../terminal/terminal-options.c:107
msgid ""
"Option \"--sm-client-id\" requires specifying the session id as its parameter"
@@ -388,52 +301,52 @@
msgid "Unknown option \"%s\""
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:142
+#: ../terminal/terminal-preferences-dialog.c:140
msgid "Terminal Preferences"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:189
+#: ../terminal/terminal-preferences-dialog.c:187
msgid "<b>Title</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:202
+#: ../terminal/terminal-preferences-dialog.c:200
msgid ""
"The command running inside the terminal may dynamically set a new title."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:208
+#: ../terminal/terminal-preferences-dialog.c:206
msgid "_Initial title:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:227
+#: ../terminal/terminal-preferences-dialog.c:221
msgid "_Dynamically-set title:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:237
+#: ../terminal/terminal-preferences-dialog.c:231
msgid "Replaces initial title"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:238
+#: ../terminal/terminal-preferences-dialog.c:232
msgid "Goes before initial title"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:239
+#: ../terminal/terminal-preferences-dialog.c:233
msgid "Goes after initial title"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:240
+#: ../terminal/terminal-preferences-dialog.c:234
msgid "Isn't displayed"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:260
+#: ../terminal/terminal-preferences-dialog.c:250
msgid "<b>Command</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:269
+#: ../terminal/terminal-preferences-dialog.c:259
msgid "_Run command as login shell"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:272
+#: ../terminal/terminal-preferences-dialog.c:262
msgid ""
"Select this option to force Terminal to run your shell as a login shell when "
"you open new terminals. See the documentation of your shell for details "
@@ -441,72 +354,85 @@
"login shell."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:279
+#: ../terminal/terminal-preferences-dialog.c:269
msgid "_Update utmp/wtmp records when command is launched"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:288
+#: ../terminal/terminal-preferences-dialog.c:278
msgid "<b>Scrolling</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:303
+#: ../terminal/terminal-preferences-dialog.c:293
msgid "Sc_roll on output"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:306
+#: ../terminal/terminal-preferences-dialog.c:296
msgid ""
"This option controls whether the terminal will scroll down automatically "
"whenever new output is generated by the commands running inside the terminal."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:312
+#: ../terminal/terminal-preferences-dialog.c:302
msgid "Scroll on key_stroke"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:315
+#: ../terminal/terminal-preferences-dialog.c:305
msgid ""
"Enables you to press any key on the keyboard to scroll down the terminal "
"window to the command prompt."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:322
+#: ../terminal/terminal-preferences-dialog.c:311
msgid "_Scrollbar is:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:329
+#: ../terminal/terminal-preferences-dialog.c:317
+#: ../terminal/terminal-preferences.c:393
+#: ../terminal/terminal-preferences.c:404
+#: ../terminal/terminal-preferences.c:415
+#: ../terminal/terminal-preferences.c:426
+#: ../terminal/terminal-preferences.c:448
+#: ../terminal/terminal-preferences.c:459
+#: ../terminal/terminal-preferences.c:470
+#: ../terminal/terminal-shortcut-editor.c:209
+#: ../terminal/terminal-shortcut-editor.c:392
+msgid "Disabled"
+msgstr ""
+
+#: ../terminal/terminal-preferences-dialog.c:318
msgid "On the left side"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:330
+#: ../terminal/terminal-preferences-dialog.c:319
msgid "On the right side"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:346
+#: ../terminal/terminal-preferences-dialog.c:331
msgid "Scr_ollback:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:356
+#: ../terminal/terminal-preferences-dialog.c:341
msgid ""
"Specifies the number of lines that you can scroll back using the scrollbar."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:377
+#: ../terminal/terminal-preferences-dialog.c:357
msgid "General"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:395
+#: ../terminal/terminal-preferences-dialog.c:375
msgid "<b>Font</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:404
+#: ../terminal/terminal-preferences-dialog.c:384
msgid "Choose Terminal Font"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:409
+#: ../terminal/terminal-preferences-dialog.c:389
msgid "Enable anti-aliasing for the terminal font"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:412
+#: ../terminal/terminal-preferences-dialog.c:392
msgid ""
"Enable this option if you want Terminal to use anti-aliasing when rendering "
"text in terminal windows. Disabling this option can impressively speed up "
@@ -514,248 +440,248 @@
"systems."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:419
+#: ../terminal/terminal-preferences-dialog.c:399
msgid "Allow bold text"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:422
+#: ../terminal/terminal-preferences-dialog.c:402
msgid ""
"Enable this option to allow applications running inside the terminal windows "
"to use bold text."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:431
+#: ../terminal/terminal-preferences-dialog.c:411
msgid "<b>Background</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:441
+#: ../terminal/terminal-preferences-dialog.c:421
msgid "None (use solid color)"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:442
+#: ../terminal/terminal-preferences-dialog.c:422
msgid "Background image"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:443
+#: ../terminal/terminal-preferences-dialog.c:423
msgid "Transparent background"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:460
+#: ../terminal/terminal-preferences-dialog.c:440
msgid "_File:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:485
+#: ../terminal/terminal-preferences-dialog.c:465
msgid "_Style:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:491
+#: ../terminal/terminal-preferences-dialog.c:471
msgid "Tiled"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:492
+#: ../terminal/terminal-preferences-dialog.c:472
msgid "Centered"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:493
+#: ../terminal/terminal-preferences-dialog.c:473
msgid "Scaled"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:494
+#: ../terminal/terminal-preferences-dialog.c:474
msgid "Stretched"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:510
+#: ../terminal/terminal-preferences-dialog.c:490
msgid "Shade transparent or image background:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:523
+#: ../terminal/terminal-preferences-dialog.c:503
msgid "<small><i>None</i></small>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:534
+#: ../terminal/terminal-preferences-dialog.c:514
msgid "<small><i>Maximum</i></small>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:542
+#: ../terminal/terminal-preferences-dialog.c:522
msgid "<b>Opening New Windows</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:551
+#: ../terminal/terminal-preferences-dialog.c:531
msgid "Display _menubar in new windows"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:554
+#: ../terminal/terminal-preferences-dialog.c:534
msgid ""
"Enable this option to show the menubar in newly created terminal windows."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:559
+#: ../terminal/terminal-preferences-dialog.c:539
msgid "Display _toolbars in new windows"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:562
+#: ../terminal/terminal-preferences-dialog.c:542
msgid ""
"Enable this option to show the toolbars in newly created terminal windows."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:567
+#: ../terminal/terminal-preferences-dialog.c:547
msgid "Display _borders around new windows"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:570
+#: ../terminal/terminal-preferences-dialog.c:550
msgid ""
"Enable this option to show window decorations around newly created terminal "
"windows."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:582
+#: ../terminal/terminal-preferences-dialog.c:562
msgid "Appearance"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:600
+#: ../terminal/terminal-preferences-dialog.c:580
msgid "<b>Foreground and Background</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:612
+#: ../terminal/terminal-preferences-dialog.c:592
msgid "_Text and cursor color:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:627
+#: ../terminal/terminal-preferences-dialog.c:607
msgid "Choose terminal text color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:635
-#: ../terminal/terminal-preferences-dialog.c:650
-#: ../terminal/terminal-preferences-dialog.c:679
-#: ../terminal/terminal-preferences-dialog.c:728
+#: ../terminal/terminal-preferences-dialog.c:615
+#: ../terminal/terminal-preferences-dialog.c:630
+#: ../terminal/terminal-preferences-dialog.c:659
+#: ../terminal/terminal-preferences-dialog.c:708
msgid "Color Selector"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:636
-#: ../terminal/terminal-preferences-dialog.c:651
-#: ../terminal/terminal-preferences-dialog.c:680
-#: ../terminal/terminal-preferences-dialog.c:729
+#: ../terminal/terminal-preferences-dialog.c:616
+#: ../terminal/terminal-preferences-dialog.c:631
+#: ../terminal/terminal-preferences-dialog.c:660
+#: ../terminal/terminal-preferences-dialog.c:709
msgid "Open a dialog to specify the color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:642
+#: ../terminal/terminal-preferences-dialog.c:622
msgid "Choose terminal cursor color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:658
+#: ../terminal/terminal-preferences-dialog.c:638
msgid "_Background color:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:670
+#: ../terminal/terminal-preferences-dialog.c:650
msgid "Choose terminal background color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:690
+#: ../terminal/terminal-preferences-dialog.c:670
msgid "<b>Text Selection</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:701
+#: ../terminal/terminal-preferences-dialog.c:681
msgid "Use _default color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:704
+#: ../terminal/terminal-preferences-dialog.c:684
msgid "Use the default text selection background color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:709
+#: ../terminal/terminal-preferences-dialog.c:689
msgid "Use _custom color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:712
+#: ../terminal/terminal-preferences-dialog.c:692
msgid "Use a custom text selection background color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:720
+#: ../terminal/terminal-preferences-dialog.c:700
msgid "Choose terminal text selection background color"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:739
+#: ../terminal/terminal-preferences-dialog.c:719
msgid "<b>Palette</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:749
+#: ../terminal/terminal-preferences-dialog.c:729
msgid "Terminal applications have this color palette available to them:"
msgstr ""
#. setup a tooltip
-#: ../terminal/terminal-preferences-dialog.c:771
+#: ../terminal/terminal-preferences-dialog.c:751
#, c-format
msgid "Palette entry %d"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:788
+#: ../terminal/terminal-preferences-dialog.c:766
msgid "Colors"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:806
+#: ../terminal/terminal-preferences-dialog.c:784
msgid "<b>Shortcut keys</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:832
+#: ../terminal/terminal-preferences-dialog.c:810
msgid "<b>Menubar access</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:841
+#: ../terminal/terminal-preferences-dialog.c:819
msgid "Disable all me_nu access keys (such as Alt+f)"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:846
+#: ../terminal/terminal-preferences-dialog.c:824
msgid "Disable m_enu shortcut key (F10 by default)"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:858
+#: ../terminal/terminal-preferences-dialog.c:836
msgid "Shortcuts"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:876
+#: ../terminal/terminal-preferences-dialog.c:854
msgid "<b>Compatibility</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:887
+#: ../terminal/terminal-preferences-dialog.c:865
msgid ""
"These options may cause some applications to behave incorrectly. They are "
"only here to allow you to work around certain applications and operating "
"systems that expect different terminal behavior."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:895
+#: ../terminal/terminal-preferences-dialog.c:873
msgid "_Backspace key generates:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:901
-#: ../terminal/terminal-preferences-dialog.c:926
+#: ../terminal/terminal-preferences-dialog.c:879
+#: ../terminal/terminal-preferences-dialog.c:900
msgid "Auto-detect"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:902
-#: ../terminal/terminal-preferences-dialog.c:927
+#: ../terminal/terminal-preferences-dialog.c:880
+#: ../terminal/terminal-preferences-dialog.c:901
msgid "ASCII DEL"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:903
-#: ../terminal/terminal-preferences-dialog.c:928
+#: ../terminal/terminal-preferences-dialog.c:881
+#: ../terminal/terminal-preferences-dialog.c:902
msgid "Escape sequence"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:904
-#: ../terminal/terminal-preferences-dialog.c:929
+#: ../terminal/terminal-preferences-dialog.c:882
+#: ../terminal/terminal-preferences-dialog.c:903
msgid "Control-H"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:920
+#: ../terminal/terminal-preferences-dialog.c:894
msgid "_Delete key generates:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:945
+#: ../terminal/terminal-preferences-dialog.c:915
msgid "<tt>$TERM</tt> setting:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:952
+#: ../terminal/terminal-preferences-dialog.c:923
msgid ""
"This specifies the value the $TERM environment variable is set to, when a "
"new terminal tab or terminal window is opened. The default should be ok for "
@@ -763,190 +689,185 @@
"xterm-color here."
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:972
+#: ../terminal/terminal-preferences-dialog.c:939
msgid "_Reset compatibility options to defaults"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:982
+#: ../terminal/terminal-preferences-dialog.c:949
msgid "<b>Double click</b>"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:991
+#: ../terminal/terminal-preferences-dialog.c:958
msgid "Consider the following characters part of a word when double clicking:"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:1017
+#: ../terminal/terminal-preferences-dialog.c:980
msgid "Advanced"
msgstr ""
#. allocate the file chooser window
-#: ../terminal/terminal-preferences-dialog.c:1077
+#: ../terminal/terminal-preferences-dialog.c:1039
msgid "Select background image file"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:1090
+#: ../terminal/terminal-preferences-dialog.c:1052
msgid "All Files"
msgstr ""
-#: ../terminal/terminal-preferences-dialog.c:1096
+#: ../terminal/terminal-preferences-dialog.c:1058
msgid "Image Files"
msgstr ""
-#: ../terminal/terminal-preferences.c:305
-#: ../terminal/terminal-preferences.c:306
+#: ../terminal/terminal-preferences.c:303
+#: ../terminal/terminal-preferences.c:304
msgid "Open Tab"
msgstr ""
-#: ../terminal/terminal-preferences.c:316
-#: ../terminal/terminal-preferences.c:317
+#: ../terminal/terminal-preferences.c:314
+#: ../terminal/terminal-preferences.c:315
msgid "Open Terminal"
msgstr ""
-#: ../terminal/terminal-preferences.c:327
-#: ../terminal/terminal-preferences.c:328
+#: ../terminal/terminal-preferences.c:325
+#: ../terminal/terminal-preferences.c:326
msgid "Detach Tab"
msgstr ""
-#: ../terminal/terminal-preferences.c:338
-#: ../terminal/terminal-preferences.c:339
+#: ../terminal/terminal-preferences.c:336
+#: ../terminal/terminal-preferences.c:337
msgid "Close Tab"
msgstr ""
-#: ../terminal/terminal-preferences.c:349
-#: ../terminal/terminal-preferences.c:350
+#: ../terminal/terminal-preferences.c:347
+#: ../terminal/terminal-preferences.c:348
msgid "Close Window"
msgstr ""
-#: ../terminal/terminal-preferences.c:360
-#: ../terminal/terminal-preferences.c:361
+#: ../terminal/terminal-preferences.c:358
+#: ../terminal/terminal-preferences.c:359
msgid "Copy"
msgstr ""
-#: ../terminal/terminal-preferences.c:371
-#: ../terminal/terminal-preferences.c:372
+#: ../terminal/terminal-preferences.c:369
+#: ../terminal/terminal-preferences.c:370
msgid "Paste"
msgstr ""
-#: ../terminal/terminal-preferences.c:382
-#: ../terminal/terminal-preferences.c:383
+#: ../terminal/terminal-preferences.c:380
+#: ../terminal/terminal-preferences.c:381
msgid "Paste Selection"
msgstr ""
-#: ../terminal/terminal-preferences.c:393
-#: ../terminal/terminal-preferences.c:394
-msgid "Applications"
-msgstr ""
-
-#: ../terminal/terminal-preferences.c:404
-#: ../terminal/terminal-preferences.c:405
+#: ../terminal/terminal-preferences.c:391
+#: ../terminal/terminal-preferences.c:392
msgid "Preferences"
msgstr ""
-#: ../terminal/terminal-preferences.c:415
-#: ../terminal/terminal-preferences.c:416
+#: ../terminal/terminal-preferences.c:402
+#: ../terminal/terminal-preferences.c:403
msgid "Show menubar"
msgstr ""
-#: ../terminal/terminal-preferences.c:426
-#: ../terminal/terminal-preferences.c:427
+#: ../terminal/terminal-preferences.c:413
+#: ../terminal/terminal-preferences.c:414
msgid "Show toolbars"
msgstr ""
-#: ../terminal/terminal-preferences.c:437
-#: ../terminal/terminal-preferences.c:438
+#: ../terminal/terminal-preferences.c:424
+#: ../terminal/terminal-preferences.c:425
msgid "Show borders"
msgstr ""
-#: ../terminal/terminal-preferences.c:448
-#: ../terminal/terminal-preferences.c:449
+#: ../terminal/terminal-preferences.c:435
+#: ../terminal/terminal-preferences.c:436
msgid "Fullscreen"
msgstr ""
-#: ../terminal/terminal-preferences.c:459
-#: ../terminal/terminal-preferences.c:460
+#: ../terminal/terminal-preferences.c:446
+#: ../terminal/terminal-preferences.c:447
msgid "Set Title"
msgstr ""
-#: ../terminal/terminal-preferences.c:470
-#: ../terminal/terminal-preferences.c:471
+#: ../terminal/terminal-preferences.c:457
+#: ../terminal/terminal-preferences.c:458
msgid "Reset"
msgstr ""
-#: ../terminal/terminal-preferences.c:481
-#: ../terminal/terminal-preferences.c:482
+#: ../terminal/terminal-preferences.c:468
+#: ../terminal/terminal-preferences.c:469
msgid "Reset and Clear"
msgstr ""
-#: ../terminal/terminal-preferences.c:492
-#: ../terminal/terminal-preferences.c:493
+#: ../terminal/terminal-preferences.c:479
+#: ../terminal/terminal-preferences.c:480
msgid "Previous Tab"
msgstr ""
-#: ../terminal/terminal-preferences.c:503
-#: ../terminal/terminal-preferences.c:504
+#: ../terminal/terminal-preferences.c:490
+#: ../terminal/terminal-preferences.c:491
msgid "Next Tab"
msgstr ""
-#: ../terminal/terminal-preferences.c:514
-#: ../terminal/terminal-preferences.c:515
+#: ../terminal/terminal-preferences.c:501
+#: ../terminal/terminal-preferences.c:502
msgid "Switch to Tab 1"
msgstr ""
-#: ../terminal/terminal-preferences.c:525
-#: ../terminal/terminal-preferences.c:526
+#: ../terminal/terminal-preferences.c:512
+#: ../terminal/terminal-preferences.c:513
msgid "Switch to Tab 2"
msgstr ""
-#: ../terminal/terminal-preferences.c:536
-#: ../terminal/terminal-preferences.c:537
+#: ../terminal/terminal-preferences.c:523
+#: ../terminal/terminal-preferences.c:524
msgid "Switch to Tab 3"
msgstr ""
-#: ../terminal/terminal-preferences.c:547
-#: ../terminal/terminal-preferences.c:548
+#: ../terminal/terminal-preferences.c:534
+#: ../terminal/terminal-preferences.c:535
msgid "Switch to Tab 4"
msgstr ""
-#: ../terminal/terminal-preferences.c:558
-#: ../terminal/terminal-preferences.c:559
+#: ../terminal/terminal-preferences.c:545
+#: ../terminal/terminal-preferences.c:546
msgid "Switch to Tab 5"
msgstr ""
-#: ../terminal/terminal-preferences.c:569
-#: ../terminal/terminal-preferences.c:570
+#: ../terminal/terminal-preferences.c:556
+#: ../terminal/terminal-preferences.c:557
msgid "Switch to Tab 6"
msgstr ""
-#: ../terminal/terminal-preferences.c:580
-#: ../terminal/terminal-preferences.c:581
+#: ../terminal/terminal-preferences.c:567
+#: ../terminal/terminal-preferences.c:568
msgid "Switch to Tab 7"
msgstr ""
-#: ../terminal/terminal-preferences.c:591
-#: ../terminal/terminal-preferences.c:592
+#: ../terminal/terminal-preferences.c:578
+#: ../terminal/terminal-preferences.c:579
msgid "Switch to Tab 8"
msgstr ""
-#: ../terminal/terminal-preferences.c:602
-#: ../terminal/terminal-preferences.c:603
+#: ../terminal/terminal-preferences.c:589
+#: ../terminal/terminal-preferences.c:590
msgid "Switch to Tab 9"
msgstr ""
-#: ../terminal/terminal-preferences.c:613
-#: ../terminal/terminal-preferences.c:614
+#: ../terminal/terminal-preferences.c:600
+#: ../terminal/terminal-preferences.c:601
msgid "Contents"
msgstr ""
-#: ../terminal/terminal-screen.c:455
+#: ../terminal/terminal-screen.c:432
msgid "Unable to determine your login shell."
msgstr ""
#. tell the user that we were unable to execute the command
-#: ../terminal/terminal-screen.c:994
+#: ../terminal/terminal-screen.c:957
msgid "Failed to execute child"
msgstr ""
-#: ../terminal/terminal-screen.c:1231
+#: ../terminal/terminal-screen.c:1194
msgid "Untitled"
msgstr ""
@@ -958,51 +879,51 @@
msgid "Edit"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:112
+#: ../terminal/terminal-shortcut-editor.c:111
msgid "View"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:131
+#: ../terminal/terminal-shortcut-editor.c:130
msgid "Go"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:148
+#: ../terminal/terminal-shortcut-editor.c:147
msgid "Help"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:229
+#: ../terminal/terminal-shortcut-editor.c:228
msgid "Action"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:236
+#: ../terminal/terminal-shortcut-editor.c:235
msgid "Shortcut key"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:335
+#: ../terminal/terminal-shortcut-editor.c:334
msgid "Compose shortcut"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:354
+#: ../terminal/terminal-shortcut-editor.c:353
msgid "Compose shortcut for:"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:376
+#: ../terminal/terminal-shortcut-editor.c:375
msgid "Failed to acquire keyboard"
msgstr ""
-#: ../terminal/terminal-shortcut-editor.c:378
+#: ../terminal/terminal-shortcut-editor.c:377
msgid "Another application has already acquired control over your keyboard."
msgstr ""
-#: ../terminal/terminal-tab-header.c:207
+#: ../terminal/terminal-tab-header.c:203
msgid "Close this tab"
msgstr ""
-#: ../terminal/terminal-tab-header.c:332 ../terminal/terminal-window.c:207
+#: ../terminal/terminal-tab-header.c:327 ../terminal/terminal-window.c:201
msgid "_Detach Tab"
msgstr ""
-#: ../terminal/terminal-tab-header.c:337 ../terminal/terminal-window.c:208
+#: ../terminal/terminal-tab-header.c:332 ../terminal/terminal-window.c:202
msgid "C_lose Tab"
msgstr ""
@@ -1010,362 +931,274 @@
msgid "Toolbar Editor"
msgstr ""
-#: ../terminal/terminal-widget.c:323
+#: ../terminal/terminal-widget.c:299
msgid "Copy Email Address"
msgstr ""
-#: ../terminal/terminal-widget.c:324
+#: ../terminal/terminal-widget.c:300
msgid "Compose Email"
msgstr ""
-#: ../terminal/terminal-widget.c:328
+#: ../terminal/terminal-widget.c:304
msgid "Copy Link Address"
msgstr ""
-#: ../terminal/terminal-widget.c:329
+#: ../terminal/terminal-widget.c:305
msgid "Open Link"
msgstr ""
-#: ../terminal/terminal-widget.c:483
+#: ../terminal/terminal-widget.c:459
#, c-format
msgid ""
"Unable to drop selection of type text/plain to terminal: Wrong format (%d) "
"or length (%d)\n"
msgstr ""
-#: ../terminal/terminal-widget.c:499
+#: ../terminal/terminal-widget.c:475
#, c-format
msgid ""
"Unable to drop Mozilla URL on terminal: Wrong format (%d) or length (%d)\n"
msgstr ""
-#: ../terminal/terminal-widget.c:525
+#: ../terminal/terminal-widget.c:501
#, c-format
msgid "Unable to drop URI list on terminal: Wrong format (%d) or length (%d)\n"
msgstr ""
-#: ../terminal/terminal-widget.c:570
+#: ../terminal/terminal-widget.c:546
#, c-format
msgid "Received invalid color data: Wrong format (%d) or length (%d)\n"
msgstr ""
-#: ../terminal/terminal-window.c:204
+#. tell the user that we were unable to open the responsible application
+#: ../terminal/terminal-widget.c:643
+#, c-format
+msgid "Failed to open the URL `%s'"
+msgstr ""
+
+#: ../terminal/terminal-window.c:198
msgid "_File"
msgstr ""
-#: ../terminal/terminal-window.c:205
+#: ../terminal/terminal-window.c:199
msgid "Open _Tab"
msgstr ""
-#: ../terminal/terminal-window.c:205
+#: ../terminal/terminal-window.c:199
msgid "Open a new terminal tab"
msgstr ""
-#: ../terminal/terminal-window.c:206
+#: ../terminal/terminal-window.c:200
msgid "Open T_erminal"
msgstr ""
-#: ../terminal/terminal-window.c:206
+#: ../terminal/terminal-window.c:200
msgid "Open a new terminal window"
msgstr ""
-#: ../terminal/terminal-window.c:207
+#: ../terminal/terminal-window.c:201
msgid "Open a new window for the current terminal tab"
msgstr ""
-#: ../terminal/terminal-window.c:208
+#: ../terminal/terminal-window.c:202
msgid "Close the current terminal tab"
msgstr ""
-#: ../terminal/terminal-window.c:209
+#: ../terminal/terminal-window.c:203
msgid "_Close Window"
msgstr ""
-#: ../terminal/terminal-window.c:209
+#: ../terminal/terminal-window.c:203
msgid "Close the terminal window"
msgstr ""
-#: ../terminal/terminal-window.c:210
+#: ../terminal/terminal-window.c:204
msgid "_Edit"
msgstr ""
-#: ../terminal/terminal-window.c:211
+#: ../terminal/terminal-window.c:205
msgid "_Copy"
msgstr ""
-#: ../terminal/terminal-window.c:211
+#: ../terminal/terminal-window.c:205
msgid "Copy to clipboard"
msgstr ""
-#: ../terminal/terminal-window.c:212
+#: ../terminal/terminal-window.c:206
msgid "_Paste"
msgstr ""
-#: ../terminal/terminal-window.c:212
+#: ../terminal/terminal-window.c:206
msgid "Paste from clipboard"
msgstr ""
-#: ../terminal/terminal-window.c:213
+#: ../terminal/terminal-window.c:207
msgid "Paste _Selection"
msgstr ""
-#: ../terminal/terminal-window.c:213
+#: ../terminal/terminal-window.c:207
msgid "Paste from primary selection"
msgstr ""
-#: ../terminal/terminal-window.c:214
-msgid "_Applications..."
-msgstr ""
-
-#: ../terminal/terminal-window.c:214
-msgid "Customize your preferred applications"
-msgstr ""
-
-#: ../terminal/terminal-window.c:215
+#: ../terminal/terminal-window.c:208
msgid "_Toolbars..."
msgstr ""
-#: ../terminal/terminal-window.c:215
+#: ../terminal/terminal-window.c:208
msgid "Customize the toolbars"
msgstr ""
-#: ../terminal/terminal-window.c:216
+#: ../terminal/terminal-window.c:209
msgid "Pr_eferences..."
msgstr ""
-#: ../terminal/terminal-window.c:216
+#: ../terminal/terminal-window.c:209
msgid "Open the Terminal preferences dialog"
msgstr ""
-#: ../terminal/terminal-window.c:217
+#: ../terminal/terminal-window.c:210
msgid "_View"
msgstr ""
-#: ../terminal/terminal-window.c:218
+#: ../terminal/terminal-window.c:211
msgid "_Terminal"
msgstr ""
-#: ../terminal/terminal-window.c:219
+#: ../terminal/terminal-window.c:212
msgid "_Set Title..."
msgstr ""
-#: ../terminal/terminal-window.c:219
+#: ../terminal/terminal-window.c:212
msgid "Set a custom title for the current tab"
msgstr ""
-#: ../terminal/terminal-window.c:220
+#: ../terminal/terminal-window.c:213
msgid "_Reset"
msgstr ""
-#: ../terminal/terminal-window.c:221
+#: ../terminal/terminal-window.c:214
msgid "Reset and C_lear"
msgstr ""
-#: ../terminal/terminal-window.c:222
+#: ../terminal/terminal-window.c:215
msgid "_Go"
msgstr ""
-#: ../terminal/terminal-window.c:223
+#: ../terminal/terminal-window.c:216
msgid "_Previous Tab"
msgstr ""
-#: ../terminal/terminal-window.c:223
+#: ../terminal/terminal-window.c:216
msgid "Switch to previous tab"
msgstr ""
-#: ../terminal/terminal-window.c:224
+#: ../terminal/terminal-window.c:217
msgid "_Next Tab"
msgstr ""
-#: ../terminal/terminal-window.c:224
+#: ../terminal/terminal-window.c:217
msgid "Switch to next tab"
msgstr ""
-#: ../terminal/terminal-window.c:225
+#: ../terminal/terminal-window.c:218
msgid "_Help"
msgstr ""
-#: ../terminal/terminal-window.c:226
+#: ../terminal/terminal-window.c:219
msgid "_Contents"
msgstr ""
-#: ../terminal/terminal-window.c:226
+#: ../terminal/terminal-window.c:219
msgid "Display help contents"
msgstr ""
-#: ../terminal/terminal-window.c:227
+#: ../terminal/terminal-window.c:220
msgid "_Report a bug"
msgstr ""
-#: ../terminal/terminal-window.c:227
+#: ../terminal/terminal-window.c:220
msgid "Report a bug in Terminal"
msgstr ""
-#: ../terminal/terminal-window.c:228
+#: ../terminal/terminal-window.c:221
msgid "_About"
msgstr ""
-#: ../terminal/terminal-window.c:228
+#: ../terminal/terminal-window.c:221
msgid "Display information about Terminal"
msgstr ""
-#: ../terminal/terminal-window.c:229
+#: ../terminal/terminal-window.c:222
msgid "_Input Methods"
msgstr ""
-#: ../terminal/terminal-window.c:234
+#: ../terminal/terminal-window.c:227
msgid "Show _Menubar"
msgstr ""
-#: ../terminal/terminal-window.c:234
+#: ../terminal/terminal-window.c:227
msgid "Show/hide the menubar"
msgstr ""
-#: ../terminal/terminal-window.c:235
+#: ../terminal/terminal-window.c:228
msgid "Show _Toolbars"
msgstr ""
-#: ../terminal/terminal-window.c:235
+#: ../terminal/terminal-window.c:228
msgid "Show/hide the toolbars"
msgstr ""
-#: ../terminal/terminal-window.c:236
+#: ../terminal/terminal-window.c:229
msgid "Show Window _Borders"
msgstr ""
-#: ../terminal/terminal-window.c:236
+#: ../terminal/terminal-window.c:229
msgid "Show/hide the window decorations"
msgstr ""
-#: ../terminal/terminal-window.c:237
+#: ../terminal/terminal-window.c:230
msgid "_Fullscreen"
msgstr ""
-#: ../terminal/terminal-window.c:237
+#: ../terminal/terminal-window.c:230
msgid "Toggle fullscreen mode"
msgstr ""
-#: ../terminal/terminal-window.c:530
+#: ../terminal/terminal-window.c:523
msgid "Warning"
msgstr ""
-#: ../terminal/terminal-window.c:541
+#: ../terminal/terminal-window.c:534
msgid "Close all tabs"
msgstr ""
-#: ../terminal/terminal-window.c:560
+#: ../terminal/terminal-window.c:553
#, c-format
msgid ""
"This window has %d tabs open. Closing\n"
"this window will also close all its tabs."
msgstr ""
-#: ../terminal/terminal-window.c:563
+#: ../terminal/terminal-window.c:556
msgid "Close all tabs?"
msgstr ""
-#: ../terminal/terminal-window.c:576
+#: ../terminal/terminal-window.c:569
msgid "Do _not ask me again"
msgstr ""
-#: ../terminal/terminal-window.c:972
-msgid ""
-"You did not choose your preferred Web\n"
-"Browser yet. Do you want to setup your\n"
-"preferred applications now?"
-msgstr ""
-
-#: ../terminal/terminal-window.c:973
-msgid ""
-"You did not choose your preferred Mail\n"
-"Reader yet. Do you want to setup your\n"
-"preferred applications now?"
-msgstr ""
-
-#: ../terminal/terminal-window.c:1449
+#: ../terminal/terminal-window.c:1346
msgid "Window Title|Set Title"
msgstr ""
-#: ../terminal/terminal-window.c:1463
+#: ../terminal/terminal-window.c:1360
msgid "<b>Title:</b>"
msgstr ""
-#: ../terminal/terminal-window.c:1477
+#: ../terminal/terminal-window.c:1374
msgid "Enter the title for the current terminal tab"
msgstr ""
#: ../Terminal.desktop.in.h:2
msgid "Terminal Emulator"
msgstr ""
-
-#: ../helpers/balsa.desktop.in.h:1
-msgid "Balsa"
-msgstr ""
-
-#: ../helpers/epiphany.desktop.in.h:1
-msgid "Epiphany Web Browser"
-msgstr ""
-
-#: ../helpers/evolution.desktop.in.h:1
-msgid "Novell Evolution"
-msgstr ""
-
-#: ../helpers/exo-open-browser.desktop.in.h:1
-msgid "Default Web Browser (Xfce)"
-msgstr ""
-
-#: ../helpers/exo-open-mailer.desktop.in.h:1
-msgid "Default Mail Reader (Xfce)"
-msgstr ""
-
-#: ../helpers/firefox.desktop.in.h:1
-msgid "Mozilla Firefox"
-msgstr ""
-
-#: ../helpers/galeon.desktop.in.h:1
-msgid "Galeon Web Browser"
-msgstr ""
-
-#: ../helpers/kmail.desktop.in.h:1
-msgid "KMail"
-msgstr ""
-
-#: ../helpers/konqueror.desktop.in.h:1
-msgid "Konqueror"
-msgstr ""
-
-#: ../helpers/lynx.desktop.in.h:1
-msgid "Lynx"
-msgstr ""
-
-#: ../helpers/mozilla-browser.desktop.in.h:1
-msgid "Mozilla Browser"
-msgstr ""
-
-#: ../helpers/mozilla-mailer.desktop.in.h:1
-msgid "Mozilla Mail"
-msgstr ""
-
-#: ../helpers/mutt.desktop.in.h:1
-msgid "Mutt"
-msgstr ""
-
-#: ../helpers/opera-browser.desktop.in.h:1
-msgid "Opera Browser"
-msgstr ""
-
-#: ../helpers/opera-mailer.desktop.in.h:1
-msgid "Opera Mail"
-msgstr ""
-
-#: ../helpers/sensible-browser.desktop.in.h:1
-msgid "Debian Sensible Browser"
-msgstr ""
-
-#: ../helpers/sylpheed-claws.desktop.in.h:1
-msgid "Sylpheed Claws"
-msgstr ""
-
-#: ../helpers/thunderbird.desktop.in.h:1
-msgid "Mozilla Thunderbird"
-msgstr ""
Modified: terminal/trunk/po/ar.po
===================================================================
--- terminal/trunk/po/ar.po 2007-07-20 15:43:29 UTC (rev 25928)
+++ terminal/trunk/po/ar.po 2007-07-20 16:54:48 UTC (rev 25929)
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 17:37+0200\n"
+"POT-Creation-Date: 2007-07-20 18:44+0200\n"
"PO-Revision-Date: 2007-01-30 22:15+0200\n"
"Last-Translator: Khaled Hosny <khaledhosny at eglug.org>\n"
"Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -182,8 +182,8 @@
" directory"
msgstr ""
-#: ../terminal/main.c:140 ../terminal/terminal-preferences.c:1221
-#: ../terminal/terminal-shortcut-editor.c:122 ../Terminal.desktop.in.h:1
+#: ../terminal/main.c:140 ../terminal/terminal-preferences.c:1197
+#: ../terminal/terminal-shortcut-editor.c:121 ../Terminal.desktop.in.h:1
msgid "Terminal"
msgstr "طرفية"
@@ -253,103 +253,6 @@
msgid "Failed to open the documentation browser"
msgstr "تعذّر فتح متصفح الوثائق"
-#: ../terminal/terminal-helper-dialog.c:52
-msgid "Web Browser"
-msgstr "متصفح وِب"
-
-#: ../terminal/terminal-helper-dialog.c:53
-msgid "Mail Reader"
-msgstr "قاريء البريد"
-
-#: ../terminal/terminal-helper-dialog.c:58
-msgid ""
-"Choose your preferred Web Browser. The preferred\n"
-"Web Browser opens when you right-click on a URL\n"
-"and select Open Link from the context menu."
-msgstr ""
-"اختر متصفح الوِب الذي تفضله. يفتح المتصفح المفضل\n"
-"عندما تنقر نقرا أيمنا على مسار وِب\n"
-"وتختار افتح الوصلت من قائمة السياق."
-
-#: ../terminal/terminal-helper-dialog.c:61
-msgid ""
-"Choose your preferred Mail Reader. The preferred\n"
-"Mail Reader opens when you right-click on an email\n"
-"address and select Compose Email from the context\n"
-"menu."
-msgstr ""
-"اختر قاريء البريد الذي تفضله. يفتح قاؤيء البريد\n"
-"المفضل عندما تنقر نقرا أيمنا على عنوان بريد\n"
-"وتختار اكتب بريد من قائمة السياق."
-
-#: ../terminal/terminal-helper-dialog.c:167
-msgid ""
-"Click here to change the selected application or to disable this feature."
-msgstr "انقر هنا لتغيير التطبيق المنتقى أو تعطيل هذه الخاصية."
-
-#: ../terminal/terminal-helper-dialog.c:310
-msgid "Select application"
-msgstr "انتقِ تطبيقا"
-
-#: ../terminal/terminal-helper-dialog.c:348
-msgid "Choose a custom Web Browser"
-msgstr "اختر متصفح وِب مخصص"
-
-#: ../terminal/terminal-helper-dialog.c:349
-msgid "Choose a custom Mail Reader"
-msgstr "اختر قاريء بريد مخصص"
-
-#: ../terminal/terminal-helper-dialog.c:354
-msgid ""
-"Specify the application you want to use as\n"
-"Web Browser in Terminal:"
-msgstr ""
-"حدد التطبيق الذي ترغب في استخدامه\n"
-"كمتصف وِب في الطرفية:"
-
-#: ../terminal/terminal-helper-dialog.c:355
-msgid ""
-"Specify the application you want to use as\n"
-"Mail Reader in Terminal:"
-msgstr ""
-"حدد التطبيق الذي ترغب في استخدامه\n"
-"كقاريء بريد في الطرفية:"
-
-#: ../terminal/terminal-helper-dialog.c:430
-msgid "_Browse..."
-msgstr "_تصفّح..."
-
-#: ../terminal/terminal-helper-dialog.c:529
-msgid "Disable this feature"
-msgstr "عطِّل هذه الخاصية"
-
-#: ../terminal/terminal-helper-dialog.c:570
-msgid "Other..."
-msgstr "أخرى..."
-
-#: ../terminal/terminal-helper-dialog.c:610
-#: ../terminal/terminal-preferences-dialog.c:328
-#: ../terminal/terminal-preferences.c:395
-#: ../terminal/terminal-preferences.c:406
-#: ../terminal/terminal-preferences.c:417
-#: ../terminal/terminal-preferences.c:428
-#: ../terminal/terminal-preferences.c:439
-#: ../terminal/terminal-preferences.c:461
-#: ../terminal/terminal-preferences.c:472
-#: ../terminal/terminal-preferences.c:483
-#: ../terminal/terminal-shortcut-editor.c:210
-#: ../terminal/terminal-shortcut-editor.c:393
-msgid "Disabled"
-msgstr "مُعطّل"
-
-#: ../terminal/terminal-helper-dialog.c:627
-msgid "No application selected"
-msgstr "لم يُنتقى أي تطبيق"
-
-#: ../terminal/terminal-helper-dialog.c:777
-msgid "Preferred Applications"
-msgstr "التطبيقات المفضّلة"
-
#: ../terminal/terminal-options.c:107
msgid ""
"Option \"--sm-client-id\" requires specifying the session id as its parameter"
@@ -415,52 +318,52 @@
msgid "Unknown option \"%s\""
msgstr "خيار مجهول \"%s\""
-#: ../terminal/terminal-preferences-dialog.c:142
+#: ../terminal/terminal-preferences-dialog.c:140
msgid "Terminal Preferences"
msgstr "تفضيلات الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:189
+#: ../terminal/terminal-preferences-dialog.c:187
msgid "<b>Title</b>"
msgstr "<b>عنوان</b>"
-#: ../terminal/terminal-preferences-dialog.c:202
+#: ../terminal/terminal-preferences-dialog.c:200
msgid ""
"The command running inside the terminal may dynamically set a new title."
msgstr "قد يحدد الأمر الذي يعمل داخل الطرفية العنوان بشكل ديناميكي."
-#: ../terminal/terminal-preferences-dialog.c:208
+#: ../terminal/terminal-preferences-dialog.c:206
msgid "_Initial title:"
msgstr "العنوان الأ_ولي:"
-#: ../terminal/terminal-preferences-dialog.c:227
+#: ../terminal/terminal-preferences-dialog.c:221
msgid "_Dynamically-set title:"
msgstr "العنوان المحدد _ديناميكيا:"
-#: ../terminal/terminal-preferences-dialog.c:237
+#: ../terminal/terminal-preferences-dialog.c:231
msgid "Replaces initial title"
msgstr "يستبدل العنوان الأولي"
-#: ../terminal/terminal-preferences-dialog.c:238
+#: ../terminal/terminal-preferences-dialog.c:232
msgid "Goes before initial title"
msgstr "يأتي قبل العنوان الأولي"
-#: ../terminal/terminal-preferences-dialog.c:239
+#: ../terminal/terminal-preferences-dialog.c:233
msgid "Goes after initial title"
msgstr "يأتي بعد العنوان الأولي"
-#: ../terminal/terminal-preferences-dialog.c:240
+#: ../terminal/terminal-preferences-dialog.c:234
msgid "Isn't displayed"
msgstr "لا يُعرض"
-#: ../terminal/terminal-preferences-dialog.c:260
+#: ../terminal/terminal-preferences-dialog.c:250
msgid "<b>Command</b>"
msgstr "<b>أمر</b>"
-#: ../terminal/terminal-preferences-dialog.c:269
+#: ../terminal/terminal-preferences-dialog.c:259
msgid "_Run command as login shell"
msgstr "_شغِّل أمر كصدفة ولوج"
-#: ../terminal/terminal-preferences-dialog.c:272
+#: ../terminal/terminal-preferences-dialog.c:262
msgid ""
"Select this option to force Terminal to run your shell as a login shell when "
"you open new terminals. See the documentation of your shell for details "
@@ -471,19 +374,19 @@
"جديدة. راجع وثائق صدفتك لتحصل على تفاصيل أكثر حول الفرق بين تشغيلها كصدفة "
"تفاعلية أو صدفة ولوج."
-#: ../terminal/terminal-preferences-dialog.c:279
+#: ../terminal/terminal-preferences-dialog.c:269
msgid "_Update utmp/wtmp records when command is launched"
msgstr "_حدِّث سجلّات utmp/wtmp عند إطلاق أمر"
-#: ../terminal/terminal-preferences-dialog.c:288
+#: ../terminal/terminal-preferences-dialog.c:278
msgid "<b>Scrolling</b>"
msgstr "<b>اللف</b>"
-#: ../terminal/terminal-preferences-dialog.c:303
+#: ../terminal/terminal-preferences-dialog.c:293
msgid "Sc_roll on output"
msgstr "_لُف مع الخرْج"
-#: ../terminal/terminal-preferences-dialog.c:306
+#: ../terminal/terminal-preferences-dialog.c:296
msgid ""
"This option controls whether the terminal will scroll down automatically "
"whenever new output is generated by the commands running inside the terminal."
@@ -491,11 +394,11 @@
"يتحكم هذا الخيار فيما إذا كانت الطرفية ستلف لأسفل آليا عندما ينشأ خرج جديد "
"من الأوامر التي تعمل داخل الطرفية."
-#: ../terminal/terminal-preferences-dialog.c:312
+#: ../terminal/terminal-preferences-dialog.c:302
msgid "Scroll on key_stroke"
msgstr "لف عند _ضغطة مفتاح"
-#: ../terminal/terminal-preferences-dialog.c:315
+#: ../terminal/terminal-preferences-dialog.c:305
msgid ""
"Enables you to press any key on the keyboard to scroll down the terminal "
"window to the command prompt."
@@ -503,44 +406,57 @@
"يمكنك من ضغط أي زر على لوحة المفاتيح لتلف نافذة الطرفية لأسفل حتى سطر "
"الأوامر."
-#: ../terminal/terminal-preferences-dialog.c:322
+#: ../terminal/terminal-preferences-dialog.c:311
msgid "_Scrollbar is:"
msgstr "_شريط التمرير:"
-#: ../terminal/terminal-preferences-dialog.c:329
+#: ../terminal/terminal-preferences-dialog.c:317
+#: ../terminal/terminal-preferences.c:393
+#: ../terminal/terminal-preferences.c:404
+#: ../terminal/terminal-preferences.c:415
+#: ../terminal/terminal-preferences.c:426
+#: ../terminal/terminal-preferences.c:448
+#: ../terminal/terminal-preferences.c:459
+#: ../terminal/terminal-preferences.c:470
+#: ../terminal/terminal-shortcut-editor.c:209
+#: ../terminal/terminal-shortcut-editor.c:392
+msgid "Disabled"
+msgstr "مُعطّل"
+
+#: ../terminal/terminal-preferences-dialog.c:318
msgid "On the left side"
msgstr "على الجانب الأيسر"
-#: ../terminal/terminal-preferences-dialog.c:330
+#: ../terminal/terminal-preferences-dialog.c:319
msgid "On the right side"
msgstr "على الجانب الأيمن"
-#: ../terminal/terminal-preferences-dialog.c:346
+#: ../terminal/terminal-preferences-dialog.c:331
msgid "Scr_ollback:"
msgstr "اللف لل_خلف:"
-#: ../terminal/terminal-preferences-dialog.c:356
+#: ../terminal/terminal-preferences-dialog.c:341
msgid ""
"Specifies the number of lines that you can scroll back using the scrollbar."
msgstr "يحدد عدد السطور التي يمكن أتلفها للخلف باستخدام شريط التمرير."
-#: ../terminal/terminal-preferences-dialog.c:377
+#: ../terminal/terminal-preferences-dialog.c:357
msgid "General"
msgstr "عام"
-#: ../terminal/terminal-preferences-dialog.c:395
+#: ../terminal/terminal-preferences-dialog.c:375
msgid "<b>Font</b>"
msgstr "<b>خط</b>"
-#: ../terminal/terminal-preferences-dialog.c:404
+#: ../terminal/terminal-preferences-dialog.c:384
msgid "Choose Terminal Font"
msgstr "اختر خط الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:409
+#: ../terminal/terminal-preferences-dialog.c:389
msgid "Enable anti-aliasing for the terminal font"
msgstr "فعِّل تنعيم الحواف لخط الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:412
+#: ../terminal/terminal-preferences-dialog.c:392
msgid ""
"Enable this option if you want Terminal to use anti-aliasing when rendering "
"text in terminal windows. Disabling this option can impressively speed up "
@@ -551,210 +467,210 @@
"الطرفية. تعطيل هذا الخيار قد يُسرِّع الأداء بشكل كبير ويقلل حِمْل النظام في "
"الأنظمة البطيئة."
-#: ../terminal/terminal-preferences-dialog.c:419
+#: ../terminal/terminal-preferences-dialog.c:399
msgid "Allow bold text"
msgstr "اسمح بالخط الثخين"
-#: ../terminal/terminal-preferences-dialog.c:422
+#: ../terminal/terminal-preferences-dialog.c:402
msgid ""
"Enable this option to allow applications running inside the terminal windows "
"to use bold text."
msgstr ""
"فعِّل هذا الخيار لتسمح للتطبيقات التي تعمل داخل الطرفية باستخدام خط ثخين."
-#: ../terminal/terminal-preferences-dialog.c:431
+#: ../terminal/terminal-preferences-dialog.c:411
msgid "<b>Background</b>"
msgstr "<b>الخلفية</b>"
-#: ../terminal/terminal-preferences-dialog.c:441
+#: ../terminal/terminal-preferences-dialog.c:421
msgid "None (use solid color)"
msgstr "بلا (استعمل لون ثابت)"
-#: ../terminal/terminal-preferences-dialog.c:442
+#: ../terminal/terminal-preferences-dialog.c:422
msgid "Background image"
msgstr "صورة خلفية"
-#: ../terminal/terminal-preferences-dialog.c:443
+#: ../terminal/terminal-preferences-dialog.c:423
msgid "Transparent background"
msgstr "خلفية شفافة"
-#: ../terminal/terminal-preferences-dialog.c:460
+#: ../terminal/terminal-preferences-dialog.c:440
msgid "_File:"
msgstr "_ملف:"
-#: ../terminal/terminal-preferences-dialog.c:485
+#: ../terminal/terminal-preferences-dialog.c:465
msgid "_Style:"
msgstr "أ_سلوب:"
-#: ../terminal/terminal-preferences-dialog.c:491
+#: ../terminal/terminal-preferences-dialog.c:471
msgid "Tiled"
msgstr "مبلّط"
-#: ../terminal/terminal-preferences-dialog.c:492
+#: ../terminal/terminal-preferences-dialog.c:472
msgid "Centered"
msgstr "مركزي"
-#: ../terminal/terminal-preferences-dialog.c:493
+#: ../terminal/terminal-preferences-dialog.c:473
msgid "Scaled"
msgstr "محجّم"
-#: ../terminal/terminal-preferences-dialog.c:494
+#: ../terminal/terminal-preferences-dialog.c:474
msgid "Stretched"
msgstr "مُمدد"
-#: ../terminal/terminal-preferences-dialog.c:510
+#: ../terminal/terminal-preferences-dialog.c:490
msgid "Shade transparent or image background:"
msgstr "ظلل الصورة أو الخلفيّة الشفّافة:"
-#: ../terminal/terminal-preferences-dialog.c:523
+#: ../terminal/terminal-preferences-dialog.c:503
msgid "<small><i>None</i></small>"
msgstr "<small><i>بلا</i></small>"
-#: ../terminal/terminal-preferences-dialog.c:534
+#: ../terminal/terminal-preferences-dialog.c:514
msgid "<small><i>Maximum</i></small>"
msgstr "<small><i>أقصى</i></small>>"
-#: ../terminal/terminal-preferences-dialog.c:542
+#: ../terminal/terminal-preferences-dialog.c:522
msgid "<b>Opening New Windows</b>"
msgstr "<b>افتح نافذة جديدة</b>"
-#: ../terminal/terminal-preferences-dialog.c:551
+#: ../terminal/terminal-preferences-dialog.c:531
msgid "Display _menubar in new windows"
msgstr "اعرض شريط _قوائم في النوافذ الجديدة"
-#: ../terminal/terminal-preferences-dialog.c:554
+#: ../terminal/terminal-preferences-dialog.c:534
msgid ""
"Enable this option to show the menubar in newly created terminal windows."
msgstr "فعِّل هذا الخيار لتعرض شريط قوائم في النوافذ المنشأة حديثا."
-#: ../terminal/terminal-preferences-dialog.c:559
+#: ../terminal/terminal-preferences-dialog.c:539
msgid "Display _toolbars in new windows"
msgstr "اعرض شريط أ_دوات في النوافذ الجديدة"
-#: ../terminal/terminal-preferences-dialog.c:562
+#: ../terminal/terminal-preferences-dialog.c:542
msgid ""
"Enable this option to show the toolbars in newly created terminal windows."
msgstr "فعِّل هذا الخيار لتعرض شريط أدوات في النوافذ المنشأة حديثا."
-#: ../terminal/terminal-preferences-dialog.c:567
+#: ../terminal/terminal-preferences-dialog.c:547
msgid "Display _borders around new windows"
msgstr "اعرض _حواف حول النوافذ الجديدة"
-#: ../terminal/terminal-preferences-dialog.c:570
+#: ../terminal/terminal-preferences-dialog.c:550
msgid ""
"Enable this option to show window decorations around newly created terminal "
"windows."
msgstr "فعِّل هذا الخيار لتعرض زخرفة النوافذ حول النوافذ المنشأة حديثا."
-#: ../terminal/terminal-preferences-dialog.c:582
+#: ../terminal/terminal-preferences-dialog.c:562
msgid "Appearance"
msgstr "المظهر"
-#: ../terminal/terminal-preferences-dialog.c:600
+#: ../terminal/terminal-preferences-dialog.c:580
msgid "<b>Foreground and Background</b>"
msgstr "<b>الأمامية والخافية</b>"
-#: ../terminal/terminal-preferences-dialog.c:612
+#: ../terminal/terminal-preferences-dialog.c:592
msgid "_Text and cursor color:"
msgstr "لون ال_نص والمؤشر:"
-#: ../terminal/terminal-preferences-dialog.c:627
+#: ../terminal/terminal-preferences-dialog.c:607
msgid "Choose terminal text color"
msgstr "اختر لون نص الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:635
-#: ../terminal/terminal-preferences-dialog.c:650
-#: ../terminal/terminal-preferences-dialog.c:679
-#: ../terminal/terminal-preferences-dialog.c:728
+#: ../terminal/terminal-preferences-dialog.c:615
+#: ../terminal/terminal-preferences-dialog.c:630
+#: ../terminal/terminal-preferences-dialog.c:659
+#: ../terminal/terminal-preferences-dialog.c:708
msgid "Color Selector"
msgstr "منتقي الألوان"
-#: ../terminal/terminal-preferences-dialog.c:636
-#: ../terminal/terminal-preferences-dialog.c:651
-#: ../terminal/terminal-preferences-dialog.c:680
-#: ../terminal/terminal-preferences-dialog.c:729
+#: ../terminal/terminal-preferences-dialog.c:616
+#: ../terminal/terminal-preferences-dialog.c:631
+#: ../terminal/terminal-preferences-dialog.c:660
+#: ../terminal/terminal-preferences-dialog.c:709
msgid "Open a dialog to specify the color"
msgstr "افتح حوار لتحديد لون"
-#: ../terminal/terminal-preferences-dialog.c:642
+#: ../terminal/terminal-preferences-dialog.c:622
msgid "Choose terminal cursor color"
msgstr "اختر لون مؤشر الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:658
+#: ../terminal/terminal-preferences-dialog.c:638
msgid "_Background color:"
msgstr "لون ال_خلفية:"
-#: ../terminal/terminal-preferences-dialog.c:670
+#: ../terminal/terminal-preferences-dialog.c:650
msgid "Choose terminal background color"
msgstr "اختر لون خلفية الطرفية"
-#: ../terminal/terminal-preferences-dialog.c:690
+#: ../terminal/terminal-preferences-dialog.c:670
msgid "<b>Text Selection</b>"
msgstr "<b>انتقاء النص</b>"
-#: ../terminal/terminal-preferences-dialog.c:701
+#: ../terminal/terminal-preferences-dialog.c:681
msgid "Use _default color"
msgstr "استخدم اللون الإ_فتراضي"
-#: ../terminal/terminal-preferences-dialog.c:704
+#: ../terminal/terminal-preferences-dialog.c:684
msgid "Use the default text selection background color"
msgstr "اختر لون خلفية النص المنتقى الإفتراضي"
-#: ../terminal/terminal-preferences-dialog.c:709
+#: ../terminal/terminal-preferences-dialog.c:689
msgid "Use _custom color"
msgstr "استخدم لون _مخصص"
-#: ../terminal/terminal-preferences-dialog.c:712
+#: ../terminal/terminal-preferences-dialog.c:692
msgid "Use a custom text selection background color"
msgstr "اختر لون خلفية نص الطرفية المنتقى المخصص"
-#: ../terminal/terminal-prefe