saving uncommitted changes in /etc prior to emerge run

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
index abd9aa1f77e3853b1cf216414cb8a878f50a0a44..57737da5c2280e00d83445320b60d3af5f9fb87d 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -2,6 +2,20 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="netstatus_applet">
+                               <entry name="config_tool">
+                                       <local_schema short_desc="Werkzeug zur Netzwerkkonfiguration">
+                                               <longdesc>Dieses Werkzeug gibt den Namen des Werkzeugs zur Netzwerkkonfiguration an, das aufgerufen werden soll, sobald der »Konfigurieren«-Knopf angeklickt wird. Falls das Konfigurationswerkzeug einen Parameter erwartet, der die zu konfigurierende Schnittstelle angibt, können Sie in der Zeichenkette »%i« einfügen, das dann vor dem Aufruf mit dem Schnittstellennamen versehen wird. Beispielsweise erwartet das Werkzeug »network-admin« der GNOME-Systemwerkzeuge den Schnittstellennamen nach dem Parameter »--configure«. In diesem Falle müsste der Schlüsselwert also »network-admin --configure %i« sein.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <dir name="prefs">
+                                       <entry name="interface">
+                                               <local_schema short_desc="Netzwerkschnittstelle">
+                                                       <longdesc>Die von der Netzwerküberwachung überwachte Netzwerkschnittstelle.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="eog">
                                <dir name="plugins">
                                        <entry name="active_plugins">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 96c62eb4f92345a48a30e061497613e8a24e6648..6252cfa1f56dae29b11b6ebd70f1354484ef6e44 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
@@ -2,6 +2,20 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="netstatus_applet">
+                               <entry name="config_tool">
+                                       <local_schema short_desc="Network configuration tool">
+                                               <longdesc>This key specifies the name of the network configuration tool which should be invoked when the &quot;Configure&quot; button in the properties dialogue is clicked. If the configuration tool can take a parameter of the interface to configure you may use %i in the string and it will be substituted with the interface name before invoking the configuration tool. For example, gnome-system-tool&apos;s network-admin tool takes the interface name through a --configure parameter. Thus, you could set the value of this key to be: &quot;network-admin --configure %i&quot;.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <dir name="prefs">
+                                       <entry name="interface">
+                                               <local_schema short_desc="Network interface">
+                                                       <longdesc>The Network Interface monitored by the Network Monitor.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="eog">
                                <dir name="plugins">
                                        <entry name="active_plugins">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index 1570ec2cd9b29bfc7eb9a778fbe1e52d3df29490..b3f776c59c99f2540d8de0eedb823da24c3990ad 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -2,6 +2,20 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="netstatus_applet">
+                               <entry name="config_tool">
+                                       <local_schema short_desc="Утилита настройки сети">
+                                               <longdesc>Этот ключ определяет имя утилиты настройки сети, которая будет вызвана по нажатию кнопки «Настроить» в диалоге настроек. Если утилита настройки может принимать параметр интерфейса для конфигурации, можно использовать шаблон %i в строке, и он будет заменён именем интерфейса. Например, утилита gnome-system-tool принимает интерфейс через параметр --configure. Таким образом, значение этого ключа может иметь вид «network-admin --configure %i».</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <dir name="prefs">
+                                       <entry name="interface">
+                                               <local_schema short_desc="Сетевой интерфейс">
+                                                       <longdesc>Сетевой интерфейс, наблюдаемый с помощью монитора сети.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="eog">
                                <dir name="plugins">
                                        <entry name="active_plugins">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index da998e53142ed9208e665a853bb4a56ddea18b2e..2d4f079d0ac2c0d4551ce575941fbb0197f80592 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -2,6 +2,21 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="netstatus_applet">
+                               <entry name="config_tool">
+                                       <local_schema short_desc="Công cụ cấu hình mạng">
+                                               <longdesc>Khoá này xác định tên của công cụ cấu hình mạng mà nên được gọi khi cái nút « Cấu hình » trong hộp thoại thuộc tính được bấm. Nếu công cụ cấu hình có khả năng chấp nhận một tham số là giao diện cần cấu hình thì người dùng có thể sử dụng « %i » trong chuỗi, và nó sẽ được thay thế bằng tên giao diện trước khi gọi công cụ cấu hình. Ví dụ, công cụ network-admin (quản lý mạng) của gnome-system-tool (công cụ hệ thống GNOME) lấy tên giao diện thông qua một tham số « --configure ». Vì thế người dùng có thể đặt giá trị của khoá này thành:
+« network-admin --configure %i ».</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <dir name="prefs">
+                                       <entry name="interface">
+                                               <local_schema short_desc="Giao diện mạng">
+                                                       <longdesc>Giao diện mạng được theo dõi bởi Bộ Theo Dõi Mạng.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="eog">
                                <dir name="plugins">
                                        <entry name="active_plugins">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index 120958c6b26f2e5682059b6b9f0ac0f5effb6062..13e55e94b14a43720f53274d59685645d976074d 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <gconf>
        <dir name="apps">
+               <dir name="netstatus_applet">
+                       <entry name="config_tool" mtime="1326795225" schema="/schemas/apps/netstatus_applet/config_tool"/>
+               </dir>
                <dir name="bug-buddy">
                        <entry name="bugfile" mtime="1326795138" schema="/schemas/apps/bug-buddy/bugfile"/>
                        <entry name="email_address" mtime="1326795138" schema="/schemas/apps/bug-buddy/email_address"/>
@@ -1681,6 +1684,40 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="netstatus_applet">
+                               <entry name="config_tool" mtime="1326795225" type="schema" stype="string" owner="netstatus-applet">
+                                       <local_schema locale="C" short_desc="Network configuration tool">
+                                               <default type="string">
+                                                       <stringvalue></stringvalue>
+                                               </default>
+                                               <longdesc>
+         This key specifies the name of the network configuration tool
+         which should be invoked when the &quot;Configure&quot; button in the
+         properties dialog is clicked.
+
+         If the configuration tool can take a parameter of the interface
+         to configure you may use %i in the string and it will be
+         substituted with the interface name before invoking the
+         configuration tool.
+
+         For example, gnome-system-tool&apos;s network-admin tool takes
+          the interface name through a --configure parameter. Thus,
+          you could set the value of this key to be:
+                  &quot;network-admin --configure %i&quot;.
+       </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <dir name="prefs">
+                                       <entry name="interface" mtime="1326795225" type="schema" stype="string" owner="netstatus-applet">
+                                               <local_schema locale="C" short_desc="Network interface">
+                                                       <default type="string">
+                                                               <stringvalue></stringvalue>
+                                                       </default>
+                                                       <longdesc>The Network Interface monitored by the Network Monitor.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="bug-buddy">
                                <entry name="bugfile" mtime="1326795138" type="schema" stype="string" owner="bug-buddy">
                                        <local_schema locale="C" short_desc="File to store unsent bug reports.">