From 1280b33717f9441603ed028e55e41eb68164d417 Mon Sep 17 00:00:00 2001 From: fbrehm Date: Sun, 19 Feb 2012 19:44:14 +0100 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.xml | 928 +++++++++--------- 4 files changed, 464 insertions(+), 467 deletions(-) diff --git a/gconf/gconf.xml.defaults/%gconf-tree-de.xml b/gconf/gconf.xml.defaults/%gconf-tree-de.xml index dceb01e..c20e1f2 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-de.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-de.xml @@ -6098,7 +6098,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 9211f04..078b3fd 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-en_GB.xml @@ -6097,7 +6097,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 e680e52..35fa853 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree-ru.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree-ru.xml @@ -6097,7 +6097,6 @@ - Описание шрифта, использующегося для подписей к значкам на рабочем столе. diff --git a/gconf/gconf.xml.defaults/%gconf-tree.xml b/gconf/gconf.xml.defaults/%gconf-tree.xml index d5f3e72..2b25697 100644 --- a/gconf/gconf.xml.defaults/%gconf-tree.xml +++ b/gconf/gconf.xml.defaults/%gconf-tree.xml @@ -71,306 +71,306 @@ - - + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - - + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - + + + - + - - + + - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -3405,110 +3405,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. @@ -3516,7 +3516,7 @@ - + mail @@ -3524,25 +3524,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 @@ -3550,42 +3550,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. @@ -3594,7 +3594,7 @@ - + @@ -3603,7 +3603,7 @@ - + Directory for saving alarm audio files @@ -3611,12 +3611,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. - + @@ -3625,26 +3625,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. @@ -3652,13 +3652,13 @@ - + Count of default recurrence for a new event. -1 means forever. - + @@ -3666,13 +3666,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. @@ -3680,13 +3680,13 @@ - + Whether to ask for confirmation when expunging appointments and tasks. - + Whether to ask for confirmation when deleting an appointment or task. @@ -3694,13 +3694,13 @@ - + Number of units for determining when to hide tasks. - + days @@ -3708,19 +3708,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 @@ -3728,7 +3728,7 @@ Background color of tasks that are overdue, in "#rrggbb" format. - + #1e90ff @@ -3739,14 +3739,14 @@ - + URI of the highlighted ("primary") memo list - + This can have three possible values. 0 for errors. 1 for warnings. @@ -3754,38 +3754,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 @@ -3793,7 +3793,7 @@ Color to draw the Marcus Bains Line in the Time bar (empty for default). - + #ff0000 @@ -3801,31 +3801,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. - + @@ -3833,7 +3833,7 @@ - + @@ -3841,7 +3841,7 @@ - + @@ -3849,7 +3849,7 @@ - + @@ -3860,7 +3860,7 @@ - + @@ -3868,7 +3868,7 @@ - + @@ -3876,7 +3876,7 @@ - + @@ -3884,7 +3884,7 @@ - + @@ -3895,128 +3895,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. - + @@ -4024,14 +4024,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 @@ -4039,7 +4039,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 @@ -4048,13 +4048,13 @@ - + Whether to show the preview pane. - + @@ -4062,7 +4062,7 @@ - + @@ -4070,7 +4070,7 @@ - + @@ -4083,7 +4083,7 @@ - + @@ -4093,19 +4093,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. - + @@ -4117,7 +4117,7 @@ - + Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens. @@ -4125,13 +4125,13 @@ - + Automatically launch editor when key is pressed in the mail composer - + gedit @@ -4141,13 +4141,13 @@ - + Play themed sound when new messages arrive, if not in beep mode. - + @@ -4155,37 +4155,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. @@ -4193,7 +4193,7 @@ - +
  • @@ -4206,7 +4206,7 @@
    • - + @@ -4215,7 +4215,7 @@ - + @@ -4224,7 +4224,7 @@ - + Initial maximize state of the "Search Folder Editor" window. @@ -4235,7 +4235,7 @@ - + @@ -4244,7 +4244,7 @@ - + @@ -4253,7 +4253,7 @@ - + Initial maximize state of the "Send and Receive Mail" window. @@ -4264,7 +4264,7 @@ - + @@ -4273,7 +4273,7 @@ - + @@ -4282,7 +4282,7 @@ - + Initial maximize state of the "Filter Editor" window. @@ -4293,7 +4293,7 @@ - + @@ -4302,21 +4302,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 @@ -4325,14 +4325,14 @@ - + UID string of the default account. - +
  • @@ -4358,25 +4358,25 @@ - + Default maximized state of the mail browser window. - + Default height of the mail browser window. - + Default width of the mail browser window. - +
  • @@ -4398,7 +4398,7 @@ - +
  • @@ -4418,7 +4418,7 @@ - +
  • @@ -4434,7 +4434,7 @@ - + @@ -4442,7 +4442,7 @@ - + @@ -4450,7 +4450,7 @@ - + @@ -4458,7 +4458,7 @@ - + Bogofilter @@ -4470,7 +4470,7 @@ - + @@ -4478,7 +4478,7 @@ - + @@ -4486,7 +4486,7 @@ - + @@ -4494,7 +4494,7 @@ - + @@ -4503,7 +4503,7 @@ - + @@ -4514,7 +4514,7 @@ - + @@ -4522,7 +4522,7 @@ - + @@ -4533,7 +4533,7 @@
    • - + @@ -4541,7 +4541,7 @@ - + @@ -4549,7 +4549,7 @@ - + @@ -4559,24 +4559,24 @@ - + - + - + - + @@ -4586,7 +4586,7 @@ - + @@ -4596,7 +4596,7 @@ - + @@ -4606,13 +4606,13 @@ - + Default height of the subscribe dialog. - + Default width of the subscribe dialog. @@ -4620,7 +4620,7 @@ - + @@ -4629,7 +4629,7 @@ - + @@ -4638,7 +4638,7 @@ - + @@ -4646,7 +4646,7 @@ - + @@ -4656,7 +4656,7 @@ - + @@ -4665,7 +4665,7 @@ - + @@ -4674,7 +4674,7 @@ - + @@ -4683,7 +4683,7 @@ - + @@ -4693,7 +4693,7 @@ - + @@ -4701,7 +4701,7 @@ - + @@ -4710,7 +4710,7 @@ - + @@ -4721,7 +4721,7 @@ - + @@ -4729,7 +4729,7 @@ - + @@ -4737,7 +4737,7 @@ - + @@ -4747,7 +4747,7 @@ - + @@ -4755,7 +4755,7 @@ - + @@ -4763,7 +4763,7 @@ - + @@ -4771,7 +4771,7 @@ - + @@ -4779,7 +4779,7 @@ - + @@ -4787,7 +4787,7 @@ - + @@ -4795,7 +4795,7 @@ - + If there isn't a builtin viewer for a particular MIME type inside Evolution, @@ -4804,7 +4804,7 @@ - + @@ -4812,7 +4812,7 @@ - + @@ -4820,7 +4820,7 @@ - + This key should contain a list of XML structures specifying custom headers, @@ -4830,7 +4830,7 @@ - + @@ -4838,7 +4838,7 @@ - + @@ -4846,7 +4846,7 @@ - + @@ -4857,7 +4857,7 @@ - + @@ -4867,7 +4867,7 @@ - + @@ -4875,7 +4875,7 @@ - + #737373 @@ -4885,7 +4885,7 @@ - + @@ -4893,21 +4893,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. - + @@ -4915,7 +4915,7 @@ - + @@ -4923,7 +4923,7 @@ - + Enable animated images in HTML mail. Many users find animated @@ -4931,7 +4931,7 @@ - + @@ -4939,7 +4939,7 @@ - + Monospace 12 @@ -4949,7 +4949,7 @@ - + Sans 12 @@ -4962,14 +4962,14 @@ - + Directory for loading/attaching files to composer. - + @@ -4984,26 +4984,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 @@ -5011,7 +5011,7 @@ placed at the top of the message or the bottom. - + @@ -5019,7 +5019,7 @@ - + @@ -5028,7 +5028,7 @@ - + @@ -5037,7 +5037,7 @@ - + @@ -5046,7 +5046,7 @@ - + @@ -5055,7 +5055,7 @@ - + @@ -5064,14 +5064,14 @@ - + List of dictionary language codes used for spell checking. - + #FFFF00000000 @@ -5081,7 +5081,7 @@ - + @@ -5089,7 +5089,7 @@ - + @@ -5097,7 +5097,7 @@ - + Users get all up in arms over where the cursor should go when @@ -5105,7 +5105,7 @@ at the top of the message or the bottom. - + @@ -5116,7 +5116,7 @@ - + @@ -5124,7 +5124,7 @@ - + @@ -5132,7 +5132,7 @@ - + @@ -5140,7 +5140,7 @@ - + @@ -5152,7 +5152,7 @@ - + @@ -5161,13 +5161,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 - + @@ -5177,7 +5177,7 @@ - + @@ -5187,7 +5187,7 @@ - + @@ -5195,7 +5195,7 @@ - + @@ -5204,7 +5204,7 @@ - + @@ -5213,7 +5213,7 @@ - + @@ -5221,7 +5221,7 @@ - + @@ -5229,7 +5229,7 @@ - + @@ -5238,7 +5238,7 @@ - + Every time Evolution starts, check whether or not it is the default mailer. -- 2.39.5