From 28b2ee603f8d4140fa16c1d2c32b683e7064be04 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 23 Apr 2012 13:34:53 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- gconf/gconf.xml.defaults/%gconf-tree-de.xml | 1 - .../gconf.xml.defaults/%gconf-tree-en_GB.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree-ru.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree-vi.xml | 1 - gconf/gconf.xml.defaults/%gconf-tree.xml | 144 +++++++++--------- 5 files changed, 76 insertions(+), 72 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index 9dbcb733..3cfad72a 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -6562,7 +6562,6 @@ z.B. »Sans Italic 10«. - Die von Symbolen auf der Arbeitsfläche zu verwendende Schriftbeschreibung. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 2177301c..a7ce9905 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -6519,7 +6519,6 @@ - The font description used for the icons on the desktop. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 37be7c8b..6f2c8faa 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -6504,7 +6504,6 @@ - Описание шрифта, использующегося для подписей к значкам на рабочем столе. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml index a7f08a82..3bc5cceb 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-vi.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-vi.xml @@ -5838,7 +5838,6 @@ vào danh sách này. Phải khởi động lại bảng điều khiển để - Mô tả phông chữ dùng cho các biểu tượng trên màn hình nền. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index cc25121a..22fb74dd 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -2404,72 +2404,72 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -18068,147 +18068,155 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + evince-thumbnailer -s %s %u %o + - + + - + evince-thumbnailer -s %s %u %o + - + + - + evince-thumbnailer -s %s %u %o + - + + - + evince-thumbnailer -s %s %u %o + - + + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o @@ -18216,7 +18224,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -18224,7 +18232,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + evince-thumbnailer -s %s %u %o @@ -18232,7 +18240,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -18240,7 +18248,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + evince-thumbnailer -s %s %u %o @@ -18248,7 +18256,7 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati Valid command plus arguments for the PDF Document thumbnailer. See Nautilus thumbnailer documentation for more information. - + Boolean options available: true enables thumbnailing and false disables the creation of new thumbnails @@ -18256,56 +18264,56 @@ The parser is fairly liberal and allows lower or upper case, and also abbreviati - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + - + evince-thumbnailer -s %s %u %o - + -- 2.39.5