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 56033ccd61b2b570514604ad133fb554042d5bad..7ad6761ed28b00bbb6ce86ce41dc2a7c23482508 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="gnome-session">
+                               <dir name="options">
+                                       <entry name="logout_prompt">
+                                               <local_schema short_desc="Abmeldedialog">
+                                                       <longdesc>Soll gnome-session den Benutzer vor dem Beenden einer Sitzung fragen?</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto_save_session">
+                                               <local_schema short_desc="Sitzungen speichern">
+                                                       <longdesc>Falls aktiviert, speichert gnome-session die Sitzung automatisch.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="deskbar">
                                <entry name="entry_width">
                                        <local_schema short_desc="Die Breite des Eingabefeldes in Zeichen">
@@ -4062,6 +4076,40 @@
                                </dir>
                        </dir>
                        <dir name="gnome">
+                               <dir name="session">
+                                       <entry name="required_components_list">
+                                               <local_schema short_desc="Benötigte Sitzungskomponenten">
+                                                       <longdesc>Liste der Komponenten, die als Teil der Sitzung erforderlich sind. (Jedes Element bezeichnet einen Schlüssel unter »/desktop/gnome/session/required_components«). Das Programm zur Verwaltung der Startprogrammeinstellungen erlaubt gewöhnlichen Benutzern nicht, benötigte Komponenten aus der Sitzung zu entfernen. Diese werden bei Anmeldung wieder automatisch zur Sitzung hinzugefügt, falls sie entfernt wurden.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="default_session">
+                                               <local_schema short_desc="Standardsitzung">
+                                                       <longdesc>Liste der Anwendungen, die Teil der Standardsitzung sind.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="idle_delay">
+                                               <local_schema short_desc="Zeitdauer ab der die Sitzung als untätig gilt">
+                                                       <longdesc>Die Anzahl inaktiver Minuten bis der Benutzer als untätig gilt.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <dir name="required_components">
+                                               <entry name="filemanager">
+                                                       <local_schema short_desc="Dateimanager">
+                                                               <longdesc>Der Dateimanager stellt die Desktop-Symbole bereit und erlaubt Ihnen, gespeicherte Dateien zu verwalten.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="panel">
+                                                       <local_schema short_desc="Das Panel">
+                                                               <longdesc>Das Panel stellt die Leisten am oberen und unteren Bildschirmrand bereit, welche die Menüs, die Fensterliste, Statussymbole, die Uhr usw. beinhalten.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="windowmanager">
+                                                       <local_schema short_desc="Fenstermanager">
+                                                               <longdesc>Der Fenstermanager ist das Programm, welches die Titelleiste und die Ränder der Fenster zeichnet, sowie das Bewegen und die Änderung der Größe der Fenster erlaubt.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                               </dir>
                                <dir name="font_rendering">
                                        <entry name="rgba_order">
                                                <local_schema short_desc="RGBA-Abfolge">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index 5002646054ff1ed9f12cd30e848284720a69afe9..b7f1bc83fdaf444033a803c8a4af83447ee54b68 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="gnome-session">
+                               <dir name="options">
+                                       <entry name="logout_prompt">
+                                               <local_schema short_desc="Logout prompt">
+                                                       <longdesc>If enabled, gnome-session will prompt the user before ending a session.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto_save_session">
+                                               <local_schema short_desc="Save sessions">
+                                                       <longdesc>If enabled, gnome-session will save the session automatically.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="deskbar">
                                <entry name="entry_width">
                                        <local_schema short_desc="The applet&apos;s entry width in number of characters">
@@ -4020,6 +4034,40 @@
                                </dir>
                        </dir>
                        <dir name="gnome">
+                               <dir name="session">
+                                       <entry name="required_components_list">
+                                               <local_schema short_desc="Required session components">
+                                                       <longdesc>List of components that are required as part of the session. (Each element names a key under &quot;/desktop/gnome/session/required_components&quot;). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="default_session">
+                                               <local_schema short_desc="Default session">
+                                                       <longdesc>List of applications that are part of the default session.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="idle_delay">
+                                               <local_schema short_desc="Time before session is considered idle">
+                                                       <longdesc>The number of minutes of inactivity before the session is considered idle.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <dir name="required_components">
+                                               <entry name="filemanager">
+                                                       <local_schema short_desc="File Manager">
+                                                               <longdesc>The file manager provides the desktop icons and allows you to interact with your saved files.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="panel">
+                                                       <local_schema short_desc="Panel">
+                                                               <longdesc>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="windowmanager">
+                                                       <local_schema short_desc="Window Manager">
+                                                               <longdesc>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                               </dir>
                                <dir name="font_rendering">
                                        <entry name="rgba_order">
                                                <local_schema short_desc="RGBA order">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index d5ea9af37bc8bc9003f5c539adade77d899ad884..b870a0c34d330f721b0524b2cb556918cfd1bd71 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="gnome-session">
+                               <dir name="options">
+                                       <entry name="logout_prompt">
+                                               <local_schema short_desc="Запрос при выходе из сеанса">
+                                                       <longdesc>Если этот ключ установлен, gnome-session будет спрашивать пользователя перед окончанием сеанса.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto_save_session">
+                                               <local_schema short_desc="Сохранять сеансы">
+                                                       <longdesc>Если этот ключ установлен, gnome-session будет автоматически сохранять сеанс.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="deskbar">
                                <entry name="entry_width">
                                        <local_schema short_desc="Ширина строки ввода в символах">
@@ -4005,6 +4019,40 @@
                                </dir>
                        </dir>
                        <dir name="gnome">
+                               <dir name="session">
+                                       <entry name="required_components_list">
+                                               <local_schema short_desc="Требуемые компоненты сеанса">
+                                                       <longdesc>Список компонентов, которые требуются запустить как часть этого сеанса. (каждый элемент соответствует ключу в поддереве «/desktop/gnome/session/required-components»). Приложение «Параметры запускаемых приложений», как правило, не позволяет пользователю удалять из сеанса требуемые компоненты, и менеджер сеансов автоматически добавит требуемые компоненты, если они были удалены.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="default_session">
+                                               <local_schema short_desc="Сеанс по умолчанию">
+                                                       <longdesc>Список приложений, являющихся частью сеанса по умолчанию.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="idle_delay">
+                                               <local_schema short_desc="Промежуток времени, по истечении которого сеанс будет считаться неактивным">
+                                                       <longdesc>Промежуток времени в минутах, по истечении которого сеанс будет считаться неактивным.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <dir name="required_components">
+                                               <entry name="filemanager">
+                                                       <local_schema short_desc="Менеджер файлов">
+                                                               <longdesc>Менеджер файлов предоставляет значки рабочего стола и позволяет работать с сохранёнными файлами.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="panel">
+                                                       <local_schema short_desc="Панель">
+                                                               <longdesc>Панель предоставляет собой полосу вверху или внизу экрана, содержащую меню, список окон, значки состояния, часы и т.д.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="windowmanager">
+                                                       <local_schema short_desc="Менеджер окон">
+                                                               <longdesc>Менеджер окон - это программа, которая рисует заголовок и обрамление окна, и позволяет вам перемещать окна и менять их размер.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                               </dir>
                                <dir name="font_rendering">
                                        <entry name="rgba_order">
                                                <local_schema short_desc="Порядок RGBA">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index dabeb87ac3d1644038ce1701843eb1eaa1a65341..d9f47eebc53b534f8c40407a8e32be3d1b5bafd7 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -2,6 +2,19 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gnome-session">
+                               <dir name="options">
+                                       <entry name="logout_prompt">
+                                               <local_schema short_desc="Nhắc đăng xuất">
+                                                       <longdesc>Nếu bật, gnome-session sẽ nhắc người dùng trước khi kết thúc phiên chạy.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto_save_session">
+                                               <local_schema short_desc="Lưu các phiên chạy">
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="deskbar">
                                <entry name="entry_width">
                                        <local_schema short_desc="Độ rộng mục nhập của applet tính theo số ký tự">
@@ -3553,6 +3566,39 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để 
                                </dir>
                        </dir>
                        <dir name="gnome">
+                               <dir name="session">
+                                       <entry name="required_components_list">
+                                               <local_schema short_desc="Thành phần phiên chạy đòi hỏi">
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="default_session">
+                                               <local_schema short_desc="Phiên chạy mặc định">
+                                                       <longdesc>Danh sách các ứng dụng thuộc về phiên chạy mặc định.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="idle_delay">
+                                               <local_schema short_desc="Khoảng thời gian trước khi phiên chạy được thấy là « nghỉ »">
+                                                       <longdesc>Số các phút không hoạt động trước khi phiên chạy được thấy là « nghỉ ».</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <dir name="required_components">
+                                               <entry name="filemanager">
+                                                       <local_schema short_desc="Bộ Quản lý Tập tin">
+                                                               <longdesc>Bộ quản lý tập tin thì cung cấp các biểu tượng trên màn hình và cho phép bạn tương tác với các tập tin đã lưu của mình.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="panel">
+                                                       <local_schema short_desc="Bảng">
+                                                               <longdesc>Bảng điều khiển cung cấp thanh ở đầu/cưới màn hình mà chứa các trình đơn, danh sách các cửa sổ, các biểu tượng trạng thái, đồng hồ v.v.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="windowmanager">
+                                                       <local_schema short_desc="Bộ quản lý cửa sổ">
+                                                               <longdesc>Bộ quản lý cửa sổ là chương trình mà vẽ thanh tựa đề và các viền chung quanh cửa sổ, và cho phép bạn di chuyển và co giãn cửa sổ.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                               </dir>
                                <dir name="font_rendering">
                                        <entry name="rgba_order">
                                                <local_schema short_desc="Thứ tự RGBA">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index e4f2072acf0ca38a4bc977712130ad77506646f8..9e2e38ad984f87b0dcc1e21c68a71bcd16282e7f 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <gconf>
        <dir name="apps">
+               <dir name="gnome-session">
+                       <dir name="options">
+                               <entry name="logout_prompt" mtime="1326795516" schema="/schemas/apps/gnome-session/options/logout_prompt"/>
+                               <entry name="auto_save_session" mtime="1326795516" schema="/schemas/apps/gnome-session/options/auto_save_session"/>
+                       </dir>
+               </dir>
                <dir name="deskbar">
                        <entry name="entry_width" mtime="1326795484" schema="/schemas/apps/deskbar/entry_width"/>
                        <entry name="ui_name" mtime="1326795484" schema="/schemas/apps/deskbar/ui_name"/>
@@ -1397,6 +1403,16 @@
                        </dir>
                </dir>
                <dir name="gnome">
+                       <dir name="session">
+                               <entry name="required_components_list" mtime="1326795516" schema="/schemas/desktop/gnome/session/required_components_list"/>
+                               <entry name="default_session" mtime="1326795516" schema="/schemas/desktop/gnome/session/default_session"/>
+                               <entry name="idle_delay" mtime="1326795516" schema="/schemas/desktop/gnome/session/idle_delay"/>
+                               <dir name="required_components">
+                                       <entry name="filemanager" mtime="1326795516" schema="/schemas/desktop/gnome/session/required_components/filemanager"/>
+                                       <entry name="panel" mtime="1326795516" schema="/schemas/desktop/gnome/session/required_components/panel"/>
+                                       <entry name="windowmanager" mtime="1326795516" schema="/schemas/desktop/gnome/session/required_components/windowmanager"/>
+                               </dir>
+                       </dir>
                        <dir name="font_rendering">
                                <entry name="rgba_order" mtime="1326782627" schema="/schemas/desktop/gnome/font_rendering/rgba_order"/>
                                <entry name="hinting" mtime="1326782627" schema="/schemas/desktop/gnome/font_rendering/hinting"/>
@@ -1704,6 +1720,22 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="gnome-session">
+                               <dir name="options">
+                                       <entry name="logout_prompt" mtime="1326795516" type="schema" stype="bool" owner="gnome">
+                                               <local_schema locale="C" short_desc="Logout prompt">
+                                                       <default type="bool" value="true"/>
+                                                       <longdesc>If enabled, gnome-session will prompt the user before ending a session.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="auto_save_session" mtime="1326795516" type="schema" stype="bool" owner="gnome">
+                                               <local_schema locale="C" short_desc="Save sessions">
+                                                       <default type="bool" value="false"/>
+                                                       <longdesc>If enabled, gnome-session will save the session automatically.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                               </dir>
+                       </dir>
                        <dir name="deskbar">
                                <entry name="entry_width" mtime="1326795484" type="schema" stype="int" owner="deskbar">
                                        <local_schema locale="C" short_desc="The applet&apos;s entry width in number of characters">
@@ -10528,6 +10560,69 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati
                                </dir>
                        </dir>
                        <dir name="gnome">
+                               <dir name="session">
+                                       <entry name="required_components_list" mtime="1326795516" type="schema" stype="list" owner="gnome" list_type="string">
+                                               <local_schema locale="C" short_desc="Required session components">
+                                                       <default type="list" ltype="string">
+                                                               <li type="string">
+                                                                       <stringvalue>windowmanager</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>panel</stringvalue>
+                                                               </li>
+                                                               <li type="string">
+                                                                       <stringvalue>filemanager</stringvalue>
+                                                               </li>
+                                                       </default>
+                                                       <longdesc>List of components that are required as part of the session. (Each element names a key under &quot;/desktop/gnome/session/required_components&quot;). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="default_session" mtime="1326795516" type="schema" stype="list" owner="gnome" list_type="string">
+                                               <local_schema locale="C" short_desc="Default session">
+                                                       <default type="list" ltype="string">
+                                                               <li type="string">
+                                                                       <stringvalue>gnome-settings-daemon</stringvalue>
+                                                               </li>
+                                                       </default>
+                                                       <longdesc>List of applications that are part of the default session.</longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <entry name="idle_delay" mtime="1326795516" type="schema" stype="int" owner="gnome">
+                                               <local_schema locale="C" short_desc="Time before session is considered idle">
+                                                       <default type="int" value="5"/>
+                                                       <longdesc>
+            The number of minutes of inactivity before the session is
+            considered idle.
+          </longdesc>
+                                               </local_schema>
+                                       </entry>
+                                       <dir name="required_components">
+                                               <entry name="filemanager" mtime="1326795516" type="schema" stype="string" owner="gnome">
+                                                       <local_schema locale="C" short_desc="File Manager">
+                                                               <default type="string">
+                                                                       <stringvalue>nautilus</stringvalue>
+                                                               </default>
+                                                               <longdesc>The file manager provides the desktop icons and allows you to interact with your saved files.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="panel" mtime="1326795516" type="schema" stype="string" owner="gnome">
+                                                       <local_schema locale="C" short_desc="Panel">
+                                                               <default type="string">
+                                                                       <stringvalue>gnome-panel</stringvalue>
+                                                               </default>
+                                                               <longdesc>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                               <entry name="windowmanager" mtime="1326795516" type="schema" stype="string" owner="gnome">
+                                                       <local_schema locale="C" short_desc="Window Manager">
+                                                               <default type="string">
+                                                                       <stringvalue>gnome-wm</stringvalue>
+                                                               </default>
+                                                               <longdesc>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</longdesc>
+                                                       </local_schema>
+                                               </entry>
+                                       </dir>
+                               </dir>
                                <dir name="font_rendering">
                                        <entry name="rgba_order" mtime="1326782627" type="schema" stype="string" owner="gnome">
                                                <local_schema locale="C" short_desc="RGBA order">