From: frank Date: Mon, 23 Apr 2012 11:33:16 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=baa1928a8081f3c92417a7fcef2e380f76bb56f3;p=config%2Fbruni%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index 850942cf..9a06ec19 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -386,306 +386,306 @@ - - + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - + + + + - + - - - + + + - + - - + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + - + @@ -5668,110 +5668,110 @@ - + The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - + The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0"). - + Flag that enables a much simplified user interface. - + Whether Evolution will start up in offline mode instead of online mode. - + Initial folder for GtkFileChooser dialogs. - + Initial view for attachment bar widgets. "0" is Icon View, "1" is List View. - + Whether the warning dialog in development versions of Evolution is skipped. - + URL that provides proxy configuration values. - + This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24). - + Password to pass as authentication when doing HTTP proxying. - + User name to pass as authentication when doing HTTP proxying. - + If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file. - + Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet. - + The machine name to proxy socks through. - + The port on the machine defined by "/apps/evolution/shell/network_config/socks_host" that you proxy through. - + The machine name to proxy secure HTTP through. - + The port on the machine defined by "/apps/evolution/shell/network_config/secure_host" that you proxy through. - + The machine name to proxy HTTP through. - + The port on the machine defined by "/apps/evolution/shell/network_config/http_host" that you proxy through. - + Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing "use system settings", "no proxy", "use manual proxy configuration" and "use proxy configuration provided in the autoconfig url" respectively. @@ -5779,7 +5779,7 @@ - + mail @@ -5787,25 +5787,25 @@ ID or alias of the component to be shown by default at start-up. - + Whether the status bar should be visible. - + Whether the sidebar should be visible. - + Whether the toolbar should be visible. - + toolbar @@ -5813,42 +5813,42 @@ The style of the window buttons. Can be "text", "icons", "both", "toolbar". If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting. - + Whether the window buttons should be visible. - + Whether or not the window should be maximized. - + The default height for the main window, in pixels. - + The default width for the main window, in pixels. - + The default X coordinate for the main window. - + The default Y coordinate for the main window. - + The default width for the sidebar, in pixels. @@ -5857,7 +5857,7 @@ - + @@ -5876,13 +5876,13 @@ - + Whether to show the preview pane. - + @@ -5890,7 +5890,7 @@ - + @@ -5898,7 +5898,7 @@ - + @@ -5911,7 +5911,7 @@ - + @@ -5921,19 +5921,19 @@ - + Whether force showing the mail address with the name of the autocompleted contact in the entry. - + The number of characters that must be typed before Evolution will attempt to autocomplete. - + @@ -5944,7 +5944,7 @@ - + Directory for saving alarm audio files @@ -5952,12 +5952,12 @@ - + The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain. - + @@ -5966,26 +5966,26 @@ - + Whether or not to use the notification tray for display alarms. - + Programs that are allowed to be run by alarms. - + - + Time the last alarm ran, in time_t. @@ -5993,13 +5993,13 @@ - + Count of default recurrence for a new event. -1 means forever. - + @@ -6007,13 +6007,13 @@ Units for a default reminder, "minutes", "hours" or "days". - + Number of units for determining a default reminder. - + Whether to set a default reminder for appointments. @@ -6021,13 +6021,13 @@ - + Whether to ask for confirmation when expunging appointments and tasks. - + Whether to ask for confirmation when deleting an appointment or task. @@ -6035,13 +6035,13 @@ - + Number of units for determining when to hide tasks. - + days @@ -6049,19 +6049,19 @@ Units for determining when to hide tasks, "minutes", "hours" or "days". - + Whether to hide completed tasks in the tasks view. - + URI of the highlighted ("primary") task list - + #ff0000 @@ -6069,7 +6069,7 @@ Background color of tasks that are overdue, in "#rrggbb" format. - + #1e90ff @@ -6080,14 +6080,14 @@ - + URI of the highlighted ("primary") memo list - + This can have three possible values. 0 for errors. 1 for warnings. @@ -6095,38 +6095,38 @@ - + Amount of time in seconds the error should be shown on the status bar. - + Whether to scroll a Month View by a week, not by a month. - + Whether to show week numbers in various places in the Calendar. - + Gradient of the events in calendar views. - + Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque). - + #ff0000 @@ -6134,7 +6134,7 @@ Color to draw the Marcus Bains Line in the Time bar (empty for default). - + #ff0000 @@ -6142,31 +6142,31 @@ Color to draw the Marcus Bains line in the Day View. - + Whether to draw the Marcus Bains Line (line at current time) in the calendar. - + Days on which the start and end of work hours should be indicated. - + Whether to display the end time of events in the week and month views. - + Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday. - + @@ -6174,7 +6174,7 @@ - + @@ -6182,7 +6182,7 @@ - + @@ -6190,7 +6190,7 @@ - + @@ -6201,7 +6201,7 @@ - + @@ -6209,7 +6209,7 @@ - + @@ -6217,7 +6217,7 @@ - + @@ -6225,7 +6225,7 @@ - + @@ -6236,128 +6236,128 @@ - + Position of the vertical pane, between the calendar lists and the date navigator calendar. - + Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels. - + Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels. - + Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels. - + Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels. - + Intervals shown in Day and Work Week views, in minutes. - + Minute the workday ends on, 0 to 59. - + Hour the workday ends on, in twenty four hour format, 0 to 23. - + Minute the workday starts on, 0 to 59. - + Hour the workday starts on, in twenty four hour format, 0 to 23. - + Weekday the week starts on, from Sunday (0) to Saturday (6). - + Whether to show categories field in the event/meeting editor - + Whether to show timezone field in the event/meeting editor - + Whether to show RSVP field in the event/task/meeting editor - + Whether to show type field in the event/task/meeting editor - + Whether to show status field in the event/task/meeting editor - + Whether to show role field in the event/task/meeting editor - + Whether to show times in twenty four hour format instead of using am/pm. - + Maximum number of recently used timezones to remember in a 'day_second_zones' list. - + List of recently used second time zones in a Day View. - + @@ -6365,14 +6365,14 @@ Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key. - + Use the system timezone instead of the timezone selected in Evolution. - + UTC @@ -6380,7 +6380,7 @@ The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York". - + URI of the highlighted ("primary") calendar @@ -6389,7 +6389,7 @@ - + Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. @@ -6397,13 +6397,13 @@ - + Play themed sound when new messages arrive, if not in beep mode. - + @@ -6411,37 +6411,37 @@ Sound file to be played when new messages arrive, if not in beep mode. - + If "true", then beep, otherwise will play sound file when new messages arrive. - + Whether play sound or beep when new messages arrive. - + Whether show message over the icon when new messages arrive. - + Show new mail icon in notification area when new messages arrive. - + Generates a D-Bus message when new mail messages arrive. - + Whether to notify new messages in Inbox folder only. @@ -6449,7 +6449,7 @@ - +
  • @@ -6461,13 +6461,13 @@
    • - + Automatically launch editor when key is pressed in the mail composer - + gedit @@ -6478,8 +6478,9 @@     - - + +
  • myphone=012345 @@ -6497,7 +6498,7 @@ - + @@ -6506,7 +6507,7 @@ - + @@ -6515,7 +6516,7 @@ - + Initial maximize state of the "Search Folder Editor" window. @@ -6526,7 +6527,7 @@ - + @@ -6535,7 +6536,7 @@ - + @@ -6544,7 +6545,7 @@ - + Initial maximize state of the "Send and Receive Mail" window. @@ -6555,7 +6556,7 @@ - + @@ -6564,7 +6565,7 @@ - + @@ -6573,7 +6574,7 @@ - + Initial maximize state of the "Filter Editor" window. @@ -6584,7 +6585,7 @@ - + @@ -6593,21 +6594,21 @@ - + Directory for saving mail component files. - + List of protocol names whose license has been accepted. - + List of accounts known to the mail component of @@ -6616,14 +6617,14 @@ - + UID string of the default account. - +
  • @@ -6649,25 +6650,25 @@ - + Default maximized state of the mail browser window. - + Default height of the mail browser window. - + Default width of the mail browser window. - +
  • @@ -6690,7 +6691,7 @@ - + @@ -6698,7 +6699,7 @@ - + @@ -6706,7 +6707,7 @@ - + @@ -6716,13 +6717,13 @@ - + Every time Evolution starts, check whether or not it is the default mailer. - + @@ -6731,13 +6732,13 @@ - + It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list - + @@ -6747,7 +6748,7 @@ - + @@ -6757,7 +6758,7 @@ - + @@ -6765,7 +6766,7 @@ - + @@ -6774,7 +6775,7 @@ - + @@ -6783,7 +6784,7 @@ - + @@ -6791,7 +6792,7 @@ - + @@ -6799,7 +6800,7 @@ - + @@ -6810,24 +6811,24 @@ - + - + - + - + @@ -6837,7 +6838,7 @@ - + @@ -6847,7 +6848,7 @@ - + @@ -6857,13 +6858,13 @@ - + Default height of the subscribe dialog. - + Default width of the subscribe dialog. @@ -6871,7 +6872,7 @@ - + @@ -6880,7 +6881,7 @@ - + @@ -6889,7 +6890,7 @@ - + @@ -6897,7 +6898,7 @@ - + @@ -6907,7 +6908,7 @@ - + @@ -6916,7 +6917,7 @@ - + @@ -6925,7 +6926,7 @@ - + @@ -6934,7 +6935,7 @@ - + @@ -6944,7 +6945,7 @@ - + @@ -6952,7 +6953,7 @@ - + @@ -6961,7 +6962,7 @@ - + @@ -6972,7 +6973,7 @@ - + @@ -6980,7 +6981,7 @@ - + @@ -6988,7 +6989,7 @@ - + @@ -6998,7 +6999,7 @@ - + @@ -7006,7 +7007,7 @@ - + @@ -7014,7 +7015,7 @@ - + @@ -7022,7 +7023,7 @@ - + @@ -7030,7 +7031,7 @@ - + @@ -7038,7 +7039,7 @@ - + @@ -7046,7 +7047,7 @@ - + If there isn't a builtin viewer for a particular MIME type inside Evolution, @@ -7055,7 +7056,7 @@ - + @@ -7063,7 +7064,7 @@ - + @@ -7071,7 +7072,7 @@ - + This key should contain a list of XML structures specifying custom headers, @@ -7081,7 +7082,7 @@ - + @@ -7089,7 +7090,7 @@ - + @@ -7097,7 +7098,7 @@ - + @@ -7108,7 +7109,7 @@ - + @@ -7118,7 +7119,7 @@ - + @@ -7126,7 +7127,7 @@ - + #737373 @@ -7136,7 +7137,7 @@ - + @@ -7144,21 +7145,21 @@ - + Enable to use a similar message list view settings for all folders. - + Enable this to use Space bar key to scroll in message preview, message list and folders. - + @@ -7166,7 +7167,7 @@ - + @@ -7174,7 +7175,7 @@ - + Enable animated images in HTML mail. Many users find animated @@ -7182,7 +7183,7 @@ - + @@ -7190,7 +7191,7 @@ - + Monospace 12 @@ -7200,7 +7201,7 @@ - + Sans 12 @@ -7213,14 +7214,14 @@ - + Directory for loading/attaching files to composer. - + @@ -7235,26 +7236,26 @@ - + Default height of the Composer Window. - + Default width of the Composer Window. - + Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail. - + Users get all up in arms over where their signature should go @@ -7262,7 +7263,7 @@ placed at the top of the message or the bottom. - + @@ -7270,7 +7271,7 @@ - + @@ -7279,7 +7280,7 @@ - + @@ -7288,7 +7289,7 @@ - + @@ -7297,7 +7298,7 @@ - + @@ -7306,7 +7307,7 @@ - + @@ -7315,14 +7316,14 @@ - + List of dictionary language codes used for spell checking. - + #FFFF00000000 @@ -7332,7 +7333,7 @@ - + @@ -7340,7 +7341,7 @@ - + @@ -7348,7 +7349,7 @@ - + Users get all up in arms over where the cursor should go when @@ -7356,7 +7357,7 @@ at the top of the message or the bottom. - + @@ -7367,7 +7368,7 @@ - + @@ -7375,7 +7376,7 @@ - + @@ -7383,7 +7384,7 @@ - + @@ -7391,7 +7392,7 @@ - + @@ -7403,7 +7404,7 @@ - +
  • @@ -7419,7 +7420,7 @@ - + @@ -7427,7 +7428,7 @@ - + @@ -7435,7 +7436,7 @@ - + @@ -7443,7 +7444,7 @@ - + Bogofilter @@ -7455,7 +7456,7 @@ - + @@ -7463,7 +7464,7 @@ - + @@ -7471,7 +7472,7 @@ - + @@ -7479,7 +7480,7 @@ - + @@ -7488,7 +7489,7 @@ - + @@ -7496,7 +7497,7 @@ - + @@ -7506,7 +7507,7 @@ - +