From: fbrehm Date: Sun, 19 Feb 2012 18:52:51 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=fcf279c6fa48c7cf93b9f89e81b6ee09e5e6ad53;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 fa20e87..b670773 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -1499,10 +1499,12 @@ + Eine Liste der im Zeichenkodierungsmenü im Öffnen/Speichern-Dateiwähler anzuzeigenden Zeichenkodierungen. Es werden ausschließlich erkannte Zeichenkodierungen verwendet. + Eine sortierte Liste der von gedit zur Auto-Erkennung der Zeichenkodierung eines Dokuments verwendete Zeichenkodierungen, wobei »CURRENT« die Zeichenkodierung der derzeitigen Standorteinstellungen ist. Es werden ausschließlich bekannte Zeichenkodierungen verwendet. @@ -1510,14 +1512,17 @@ + Gibt die Schrift an, die zum Drucken der Zeilennummern verwendet werden soll. Diese wird nur verwendet, wenn die »Zeilennummern drucken«-Option nicht Null ist. + Gibt die Schrift an, die zum Drucken der Seiten-Kopfzeilen verwendet werden soll. Diese wird nur verwendet, wenn die »Kopfzeilen drucken«-Option aktiviert ist. + Gibt die Schrift an, die zum Drucken des Fließtextes verwendet werden soll. @@ -1711,6 +1716,7 @@ + Die für den Editorbereich zu verwendende benutzerdefinierte Schrift. Diese wird ausschließlich verwendet, falls die »Voreingestellte Schrift verwenden«-Option deaktiviert ist. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml index 54cfb71..9ed8a16 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -1499,10 +1499,12 @@ + List of encodings shown in the Character Encoding menu in open/save file selector. Only recognised encodings are used. + Sorted list of encodings used by gedit for automatically detecting the encoding of a file. "CURRENT" represents the current locale encoding. Only recognised encodings are used. @@ -1510,14 +1512,17 @@ + Specifies the font to use for line numbers when printing. This will only take effect if the "Print Line Numbers" option is non-zero. + Specifies the font to use for page headers when printing a document. This will only take effect if the "Print Header" option is turned on. + Specifies the font to use for a document's body when printing documents. @@ -1711,6 +1716,7 @@ + A custom font that will be used for the editing area. This will only take effect if the "Use Default Font" option is turned off. diff --git a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml index 7526d36..b9c08e5 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -1499,10 +1499,12 @@ + Список кодировок, отображаемый в меню "Кодировка символов" диалога выбора файлов. Используются только распознаваемые кодировки. + Сортированный список кодировок, используемых редактором для автоопределения кодировки файла. «ТЕКУЩАЯ» — это кодировка локали. Используются только распознаваемые кодировки. @@ -1510,14 +1512,17 @@ + Определяет шрифт, используемый при печати номеров строк. Будет иметь эффект, только если параметр "Печатать номера строк" не равен нулю. + Определяет шрифт, используемый при печати заголовков. Будет иметь эффект, только если параметр "Печатать заголовки страниц" включён. + Определяет шрифт, используемый при печати тела документов. @@ -1711,6 +1716,7 @@ + Другой шрифт, который будет использован для области редактирования. Будет иметь эффект только если параметр «Использовать исходный шрифт» выключен. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 4919429..b7e4c48 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -377,106 +377,106 @@ - + - - + + - - - + + + - - - - + + + + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - - + + - + - - + + - - - - + + + + - + - - + + - + - - - + + + - - - - + + + + @@ -5250,7 +5250,7 @@ - + Whether gedit should enable syntax highlighting. @@ -5258,7 +5258,7 @@ - +
  • @@ -5302,7 +5302,7 @@ - +
  • @@ -5376,7 +5376,7 @@
    • - + Sans 8 @@ -5401,7 +5401,7 @@ - + Sans 11 @@ -5426,7 +5426,7 @@ - + Monospace 9 @@ -5452,7 +5452,7 @@ - + If this value is 0, then no line numbers will be @@ -5460,7 +5460,7 @@ print line numbers every such number of lines. - + GTK_WRAP_WORD @@ -5473,14 +5473,14 @@ here. - + Whether gedit should include a document header when printing documents. - + Whether gedit should print syntax highlighting when @@ -5491,7 +5491,7 @@ - + Specifies the maximum number of recently opened files @@ -5500,7 +5500,7 @@ - + Whether the bottom panel at the bottom of editing windows @@ -5509,7 +5509,7 @@ - + Whether the side pane at the left of editing windows @@ -5518,7 +5518,7 @@ - + Whether the status bar at the bottom of editing windows @@ -5527,7 +5527,7 @@ - + GEDIT_TOOLBAR_SYSTEM @@ -5541,7 +5541,7 @@ appear exactly as mentioned here. - + Whether the toolbar should be visible in editing windows. @@ -5551,7 +5551,7 @@ - + Whether gedit should highlight all the occurrences of the searched text. @@ -5559,7 +5559,7 @@ - + Whether gedit should restore the previous cursor position when a file is loaded. @@ -5567,7 +5567,7 @@ - + after @@ -5584,13 +5584,13 @@ - + Specifies the position of the right margin. - + Whether gedit should display the right margin in the editing @@ -5599,7 +5599,7 @@ - + Whether gedit should highlight the bracket matching the selected one. @@ -5607,7 +5607,7 @@ - + Whether gedit should highlight the current line. @@ -5615,7 +5615,7 @@ - + Whether gedit should display line numbers in the editing @@ -5624,7 +5624,7 @@ - + Whether gedit should enable automatic indentation. @@ -5632,13 +5632,13 @@ - + Whether gedit should insert spaces instead of tabs. - + Specifies the number of spaces that should be displayed @@ -5647,7 +5647,7 @@ - + GTK_WRAP_WORD @@ -5662,14 +5662,14 @@ - + Maximum number of actions that gedit will be able to undo or redo. Use "-1" for unlimited number of actions. - + Maximum number of actions that gedit will be able to @@ -5679,7 +5679,7 @@ - +
  • @@ -5705,7 +5705,7 @@ is writable by default. - + Number of minutes after which gedit will automatically @@ -5713,7 +5713,7 @@ option is turned on. - + Whether gedit should automatically save modified files @@ -5721,7 +5721,7 @@ "Autosave Interval" option. - + Whether gedit should create backup copies for the files @@ -5731,7 +5731,7 @@
    • - + classic @@ -5742,7 +5742,7 @@ - + Monospace 12 @@ -5767,7 +5767,7 @@ - + Whether to use the system's default fixed width font for editing @@ -5780,7 +5780,7 @@     - +
  • @@ -5804,7 +5804,7 @@ - + @@ -5813,7 +5813,7 @@ works on top of the filter_mode. - + hidden_and_binary @@ -5824,7 +5824,7 @@ hidden_and_binary (filter both hidden and binary files). - + If TRUE the file browser plugin will view the directory of @@ -5834,13 +5834,13 @@ - + Sets whether to enable restoring of remote locations. - + @@ -5850,7 +5850,7 @@ must always be below the actual root. - + @@ -5859,7 +5859,7 @@ browser plugin and onload/tree_view is TRUE. - + Open the tree view when the file browser plugin gets loaded instead of the bookmarks view