From: fbrehm Date: Sun, 19 Feb 2012 20:37:19 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=22ebe9b9d6d06a3ee3e934225707bb1cebb67d0e;p=config%2Fsamara%2Fetc.git 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 058d011..c112637 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -64,6 +64,7 @@ + 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«. @@ -122,6 +123,7 @@ + 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 54cfb71..5d7a93a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -64,6 +64,7 @@ + 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". @@ -122,6 +123,7 @@ + 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 cb0bda8..08febf3 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -64,6 +64,7 @@ + Кодировка по умолчанию. Допустимые значения: "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". @@ -122,6 +123,7 @@ + Выбранный на настоящий момент язык шрифтов. Допустимые значения "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 94a19e9..7f4db89 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -3,71 +3,71 @@ - - - - - + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -2946,7 +2946,7 @@ - + Downloads @@ -2954,28 +2954,28 @@ The path of the folder where to download files to; or "Downloads" to use the default downloads folder, or "Desktop" to use the desktop folder. - + ~ - + ~ - + ~ - + ~ @@ -2984,34 +2984,35 @@ - + + - + - + - + - + Allow sites to open new windows using JavaScript (if JavaScript is enabled). - + normal @@ -3020,7 +3021,7 @@ "once" and "disabled". - + current site @@ -3029,20 +3030,20 @@ "current site" and "nowhere". - + Preferred languages, two letter codes. - + Size of disk cache, in MB. - + serif @@ -3051,7 +3052,7 @@ - + ISO-8859-1 @@ -3090,44 +3091,45 @@ - + Use your own fonts instead of the fonts the page requests. - + Use your own colors instead of the colors the page requests. - + - + - + + - + Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started. - + normal @@ -3135,37 +3137,37 @@ How to print pages containing frames. Allowed values are "normal", "separately" and "selected". - + - + - + - + - + - + - + x-western @@ -3196,7 +3198,7 @@ - +
  • @@ -3212,7 +3214,7 @@ - +
  • @@ -3225,7 +3227,7 @@ - + ever @@ -3237,18 +3239,18 @@
    • - + - + Whether to store and prefill passwords in web sites. - +
  • @@ -3258,29 +3260,29 @@ Lists the active extensions. - + - + - + - + Force new window requests to be opened in tabs instead of using a new window. - + @@ -3290,14 +3292,15 @@ "icons", and "text". - - + + Middle clicking on the main view pane will open the web page pointed to by the currently selected text. - + When files cannot be opened by the browser they are @@ -3305,13 +3308,13 @@ with the appropriate application. - + Show the tab bar also when there is only one tab open. - + @@ -3319,7 +3322,7 @@ String that will be used as user agent, to identify the browser to the web servers. - + http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 @@ -3327,7 +3330,7 @@ Search string for keywords entered in the URL bar. - + http://www.google.com @@ -3337,19 +3340,19 @@
    • - + User is not allowed to close Epiphany - + Locks Epiphany in fullscreen mode. - + Disable all historical information by disabling back and @@ -3357,25 +3360,25 @@ most used bookmarks list. - + Disable the user's ability to edit toolbars. - + Disable the user's ability to add or edit bookmarks. - + Disable the user's ability to type in a URL to Epiphany. - + @@ -3383,20 +3386,20 @@ default, when disable_unsafe_protocols is enabled. - + Disables loading of content from unsafe protocols. Safe protocols are http and https. - + Hide the menubar by default. - + Disable JavaScript's control over window chrome. @@ -9572,8 +9575,7 @@ - +