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 c8263295bedc370ce59ac7d765e50cc534b55140..10b52b5fe43bfef9a80b05b1f91e6c09a339305b 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml
@@ -2,6 +2,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="yelp">
+                               <entry name="fixed_font">
+                                       <local_schema short_desc="Dicktengleiche Schrift">
+                                               <longdesc>Schrift für Buchstaben mit fester Breite (Dicktengleichheit)</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="variable_font">
+                                       <local_schema short_desc="Standardschrift">
+                                               <longdesc>Schrift für Buchstaben mit variabler Breite</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_system_fonts">
+                                       <local_schema short_desc="Systemschriften verwenden">
+                                               <longdesc>Die vom System vorgegebenen Schriften verwenden.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_caret">
+                                       <local_schema short_desc="Rahmen verwenden">
+                                               <longdesc>Einen über die Tastatur kontrollierbaren Rahmen verwenden, wenn Seiten betrachtet werden.</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="epiphany">
                                <dir name="directories">
                                        <entry name="downloads_folder">
@@ -59,7 +81,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Voreingestellter Zeichensatz">
-                                                       <longdesc>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«.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -118,7 +139,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="Die momentan gewählte Schriftsprache">
-                                                       <longdesc>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).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml
index c3f9c414dd434505ae7be2ccb7a4638fdf87e278..b8cea8d05eaea87286e300fbe924194157edfedf 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,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="yelp">
+                               <entry name="fixed_font">
+                                       <local_schema short_desc="Font for fixed text">
+                                               <longdesc>Font for text with fixed width.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="variable_font">
+                                       <local_schema short_desc="Font for text">
+                                               <longdesc>Font for text with variable width.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_system_fonts">
+                                       <local_schema short_desc="Use system fonts">
+                                               <longdesc>Use the default fonts set for the system.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_caret">
+                                       <local_schema short_desc="Use caret">
+                                               <longdesc>Use a keyboard-controllable caret when viewing pages.</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="epiphany">
                                <dir name="directories">
                                        <entry name="downloads_folder">
@@ -59,7 +81,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Default encoding">
-                                                       <longdesc>Default encoding. Accepted values are: &quot;armscii-8&quot;, &quot;Big5&quot;, &quot;Big5-HKSCS&quot;, &quot;EUC-JP&quot;, &quot;EUC-KR&quot;, &quot;gb18030&quot;, &quot;GB2312&quot;, &quot;geostd8&quot;, &quot;HZ-GB-2312&quot;, &quot;IBM850&quot;, &quot;IBM852&quot;, &quot;IBM855&quot;, &quot;IBM857&quot;, &quot;IBM862&quot;, &quot;IBM864&quot;, &quot;IBM866&quot;, &quot;ISO-2022-CN&quot;, &quot;ISO-2022-JP&quot;, &quot;ISO-2022-KR&quot;, &quot;ISO-8859-1&quot;, &quot;ISO-8859-2&quot;, &quot;ISO-8859-3&quot;, &quot;ISO-8859-4&quot;, &quot;ISO-8859-5&quot;, &quot;ISO-8859-6&quot;, &quot;ISO-8859-7&quot;, &quot;ISO-8859-8&quot;, &quot;ISO-8859-8-I&quot;, &quot;ISO-8859-9&quot;, &quot;ISO-8859-10&quot;, &quot;ISO-8859-11&quot;, &quot;ISO-8859-13&quot;, &quot;ISO-8859-14&quot;, &quot;ISO-8859-15&quot;, &quot;ISO-8859-16&quot;, &quot;ISO-IR-111&quot;, &quot;KOI8-R&quot;, &quot;KOI8-U&quot;, &quot;Shift_JIS&quot;, &quot;TIS-620&quot;, &quot;UTF-7&quot;, &quot;UTF-8&quot;, &quot;VISCII&quot;, &quot;windows-874&quot;, &quot;windows-1250&quot;, &quot;windows-1251&quot;, &quot;windows-1252&quot;, &quot;windows-1253&quot;, &quot;windows-1254&quot;, &quot;windows-1255&quot;, &quot;windows-1256&quot;, &quot;windows-1257&quot;, &quot;windows-1258&quot;, &quot;x-euc-tw&quot;, &quot;x-gbk&quot;, &quot;x-johab&quot;, &quot;x-mac-arabic&quot;, &quot;x-mac-ce&quot;, &quot;x-mac-croatian&quot;, &quot;x-mac-cyrillic&quot;, &quot;x-mac-devanagari&quot;, &quot;x-mac-farsi&quot;, &quot;x-mac-greek&quot;, &quot;x-mac-gujarati&quot;, &quot;x-mac-gurmukhi&quot;, &quot;x-mac-hebrew&quot;, &quot;x-mac-icelandic&quot;, &quot;x-mac-roman&quot;, &quot;x-mac-romanian&quot;, &quot;x-mac-turkish&quot;, &quot;x-mac-ukrainian&quot;, &quot;x-user-defined&quot;, &quot;x-viet-tcvn5712&quot;, &quot;x-viet-vps&quot; and &quot;x-windows-949&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -118,7 +139,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="The currently-selected font language">
-                                                       <longdesc>The currently-selected font language. Values are &quot;ar&quot; (arabic), &quot;x-baltic&quot; (baltic languages), &quot;x-central-euro&quot; (central european languages), &quot;x-cyrillic&quot; (languages written with cyrillic alphabet), &quot;el&quot; (greek), &quot;he&quot; (hebrew), &quot;ja&quot; (japanese), &quot;ko&quot; (korean), &quot;zh-CN&quot; (simplified chinese), &quot;th&quot; (thai), &quot;zh-TW&quot; (traditional chinese), &quot;tr&quot; (turkish), &quot;x-unicode&quot; (other languages), &quot;x-western&quot; (languages written in latin script), &quot;x-tamil&quot; (tamil) and &quot;x-devanagari&quot; (devanagari).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
index fdfa396402a6fcbcf34deb501be45a4ff827de7a..9ba9e756eec752c72d2240945b440ce76ed08df0 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml
@@ -2,6 +2,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="yelp">
+                               <entry name="fixed_font">
+                                       <local_schema short_desc="Шрифт для фиксированного текста">
+                                               <longdesc>Шрифт для текста постоянной ширины.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="variable_font">
+                                       <local_schema short_desc="Шрифт для текста">
+                                               <longdesc>Шрифт для текста переменной ширины.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_system_fonts">
+                                       <local_schema short_desc="Использовать системные шрифты">
+                                               <longdesc>Использовать системный набор шрифтов по умолчанию.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_caret">
+                                       <local_schema short_desc="Использовать курсор">
+                                               <longdesc>Использовать управляемый с клавиатуры курсор при просмотре страниц</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="epiphany">
                                <dir name="directories">
                                        <entry name="downloads_folder">
@@ -59,7 +81,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Кодировка по умолчанию">
-                                                       <longdesc>Кодировка по умолчанию. Допустимые значения: &quot;armscii-8&quot;, &quot;Big5&quot;, &quot;Big5-HKSCS&quot;, &quot;EUC-JP&quot;, &quot;EUC-KR&quot;, &quot;gb18030&quot;, &quot;GB2312&quot;, &quot;geostd8&quot;, &quot;HZ-GB-2312&quot;, &quot;IBM850&quot;, &quot;IBM852&quot;, &quot;IBM855&quot;, &quot;IBM857&quot;, &quot;IBM862&quot;, &quot;IBM864&quot;, &quot;IBM866&quot;, &quot;ISO-2022-CN&quot;, &quot;ISO-2022-JP&quot;, &quot;ISO-2022-KR&quot;, &quot;ISO-8859-1&quot;, &quot;ISO-8859-2&quot;, &quot;ISO-8859-3&quot;, &quot;ISO-8859-4&quot;, &quot;ISO-8859-5&quot;, &quot;ISO-8859-6&quot;, &quot;ISO-8859-7&quot;, &quot;ISO-8859-8&quot;, &quot;ISO-8859-8-I&quot;, &quot;ISO-8859-9&quot;, &quot;ISO-8859-10&quot;, &quot;ISO-8859-11&quot;, &quot;ISO-8859-13&quot;, &quot;ISO-8859-14&quot;, &quot;ISO-8859-15&quot;, &quot;ISO-8859-16&quot;, &quot;ISO-IR-111&quot;, &quot;KOI8-R&quot;, &quot;KOI8-U&quot;, &quot;Shift_JIS&quot;, &quot;TIS-620&quot;, &quot;UTF-7&quot;, &quot;UTF-8&quot;, &quot;VISCII&quot;, &quot;windows-874&quot;, &quot;windows-1250&quot;, &quot;windows-1251&quot;, &quot;windows-1252&quot;, &quot;windows-1253&quot;, &quot;windows-1254&quot;, &quot;windows-1255&quot;, &quot;windows-1256&quot;, &quot;windows-1257&quot;, &quot;windows-1258&quot;, &quot;x-euc-tw&quot;, &quot;x-gbk&quot;, &quot;x-johab&quot;, &quot;x-mac-arabic&quot;, &quot;x-mac-ce&quot;, &quot;x-mac-croatian&quot;, &quot;x-mac-cyrillic&quot;, &quot;x-mac-devanagari&quot;, &quot;x-mac-farsi&quot;, &quot;x-mac-greek&quot;, &quot;x-mac-gujarati&quot;, &quot;x-mac-gurmukhi&quot;, &quot;x-mac-hebrew&quot;, &quot;x-mac-icelandic&quot;, &quot;x-mac-roman&quot;, &quot;x-mac-romanian&quot;, &quot;x-mac-turkish&quot;, &quot;x-mac-ukrainian&quot;, &quot;x-user-defined&quot;, &quot;x-viet-tcvn5712&quot;, &quot;x-viet-vps&quot; и &quot;x-windows-949&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -118,7 +139,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="Выбранный на настоящий момент язык шрифтов">
-                                                       <longdesc>Выбранный на настоящий момент язык шрифтов. Допустимые значения &quot;ar&quot; (арабский), &quot;x-baltic&quot; (балтийские языки), &quot;x-central-euro&quot; (центрально-европейские языки) , &quot;x-cyrillic&quot; (языки, использующие кириллицу), &quot;el&quot; (греческий), &quot;he&quot; (еврейский), &quot;ja&quot; (японский), &quot;ko&quot; (корейский), &quot;zh-CN&quot; (китайский упрощённый), &quot;th&quot; (тайский), &quot;zh-TW&quot; (китайский традиционный), &quot;tr&quot; (турецкий), &quot;x-unicode&quot; (прочие языки), &quot;x-western&quot; (языки, использующие латиницу), &quot;x-tamil&quot; (тамильский) and &quot;x-devanagari&quot; (деванагари).</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
index 2ffd9eb3d67b8a0057b3cbe77c7f1b3b7199dd23..e0b102687d4719993f784a9793aad8a766b9d3e4 100644 (file)
--- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
+++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml
@@ -2,6 +2,28 @@
 <gconf>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="yelp">
+                               <entry name="fixed_font">
+                                       <local_schema short_desc="Phông chữ cho đoạn chữ cố định">
+                                               <longdesc>Phông chữ cho đoạn chữ có độ rộng cố định.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="variable_font">
+                                       <local_schema short_desc="Phông chữ cho đoạn chữ">
+                                               <longdesc>Phông chữ cho đoạn chữ có độ rộng biến đổi.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_system_fonts">
+                                       <local_schema short_desc="Dùng phông chữ hệ thống">
+                                               <longdesc>Dùng phông mặc định của hệ thống.</longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_caret">
+                                       <local_schema short_desc="Dùng con trỏ">
+                                               <longdesc>Dùng phím mũi tên điều khiển con trỏ để xem các trang.</longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="epiphany">
                                <dir name="directories">
                                        <entry name="downloads_folder">
@@ -63,8 +85,6 @@
                                        </entry>
                                        <entry name="default_encoding">
                                                <local_schema short_desc="Bảng mã mặc định">
-                                                       <longdesc>Bảng mã mặc định. Giá trị có thể:
-&quot;armscii-8&quot;, &quot;Big5&quot;, &quot;Big5-HKSCS, &quot;EUC-JP&quot;, &quot;EUC-KR&quot;, &quot;gb18030&quot;, &quot;GB2312&quot;, &quot;geostd8&quot;, &quot;HZ-GB-2312&quot;, &quot;IBM850&quot;, &quot;IBM852&quot;, &quot;IBM855&quot;, &quot;IBM857&quot;, &quot;IBM862&quot;, &quot;IBM864&quot;, &quot;IBM866&quot;, &quot;ISO-2022-CN&quot;, &quot;ISO-2022-JP&quot;, &quot;ISO-2022-KR&quot;, &quot;ISO-8859-1&quot;, &quot;ISO-8859-2&quot;, &quot;ISO-8859-3&quot;, &quot;ISO-8859-4&quot;, &quot;ISO-8859-5&quot;, &quot;ISO-8859-6&quot;, &quot;ISO-8859-7&quot;, &quot;ISO-8859-8&quot;, &quot;ISO-8859-8-I&quot;, &quot;ISO-8859-9&quot;, &quot;ISO-8859-10&quot;, &quot;ISO-8859-11&quot;, &quot;ISO-8859-13&quot;, &quot;ISO-8859-14&quot;, &quot;ISO-8859-15&quot;, &quot;ISO-8859-16&quot;, &quot;ISO-IR-111&quot;, &quot;KOI8-R&quot;, &quot;KOI8-U&quot;, &quot;Shift_JIS&quot;, &quot;TIS-620&quot;, &quot;UTF-7&quot;, &quot;UTF-8 (tốt nhất)&quot;, &quot;VISCII&quot;, &quot;windows-874&quot;, &quot;windows-1250&quot;, &quot;windows-1251&quot;, &quot;windows-1252&quot;, &quot;windows-1253&quot;, &quot;windows-1254&quot;, &quot;windows-1255&quot;, &quot;windows-1256&quot;, &quot;windows-1257&quot;, &quot;windows-1258&quot;, &quot;x-euc-tw&quot;, &quot;x-gbk&quot;, &quot;x-johab&quot;, &quot;x-mac-arabic&quot;, &quot;x-mac-ce&quot;, &quot;x-mac-croatian&quot;, &quot;x-mac-cyrillic&quot;, &quot;x-mac-devanagari&quot;, &quot;x-mac-farsi&quot;, &quot;x-mac-greek&quot;, &quot;x-mac-gujarati&quot;, &quot;x-mac-gurmukhi&quot;, &quot;x-mac-hebrew&quot;, &quot;x-mac-icelandic&quot;, &quot;x-mac-roman&quot;, &quot;x-mac-romanian&quot;, &quot;x-mac-turkish&quot;, &quot;x-mac-ukrainian&quot;, &quot;x-user-defined&quot;, &quot;x-viet-tcvn5712&quot;, &quot;x-viet-vps&quot; và &quot;x-windows-949&quot;.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="use_own_fonts">
@@ -126,23 +146,6 @@
                                        </entry>
                                        <entry name="preferences_font_language">
                                                <local_schema short_desc="Ngôn ngữ phông chữ hiện thời được chọn">
-                                                       <longdesc>Ngôn ngữ phông chữ hiện thời được chọn. Giá trị hợp lệ:
- • ar                                tiếng A Rập
- • x-baltic          bộ ngôn ngữ thuộc biển Ban-tích
- • x-central-euro    bộ ngôn ngữ vùng Trung Âu
- • x-cyrillic                bộ ngôn ngữ được viết bằng chữ cái ki-rin
- • el                                tiếng Hy Lạp
- • he                        tiếng Do Thái
- • ja                                tiếng Nhật
- • ko                        tiếng Hàn
- • zh-CN                     tiếng Trung phổ thông
- • th                                tiếng Thái
- • zh-TW                     tiếng Trung truyền thống
- • tr                                tiếng Thổ Nhĩ Kỳ
- • x-unicode         mã Unicode, tốt hơn cho tiếng Việt
- • x-western         bộ ngôn ngữ được viết bằng chữ La-tinh
- • x-tamil           tiếng Ta-min
- • x-devanagari      tiếng Đe-va-na-ga-ri.</longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="history_view_details">

diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml
index a176386a06cf574b4298997e43e8fd660d1b4337..4b4e4c00454809933cb81b5ec1683e0320350bec 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="yelp">
+                       <entry name="fixed_font" mtime="1326800418" schema="/schemas/apps/yelp/fixed_font"/>
+                       <entry name="variable_font" mtime="1326800418" schema="/schemas/apps/yelp/variable_font"/>
+                       <entry name="use_system_fonts" mtime="1326800418" schema="/schemas/apps/yelp/use_system_fonts"/>
+                       <entry name="use_caret" mtime="1326800418" schema="/schemas/apps/yelp/use_caret"/>
+               </dir>
                <dir name="epiphany">
                        <dir name="directories">
                                <entry name="downloads_folder" mtime="1326797120" schema="/schemas/apps/epiphany/directories/downloads_folder"/>
@@ -2238,6 +2244,44 @@
        </dir>
        <dir name="schemas">
                <dir name="apps">
+                       <dir name="yelp">
+                               <entry name="fixed_font" mtime="1326800418" type="schema" stype="string" owner="yelp">
+                                       <local_schema locale="C" short_desc="Font for fixed text">
+                                               <default type="string">
+                                                       <stringvalue>Monospace 12</stringvalue>
+                                               </default>
+                                               <longdesc>
+          Font for text with fixed width.
+        </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="variable_font" mtime="1326800418" type="schema" stype="string" owner="yelp">
+                                       <local_schema locale="C" short_desc="Font for text">
+                                               <default type="string">
+                                                       <stringvalue>Sans 12</stringvalue>
+                                               </default>
+                                               <longdesc>
+          Font for text with variable width.
+        </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_system_fonts" mtime="1326800418" type="schema" stype="bool" owner="yelp">
+                                       <local_schema locale="C" short_desc="Use system fonts">
+                                               <default type="bool" value="true"/>
+                                               <longdesc>
+          Use the default fonts set for the system.
+        </longdesc>
+                                       </local_schema>
+                               </entry>
+                               <entry name="use_caret" mtime="1326800418" type="schema" stype="bool" owner="yelp">
+                                       <local_schema locale="C" short_desc="Use caret">
+                                               <default type="bool" value="true"/>
+                                               <longdesc>
+          Use a keyboard-controllable caret when viewing pages.
+        </longdesc>
+                                       </local_schema>
+                               </entry>
+                       </dir>
                        <dir name="epiphany">
                                <dir name="directories">
                                        <entry name="downloads_folder" mtime="1326797120" type="schema" stype="string" owner="epiphany">
@@ -2281,7 +2325,6 @@
                                        <entry name="inspector_enabled" mtime="1326797120" type="schema" stype="bool" owner="epiphany">
                                                <local_schema locale="C" short_desc="Enable Web Inspector">
                                                        <default type="bool" value="false"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="browse_with_caret" mtime="1326797120" type="schema" stype="bool" owner="epiphany">
@@ -2419,7 +2462,6 @@
                                        <entry name="warn_on_close_unsubmitted_data" mtime="1326797120" type="schema" stype="bool" owner="epiphany">
                                                <local_schema locale="C" short_desc="">
                                                        <default type="bool" value="true"/>
-                                                       <longdesc></longdesc>
                                                </local_schema>
                                        </entry>
                                        <entry name="downloads_hidden" mtime="1326797120" type="schema" stype="bool" owner="epiphany">
@@ -2597,8 +2639,7 @@
                                                </local_schema>
                                        </entry>
                                        <entry name="middle_click_open_url" mtime="1326797120" type="schema" stype="bool" owner="epiphany">
-                                               <local_schema locale="C" short_desc="Middle click to open the web page pointed to by the currently
-       selected text">
+                                               <local_schema locale="C" short_desc="Middle click to open the web page pointed to by the currently  selected text">
                                                        <default type="bool" value="false"/>
                                                        <longdesc>Middle clicking on the main view pane will open the web page
        pointed to by the currently selected text.</longdesc>