From: fbrehm Date: Mon, 23 Apr 2012 11:54:44 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=62379013e15d07df48fb7ac88e84c0a2973fda83;p=config%2Fsamara%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 7698ca6..521a22e 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -91,306 +91,306 @@ - - + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - - + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - + + + - + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -3576,110 +3576,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. @@ -3687,7 +3687,7 @@ - + mail @@ -3695,25 +3695,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 @@ -3721,42 +3721,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. @@ -3765,7 +3765,7 @@ - + @@ -3774,7 +3774,7 @@ - + Directory for saving alarm audio files @@ -3782,12 +3782,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. - + @@ -3796,26 +3796,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. @@ -3823,13 +3823,13 @@ - + Count of default recurrence for a new event. -1 means forever. - + @@ -3837,13 +3837,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. @@ -3851,13 +3851,13 @@ - + Whether to ask for confirmation when expunging appointments and tasks. - + Whether to ask for confirmation when deleting an appointment or task. @@ -3865,13 +3865,13 @@ - + Number of units for determining when to hide tasks. - + days @@ -3879,19 +3879,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 @@ -3899,7 +3899,7 @@ Background color of tasks that are overdue, in "#rrggbb" format. - + #1e90ff @@ -3910,14 +3910,14 @@ - + URI of the highlighted ("primary") memo list - + This can have three possible values. 0 for errors. 1 for warnings. @@ -3925,38 +3925,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 @@ -3964,7 +3964,7 @@ Color to draw the Marcus Bains Line in the Time bar (empty for default). - + #ff0000 @@ -3972,31 +3972,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. - + @@ -4004,7 +4004,7 @@ - + @@ -4012,7 +4012,7 @@ - + @@ -4020,7 +4020,7 @@ - + @@ -4031,7 +4031,7 @@ - + @@ -4039,7 +4039,7 @@ - + @@ -4047,7 +4047,7 @@ - + @@ -4055,7 +4055,7 @@ - + @@ -4066,128 +4066,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. - + @@ -4195,14 +4195,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 @@ -4210,7 +4210,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 @@ -4219,13 +4219,13 @@ - + Whether to show the preview pane. - + @@ -4233,7 +4233,7 @@ - + @@ -4241,7 +4241,7 @@ - + @@ -4254,7 +4254,7 @@ - + @@ -4264,19 +4264,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. - + @@ -4288,7 +4288,7 @@ - + Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. @@ -4296,13 +4296,13 @@ - + Automatically launch editor when key is pressed in the mail composer - + gedit @@ -4312,13 +4312,13 @@ - + Play themed sound when new messages arrive, if not in beep mode. - + @@ -4326,37 +4326,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. @@ -4364,7 +4364,7 @@ - +
  • @@ -4377,7 +4377,7 @@
    • - + @@ -4386,7 +4386,7 @@ - + @@ -4395,7 +4395,7 @@ - + Initial maximize state of the "Search Folder Editor" window. @@ -4406,7 +4406,7 @@ - + @@ -4415,7 +4415,7 @@ - + @@ -4424,7 +4424,7 @@ - + Initial maximize state of the "Send and Receive Mail" window. @@ -4435,7 +4435,7 @@ - + @@ -4444,7 +4444,7 @@ - + @@ -4453,7 +4453,7 @@ - + Initial maximize state of the "Filter Editor" window. @@ -4464,7 +4464,7 @@ - + @@ -4473,21 +4473,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 @@ -4496,14 +4496,14 @@ - + UID string of the default account. - +
  • @@ -4529,25 +4529,25 @@ - + Default maximized state of the mail browser window. - + Default height of the mail browser window. - + Default width of the mail browser window. - +
  • @@ -4569,7 +4569,7 @@ - +
  • @@ -4589,7 +4589,7 @@ - +
  • @@ -4605,7 +4605,7 @@ - + @@ -4613,7 +4613,7 @@ - + @@ -4621,7 +4621,7 @@ - + @@ -4629,7 +4629,7 @@ - + Bogofilter @@ -4641,7 +4641,7 @@ - + @@ -4649,7 +4649,7 @@ - + @@ -4657,7 +4657,7 @@ - + @@ -4665,7 +4665,7 @@ - + @@ -4674,7 +4674,7 @@ - + @@ -4685,7 +4685,7 @@ - + @@ -4693,7 +4693,7 @@ - + @@ -4704,7 +4704,7 @@
    • - + @@ -4712,7 +4712,7 @@ - + @@ -4720,7 +4720,7 @@ - + @@ -4730,24 +4730,24 @@ - + - + - + - + @@ -4757,7 +4757,7 @@ - + @@ -4767,7 +4767,7 @@ - + @@ -4777,13 +4777,13 @@ - + Default height of the subscribe dialog. - + Default width of the subscribe dialog. @@ -4791,7 +4791,7 @@ - + @@ -4800,7 +4800,7 @@ - + @@ -4809,7 +4809,7 @@ - + @@ -4817,7 +4817,7 @@ - + @@ -4827,7 +4827,7 @@ - + @@ -4836,7 +4836,7 @@ - + @@ -4845,7 +4845,7 @@ - + @@ -4854,7 +4854,7 @@ - + @@ -4864,7 +4864,7 @@ - + @@ -4872,7 +4872,7 @@ - + @@ -4881,7 +4881,7 @@ - + @@ -4892,7 +4892,7 @@ - + @@ -4900,7 +4900,7 @@ - + @@ -4908,7 +4908,7 @@ - + @@ -4918,7 +4918,7 @@ - + @@ -4926,7 +4926,7 @@ - + @@ -4934,7 +4934,7 @@ - + @@ -4942,7 +4942,7 @@ - + @@ -4950,7 +4950,7 @@ - + @@ -4958,7 +4958,7 @@ - + @@ -4966,7 +4966,7 @@ - + If there isn't a builtin viewer for a particular MIME type inside Evolution, @@ -4975,7 +4975,7 @@ - + @@ -4983,7 +4983,7 @@ - + @@ -4991,7 +4991,7 @@ - + This key should contain a list of XML structures specifying custom headers, @@ -5001,7 +5001,7 @@ - + @@ -5009,7 +5009,7 @@ - + @@ -5017,7 +5017,7 @@ - + @@ -5028,7 +5028,7 @@ - + @@ -5038,7 +5038,7 @@ - + @@ -5046,7 +5046,7 @@ - + #737373 @@ -5056,7 +5056,7 @@ - + @@ -5064,21 +5064,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. - + @@ -5086,7 +5086,7 @@ - + @@ -5094,7 +5094,7 @@ - + Enable animated images in HTML mail. Many users find animated @@ -5102,7 +5102,7 @@ - + @@ -5110,7 +5110,7 @@ - + Monospace 12 @@ -5120,7 +5120,7 @@ - + Sans 12 @@ -5133,14 +5133,14 @@ - + Directory for loading/attaching files to composer. - + @@ -5155,26 +5155,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 @@ -5182,7 +5182,7 @@ placed at the top of the message or the bottom. - + @@ -5190,7 +5190,7 @@ - + @@ -5199,7 +5199,7 @@ - + @@ -5208,7 +5208,7 @@ - + @@ -5217,7 +5217,7 @@ - + @@ -5226,7 +5226,7 @@ - + @@ -5235,14 +5235,14 @@ - + List of dictionary language codes used for spell checking. - + #FFFF00000000 @@ -5252,7 +5252,7 @@ - + @@ -5260,7 +5260,7 @@ - + @@ -5268,7 +5268,7 @@ - + Users get all up in arms over where the cursor should go when @@ -5276,7 +5276,7 @@ at the top of the message or the bottom. - + @@ -5287,7 +5287,7 @@ - + @@ -5295,7 +5295,7 @@ - + @@ -5303,7 +5303,7 @@ - + @@ -5311,7 +5311,7 @@ - + @@ -5323,7 +5323,7 @@ - + @@ -5332,13 +5332,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 - + @@ -5348,7 +5348,7 @@ - + @@ -5358,7 +5358,7 @@ - + @@ -5366,7 +5366,7 @@ - + @@ -5375,7 +5375,7 @@ - + @@ -5384,7 +5384,7 @@ - + @@ -5392,7 +5392,7 @@ - + @@ -5400,7 +5400,7 @@ - + @@ -5409,7 +5409,7 @@ - + Every time Evolution starts, check whether or not it is the default mailer.