From b94b8a7c34bb245de8c13abf8315586ea361a3ff Mon Sep 17 00:00:00 2001 From: fbrehm Date: Sun, 19 Feb 2012 21:37:55 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 2 - .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 2 - gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 2 - gconf/gconf.xml.defaults/%gconf-tree.xml | 37 +++++++++---------- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index c112637..058d011 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -64,7 +64,6 @@ - Der voreingestellte Zeichensatz. Zulässige Werte: »armscii-8«, »Big5«, »Big5-HKSCS«, »EUC-JP«, »EUC-KR«, »gb18030«, »GB2312«, »geostd8«, »HZ-GB-2312«, »IBM850«, »IBM852«, »IBM855«, »IBM857«, »IBM862«, »IBM864«, »IBM866«, »ISO-2022-CN«, »ISO-2022-JP«, »ISO-2022-KR«, »ISO-8859-1«, »ISO-8859-2«, »ISO-8859-3«, »ISO-8859-4«, »ISO-8859-5«, »ISO-8859-6«, »ISO-8859-7«, »ISO-8859-8«, »ISO-8859-8-I«, ISO-8859-9«, »ISO-8859-10«, »ISO-8859-11«, »ISO-8859-13«, »ISO-8859-14«, »ISO-8859-15«, »ISO-8859-16«, »ISO-IR-111«, »KOI8-R«, »KOI8-U«, »Shift_JIS«, »TIS-620«, »UTF-7«, »UTF-8«, »VISCII«, »windows-874«, »windows-1250«, »windows-1251«, »windows-1252«, »windows-1253«, »windows-1254«, »windows-1255«, »windows-1256«, »windows-1257«, »windows-1258«, »x-euc-tw«, »x-gbk«, »x-johab«, »x-mac-arabic«, »x-mac-ce«, »x-mac-croatian«, »x-mac-cyrillic«, »x-mac-devanagari«, »x-mac-farsi«, »x-mac-greek«, »x-mac-gujarati«, »x-mac-gurmukhi«, »x-mac-hebrew«, »x-mac-icelandic«, »x-mac-roman«, »x-mac-romanian«, »x-mac-turkish«, »x-mac-ukrainian«, »x-user-defined«, »x-viet-tcvn5712«, »x-viet-vps« sowie »x-windows-949«. @@ -123,7 +122,6 @@ - Die Sprache der momentan gewählten Schrift. Zulässige Werte: »ar« (Arabisch), »x-baltic« (Baltische Sprachen), »x-central-euro« (Zentraleuropäische Sprachen), »x-cyrillic« (im Kyrillischen Alphabet notierte Sprachen), »el« (Griechisch), »he« (Hebräisch), »ja« (Japanisch), »ko« (Koreanisch), »zh-CN« (Chinesisch, vereinfacht), »th« (Thai), »zh-TW« (Chinesisch, traditionell), »tr« (Türkisch), »x-unicode« (übrige Sprachen), »x-western« (In lateinischer Schrift notierte Sprachen), »x-tamil« (Tamil) sowie »x-devanagari« (Devanagari). diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 5d7a93a..54cfb71 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -64,7 +64,6 @@ - Default encoding. Accepted values are: "armscii-8", "Big5", "Big5-HKSCS", "EUC-JP", "EUC-KR", "gb18030", "GB2312", "geostd8", "HZ-GB-2312", "IBM850", "IBM852", "IBM855", "IBM857", "IBM862", "IBM864", "IBM866", "ISO-2022-CN", "ISO-2022-JP", "ISO-2022-KR", "ISO-8859-1", "ISO-8859-2", "ISO-8859-3", "ISO-8859-4", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7", "ISO-8859-8", "ISO-8859-8-I", "ISO-8859-9", "ISO-8859-10", "ISO-8859-11", "ISO-8859-13", "ISO-8859-14", "ISO-8859-15", "ISO-8859-16", "ISO-IR-111", "KOI8-R", "KOI8-U", "Shift_JIS", "TIS-620", "UTF-7", "UTF-8", "VISCII", "windows-874", "windows-1250", "windows-1251", "windows-1252", "windows-1253", "windows-1254", "windows-1255", "windows-1256", "windows-1257", "windows-1258", "x-euc-tw", "x-gbk", "x-johab", "x-mac-arabic", "x-mac-ce", "x-mac-croatian", "x-mac-cyrillic", "x-mac-devanagari", "x-mac-farsi", "x-mac-greek", "x-mac-gujarati", "x-mac-gurmukhi", "x-mac-hebrew", "x-mac-icelandic", "x-mac-roman", "x-mac-romanian", "x-mac-turkish", "x-mac-ukrainian", "x-user-defined", "x-viet-tcvn5712", "x-viet-vps" and "x-windows-949". @@ -123,7 +122,6 @@ - The currently-selected font language. Values are "ar" (arabic), "x-baltic" (baltic languages), "x-central-euro" (central european languages), "x-cyrillic" (languages written with cyrillic alphabet), "el" (greek), "he" (hebrew), "ja" (japanese), "ko" (korean), "zh-CN" (simplified chinese), "th" (thai), "zh-TW" (traditional chinese), "tr" (turkish), "x-unicode" (other languages), "x-western" (languages written in latin script), "x-tamil" (tamil) and "x-devanagari" (devanagari). diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 08febf3..cb0bda8 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -64,7 +64,6 @@ - Кодировка по умолчанию. Допустимые значения: "armscii-8", "Big5", "Big5-HKSCS", "EUC-JP", "EUC-KR", "gb18030", "GB2312", "geostd8", "HZ-GB-2312", "IBM850", "IBM852", "IBM855", "IBM857", "IBM862", "IBM864", "IBM866", "ISO-2022-CN", "ISO-2022-JP", "ISO-2022-KR", "ISO-8859-1", "ISO-8859-2", "ISO-8859-3", "ISO-8859-4", "ISO-8859-5", "ISO-8859-6", "ISO-8859-7", "ISO-8859-8", "ISO-8859-8-I", "ISO-8859-9", "ISO-8859-10", "ISO-8859-11", "ISO-8859-13", "ISO-8859-14", "ISO-8859-15", "ISO-8859-16", "ISO-IR-111", "KOI8-R", "KOI8-U", "Shift_JIS", "TIS-620", "UTF-7", "UTF-8", "VISCII", "windows-874", "windows-1250", "windows-1251", "windows-1252", "windows-1253", "windows-1254", "windows-1255", "windows-1256", "windows-1257", "windows-1258", "x-euc-tw", "x-gbk", "x-johab", "x-mac-arabic", "x-mac-ce", "x-mac-croatian", "x-mac-cyrillic", "x-mac-devanagari", "x-mac-farsi", "x-mac-greek", "x-mac-gujarati", "x-mac-gurmukhi", "x-mac-hebrew", "x-mac-icelandic", "x-mac-roman", "x-mac-romanian", "x-mac-turkish", "x-mac-ukrainian", "x-user-defined", "x-viet-tcvn5712", "x-viet-vps" и "x-windows-949". @@ -123,7 +122,6 @@ - Выбранный на настоящий момент язык шрифтов. Допустимые значения "ar" (арабский), "x-baltic" (балтийские языки), "x-central-euro" (центрально-европейские языки) , "x-cyrillic" (языки, использующие кириллицу), "el" (греческий), "he" (еврейский), "ja" (японский), "ko" (корейский), "zh-CN" (китайский упрощённый), "th" (тайский), "zh-TW" (китайский традиционный), "tr" (турецкий), "x-unicode" (прочие языки), "x-western" (языки, использующие латиницу), "x-tamil" (тамильский) and "x-devanagari" (деванагари). diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 7f4db89..5e94c43 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -939,8 +939,8 @@ - - + + @@ -2086,13 +2086,13 @@ - - - + + + - - - + + + @@ -2987,7 +2987,6 @@ - @@ -3120,7 +3119,6 @@ - @@ -3293,8 +3291,7 @@ - + Middle clicking on the main view pane will open the web page pointed to by the currently selected text. @@ -8840,13 +8837,13 @@ - + If enabled, gnome-session will prompt the user before ending a session. - + If enabled, gnome-session will save the session automatically. @@ -16146,7 +16143,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - +
  • @@ -16162,7 +16159,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati List of components that are required as part of the session. (Each element names a key under "/desktop/gnome/session/required_components"). 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. - +
  • @@ -16172,7 +16169,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati List of applications that are part of the default session. - + @@ -16182,7 +16179,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + nautilus @@ -16190,7 +16187,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The file manager provides the desktop icons and allows you to interact with your saved files. - + gnome-panel @@ -16198,7 +16195,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc. - + gnome-wm -- 2.39.5